Преглед изворни кода

Bugfix: Fixing broken Linux build after some macOS related changes

Marko Pintera пре 8 година
родитељ
комит
d1153f37e4

+ 2 - 2
Source/BansheeCore/CMakeLists.txt

@@ -31,7 +31,7 @@ target_link_libraries(BansheeCore PUBLIC BansheeUtility)
 ## OS libs
 if(WIN32)
 	target_link_libraries(BansheeCore PRIVATE Winmm dinput8 xinput9_1_0 dxguid.lib)
-else(APPLE) # MacOS
+elseif(APPLE) # MacOS
 	target_link_framework(BansheeCore CoreServices)
 	target_link_framework(BansheeCore IOKit)
 	target_link_framework(BansheeCore AppKit)
@@ -39,4 +39,4 @@ else(APPLE) # MacOS
 endif()
 
 # IDE specific
-set_property(TARGET BansheeCore PROPERTY FOLDER Layers)
+set_property(TARGET BansheeCore PROPERTY FOLDER Layers)

+ 2 - 2
Source/BansheeUtility/CMakeSources.cmake

@@ -265,8 +265,8 @@ set(BS_BANSHEEUTILITY_SRC_UNIX
 )
 
 set(BS_BANSHEEUTILITY_SRC_LINUX
-	"Linux/BsUnixCrashHandler.cpp"
-	"Linux/BsUnixPlatformUtility.cpp"
+	"Linux/BsLinuxCrashHandler.cpp"
+	"Linux/BsLinuxPlatformUtility.cpp"
 )
 
 set(BS_BANSHEEUTILITY_SRC_MACOS

+ 1 - 1
Source/CMake/GenerateScriptBindings.cmake

@@ -73,7 +73,6 @@ if(BansheeSBGen_FOUND)
 			-output-cs-editor ${BS_GENERATED_CS_EDITOR_OUTPUT_DIR}
 			-- ${BS_INCLUDE_DIRS}
 			-std=c++14
-			-stdlib=libc++
 			-DBS_STATIC_LIB
 			-DBS_SBGEN
 			-w
@@ -82,6 +81,7 @@ if(BansheeSBGen_FOUND)
 		if(APPLE)
 			list(APPEND BS_GSB_COMMAND 
 				-isystem /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1)
+			list(APPEND BS_GSB_COMMAND -stdlib=libc++)
 		endif()
 
 		message(STATUS "Generating script bindings, please wait...")