lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added SFML_OS_ prefix to IOS and ANDROID variables

Browse source
This commit is contained in:
Jonathan De Wachter 2013-10-12 15:26:46 +02:00
parent 00d3bf1e7f
commit f60ab60263
9 changed files with 36 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -28,18 +28,18 @@ set(VERSION_PATCH 0)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
# add an option for choosing the build type (shared or static)
if(NOT (IOS OR ANDROID))
if(NOT (SFML_OS_IOS OR SFML_OS_ANDROID))
sfml_set_option(BUILD_SHARED_LIBS TRUE BOOL "TRUE to build SFML as shared libraries, FALSE to build it as static libraries")
else()
if(IOS)
if(SFML_OS_IOS)
set(BUILD_SHARED_LIBS FALSE)
elseif(ANDROID)
elseif(SFML_OS_ANDROID)
set(BUILD_SHARED_LIBS TRUE)
endif()
endif()
# add an option for building the examples
if(NOT (IOS OR ANDROID))
if(NOT (SFML_OS_IOS OR SFML_OS_ANDROID))
sfml_set_option(SFML_BUILD_EXAMPLES FALSE BOOL "TRUE to build the SFML examples, FALSE to ignore them")
else()
set(SFML_BUILD_EXAMPLES FALSE)
@ -70,7 +70,7 @@ if(SFML_OS_MACOSX)
endif()
# Android options
if(ANDROID)
if(SFML_OS_ANDROID)
# force usage of the STL port
set(ANDROID_USE_STLPORT TRUE)