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

4
src/SFML/Audio/CMakeLists.txt
View file

@ -40,7 +40,7 @@ elseif(SFML_OS_MACOSX)
endif()
# find external libraries
if(NOT ANDROID)
if(NOT SFML_OS_ANDROID)
find_package(OpenAL REQUIRED)
find_package(Sndfile REQUIRED)
set(AUDIO_EXT_LIBS ${OPENAL_LIBRARY} ${SNDFILE_LIBRARY})
@ -56,7 +56,7 @@ endif()
include_directories(${OPENAL_INCLUDE_DIR} ${SNDFILE_INCLUDE_DIR})
# define the sfml-audio target
if(NOT ANDROID)
if(NOT SFML_OS_ANDROID)
sfml_add_library(sfml-audio
SOURCES ${SRC}
DEPENDS sfml-system

6
src/SFML/CMakeLists.txt
View file

@ -23,10 +23,10 @@ if (SFML_OS_WINDOWS)
elseif(SFML_OS_MACOSX)
set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${PROJECT_SOURCE_DIR}/extlibs/headers")
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-osx/lib/")
elseif(IOS)
elseif(SFML_OS_IOS)
set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${PROJECT_SOURCE_DIR}/extlibs/headers")
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-ios/")
elseif(ANDROID)
elseif(SFML_OS_ANDROID)
set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${PROJECT_SOURCE_DIR}/extlibs/android/extlibs/include")
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/android/extlibs/lib/${ANDROID_ABI}")
endif()
@ -50,4 +50,4 @@ add_subdirectory(Network)
add_subdirectory(Graphics)
if(NOT SFML_OS_IOS AND NOT (SFML_OS_ANDROID AND "${ANDROID_ABI}" MATCHES "mips"))
add_subdirectory(Audio)
endif()
endif()

4
src/SFML/Graphics/CMakeLists.txt
View file

@ -123,12 +123,12 @@ if(NOT OPENGL_ES)
endif()
endif()
if(IOS)
if(SFML_OS_IOS)
find_package(JPEG REQUIRED)
find_package(Freetype REQUIRED)
set(GRAPHICS_EXT_INCLUDE_PATHS ${FREETYPE_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR})
set(GRAPHICS_EXT_LIBS "-framework OpenGLES ${FREETYPE_LIBRARY} ${JPEG_LIBRARY}")
elseif(ANDROID)
elseif(SFML_OS_ANDROID)
find_host_package(JPEG REQUIRED)
find_host_package(Freetype REQUIRED)
set(GRAPHICS_EXT_INCLUDE_PATHS ${FREETYPE_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR})

8
src/SFML/Main/CMakeLists.txt
View file

@ -3,11 +3,11 @@ set(INCROOT ${PROJECT_SOURCE_DIR}/include/SFML/Main)
set(SRCROOT ${PROJECT_SOURCE_DIR}/src/SFML/Main)
# sources
if(WINDOWS)
if(SFML_OS_WINDOWS)
set(SRC ${SRC} ${SRCROOT}/MainWin32.cpp)
elseif(IOS)
elseif(SFML_OS_IOS)
set(SRC ${SRC} ${SRCROOT}/MainiOS.mm)
elseif(ANDROID)
elseif(SFML_OS_ANDROID)
set(SRC ${SRC} ${SRCROOT}/MainAndroid.cpp)
else()
return()
@ -32,6 +32,6 @@ install(TARGETS sfml-main ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT devel)
# because of a current limitation on Android (which prevents one library
# from depending on shared libraries), we need a boostrap activity which
# will load our shared libraries manually
if(ANDROID)
if(SFML_OS_ANDROID)
sfml_add_library(sfml-activity SOURCES ${PROJECT_SOURCE_DIR}/src/SFML/Main/SFMLActivity.cpp)
endif()

4
src/SFML/System/CMakeLists.txt
View file

@ -67,7 +67,7 @@ else()
${SRCROOT}/Unix/ThreadLocalImpl.hpp
)
if(ANDROID)
if(SFML_OS_ANDROID)
set(PLATFORM_SRC ${PLATFORM_SRC}
${SRCROOT}/Android/Activity.hpp
${SRCROOT}/Android/Activity.cpp
@ -90,7 +90,7 @@ if(SFML_OS_WINDOWS)
endif()
# pthread is implicitly linked by the NDK
if(ANDROID)
if(SFML_OS_ANDROID)
set(SYSTEM_EXT_LIBS "")
endif()

5
src/SFML/Window/CMakeLists.txt
View file

@ -65,6 +65,7 @@ elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD)
${SRCROOT}/Unix/VideoModeImpl.cpp
${SRCROOT}/Unix/WindowImplX11.cpp
${SRCROOT}/Unix/WindowImplX11.hpp
)
if(SFML_OS_LINUX)
set(PLATFORM_SRC
${PLATFORM_SRC}
@ -117,7 +118,7 @@ elseif(SFML_OS_MACOSX)
${SRCROOT}/OSX/WindowImplDelegateProtocol.h
)
source_group("mac" FILES ${PLATFORM_SRC})
elseif(IOS)
elseif(SFML_OS_IOS)
set(PLATFORM_SRC
${SRCROOT}/iOS/EaglContext.mm
${SRCROOT}/iOS/EaglContext.hpp
@ -139,7 +140,7 @@ elseif(IOS)
${SRCROOT}/iOS/SFMain.mm
)
source_group("ios" FILES ${PLATFORM_SRC})
elseif(ANDROID)
elseif(SFML_OS_ANDROID)
set(PLATFORM_SRC
${SRCROOT}/Android/WindowImplAndroid.hpp
${SRCROOT}/Android/WindowImplAndroid.cpp