mirror of
https://github.com/SFML/SFML.git
synced 2024-11-28 22:31:09 +08:00
Simplify how lists are expanded
This commit is contained in:
parent
8384139983
commit
78e532215a
@ -105,7 +105,7 @@ if(SFML_OS_ANDROID)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# avoid missing libraries when building SFML for Android with NDK r19c and later
|
# avoid missing libraries when building SFML for Android with NDK r19c and later
|
||||||
set(CMAKE_FIND_ROOT_PATH "${PROJECT_SOURCE_DIR};${CMAKE_FIND_ROOT_PATH}")
|
list(PREPEND CMAKE_FIND_ROOT_PATH "${PROJECT_SOURCE_DIR}")
|
||||||
|
|
||||||
# make sure there's the android library available
|
# make sure there's the android library available
|
||||||
if (CMAKE_ANDROID_API LESS 26)
|
if (CMAKE_ANDROID_API LESS 26)
|
||||||
|
@ -4,12 +4,12 @@ set(SRCROOT ${PROJECT_SOURCE_DIR}/src/SFML/Main)
|
|||||||
|
|
||||||
# sources
|
# sources
|
||||||
if(SFML_OS_WINDOWS)
|
if(SFML_OS_WINDOWS)
|
||||||
set(SRC ${SRC} ${SRCROOT}/MainWin32.cpp)
|
set(SRC ${SRCROOT}/MainWin32.cpp)
|
||||||
elseif(SFML_OS_IOS)
|
elseif(SFML_OS_IOS)
|
||||||
enable_language(OBJCXX)
|
enable_language(OBJCXX)
|
||||||
set(SRC ${SRC} ${SRCROOT}/MainiOS.mm)
|
set(SRC ${SRCROOT}/MainiOS.mm)
|
||||||
elseif(SFML_OS_ANDROID)
|
elseif(SFML_OS_ANDROID)
|
||||||
set(SRC ${SRC} ${SRCROOT}/MainAndroid.cpp)
|
set(SRC ${SRCROOT}/MainAndroid.cpp)
|
||||||
else()
|
else()
|
||||||
return()
|
return()
|
||||||
endif()
|
endif()
|
||||||
|
@ -29,14 +29,12 @@ set(SRC
|
|||||||
|
|
||||||
# add platform specific sources
|
# add platform specific sources
|
||||||
if(SFML_OS_WINDOWS)
|
if(SFML_OS_WINDOWS)
|
||||||
set(SRC
|
list(APPEND SRC
|
||||||
${SRC}
|
|
||||||
${SRCROOT}/Win32/SocketImpl.cpp
|
${SRCROOT}/Win32/SocketImpl.cpp
|
||||||
${SRCROOT}/Win32/SocketImpl.hpp
|
${SRCROOT}/Win32/SocketImpl.hpp
|
||||||
)
|
)
|
||||||
else()
|
else()
|
||||||
set(SRC
|
list(APPEND SRC
|
||||||
${SRC}
|
|
||||||
${SRCROOT}/Unix/SocketImpl.cpp
|
${SRCROOT}/Unix/SocketImpl.cpp
|
||||||
${SRCROOT}/Unix/SocketImpl.hpp
|
${SRCROOT}/Unix/SocketImpl.hpp
|
||||||
)
|
)
|
||||||
|
@ -50,7 +50,7 @@ else()
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(SFML_OS_ANDROID)
|
if(SFML_OS_ANDROID)
|
||||||
set(PLATFORM_SRC ${PLATFORM_SRC}
|
list(APPEND PLATFORM_SRC
|
||||||
${SRCROOT}/Android/Activity.hpp
|
${SRCROOT}/Android/Activity.hpp
|
||||||
${SRCROOT}/Android/Activity.cpp
|
${SRCROOT}/Android/Activity.cpp
|
||||||
${SRCROOT}/Android/NativeActivity.cpp
|
${SRCROOT}/Android/NativeActivity.cpp
|
||||||
|
Loading…
Reference in New Issue
Block a user