blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 06:00:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Initial project file updates for macos

Browse source
This commit is contained in:
Dan Paulat 2025-06-07 09:39:28 -05:00
parent 58b6c5e1eb
commit 012d70b3a2
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
conanfile.py
View file

@ -35,10 +35,16 @@ class SupercellWxConan(ConanFile):
self.options["openssl"].shared = True
self.options["libcurl"].ca_bundle = "none"
self.options["libcurl"].ca_path = "none"
elif self.settings.os == "Macos":
self.options["openssl"].shared = True
self.options["libcurl"].ca_bundle = "none"
self.options["libcurl"].ca_path = "none"
def requirements(self):
if self.settings.os == "Linux":
self.requires("onetbb/2022.0.0")
elif self.settings.os == "Macos":
self.requires("onetbb/2022.0.0")
def generate(self):
build_folder = os.path.join(self.build_folder,

6
scwx-qt/scwx-qt.cmake
View file

@ -694,7 +694,9 @@ if (MSVC)
else()
target_compile_options(scwx-qt PRIVATE "$<$<CONFIG:Release>:-g>")
target_compile_options(supercell-wx PRIVATE "$<$<CONFIG:Release>:-g>")
endif()
if (LINUX)
# Add wayland client packages
find_package(QT NAMES Qt6
COMPONENTS WaylandClient
@ -746,6 +748,10 @@ install(TARGETS supercell-wx
RUNTIME
COMPONENT supercell-wx
LIBRARY
COMPONENT supercell-wx
OPTIONAL
FRAMEWORK
DESTINATION Frameworks
COMPONENT supercell-wx
OPTIONAL)