townforge/tb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dont defaul to system_linux on windows

Browse Source
This commit is contained in:
Michael Tesch 2019-11-07 16:47:15 +01:00
parent 42a4ba9fb7
commit 02dad32701
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@ -59,15 +59,23 @@ elseif (TB_BUILD_DEMO_ANDROID)
endif (TB_BUILD_DEMO_GLFW)
# could try to auto-detect these
cmake_dependent_option (TB_SYSTEM_LINUX "Set System to Linux" ON
"NOT TB_SYSTEM_WINDOWS;NOT TB_SYSTEM_ANDROID;NOT TB_SYSTEM_MACOSX;NOT TB_SYSTEM_SDL2" OFF)
cmake_dependent_option (TB_SYSTEM_ANDROID "Set System to Android" ON
"NOT TB_SYSTEM_LINUX;NOT TB_SYSTEM_WINDOWS;NOT TB_SYSTEM_MACOSX;NOT TB_SYSTEM_SDL2" OFF)
cmake_dependent_option (TB_SYSTEM_WINDOWS "Set System to Windows" ON
"NOT TB_SYSTEM_LINUX;NOT TB_SYSTEM_ANDROID;NOT TB_SYSTEM_MACOSX;NOT TB_SYSTEM_SDL2" OFF)
cmake_dependent_option (TB_SYSTEM_MACOSX "Set System to MacOSX" ON
"NOT TB_SYSTEM_LINUX;NOT TB_SYSTEM_ANDROID;NOT TB_SYSTEM_WINDOWS;NOT TB_SYSTEM_SDL2" OFF)
cmake_dependent_option (TB_SYSTEM_SDL2 "Set System to SDL2" ON
if (UNIX)
cmake_dependent_option (TB_SYSTEM_LINUX "Set System to Linux" ON
"NOT TB_SYSTEM_WINDOWS;NOT TB_SYSTEM_ANDROID;NOT TB_SYSTEM_MACOSX;NOT TB_SYSTEM_SDL2" OFF)
endif (UNIX)
if (ANDROID)
cmake_dependent_option (TB_SYSTEM_ANDROID "Set System to Android" ON
"NOT TB_SYSTEM_LINUX;NOT TB_SYSTEM_WINDOWS;NOT TB_SYSTEM_MACOSX;NOT TB_SYSTEM_SDL2" OFF)
endif (ANDROID)
if (WIN32)
cmake_dependent_option (TB_SYSTEM_WINDOWS "Set System to Windows" ON
"NOT TB_SYSTEM_LINUX;NOT TB_SYSTEM_ANDROID;NOT TB_SYSTEM_MACOSX;NOT TB_SYSTEM_SDL2" OFF)
endif (WIN32)
if (APPLE)
cmake_dependent_option (TB_SYSTEM_MACOSX "Set System to MacOSX" ON
"NOT TB_SYSTEM_LINUX;NOT TB_SYSTEM_ANDROID;NOT TB_SYSTEM_WINDOWS;NOT TB_SYSTEM_SDL2" OFF)
endif (APPLE)
cmake_dependent_option (TB_SYSTEM_SDL2 "Set System to SDL2" ${TB_BUILD_DEMO_SDL2}
"NOT TB_SYSTEM_LINUX;NOT TB_SYSTEM_ANDROID;NOT TB_SYSTEM_WINDOWS;NOT TB_SYSTEM_MACOSX" OFF)
cmake_dependent_option (TB_CLIPBOARD_DUMMY "Clipboard Dummy" ON

3
Makefile
View File

@ -27,7 +27,8 @@ ios:
cd Build-iOS && xcrun xcodebuild -project "turbobadger.xcodeproj" -target ?
and:
cd DemoAndroid && ninja
cd DemoAndroid2 && ./gradlew build
#cd DemoAndroid && ninja
distclean:
rm -rf Build*