Maksytka/Vangers
1
1
Fork 0
mirror of https://github.com/KranX/Vangers.git synced 2025-11-30 23:15:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #583 from caiiiycuk/va_cmakeandroid

Browse Source 
Support android in CMakeLists.txt
This commit is contained in:
Yury Zhuravlev
2022-05-19 23:38:29 +09:00
committed by GitHub
parent 063a9eb922 f81c03c92c
commit beff3da15f
5 changed files with 63 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -116,6 +116,9 @@ ADD_SUBDIRECTORY("src")
ADD_SUBDIRECTORY("lib/xgraph")
ADD_SUBDIRECTORY("lib/xsound")
ADD_SUBDIRECTORY("lib/xtool")
ADD_SUBDIRECTORY("lib/utils")
ADD_SUBDIRECTORY("server")
ADD_SUBDIRECTORY("surmap")
if(NOT ANDROID)
ADD_SUBDIRECTORY("lib/utils")
ADD_SUBDIRECTORY("server")
ADD_SUBDIRECTORY("surmap")
endif()

10
lib/xgraph/CMakeLists.txt
View File

@@ -9,8 +9,10 @@ SET(xgraph_SRCS
xside.cpp
)
ADD_LIBRARY(xgraph STATIC ${xgraph_SRCS})
if (ANDROID)
ADD_LIBRARY(xgraph OBJECT ${xgraph_SRCS})
else()
ADD_LIBRARY(xgraph STATIC ${xgraph_SRCS})
TARGET_LINK_LIBRARIES(xgraph ${SDL2_LIBRARY})
endif()
TARGET_LINK_LIBRARIES(xgraph
${SDL2_LIBRARY}
)

20
lib/xsound/CMakeLists.txt
View File

@@ -9,12 +9,16 @@ SET(xsound_SRCS
ogg_stream.cpp
)
ADD_LIBRARY(xsound STATIC ${xsound_SRCS})
TARGET_LINK_LIBRARIES(xsound
${CLUNK_LIBRARY}
${FFMPEG_LIBRARIES}
${OGG_LIBRARY}
${VORBIS_LIBRARY}
${VORBISFILE_LIBRARY}
)
if (ANDROID)
ADD_LIBRARY(xsound OBJECT ${xsound_SRCS})
else()
ADD_LIBRARY(xsound STATIC ${xsound_SRCS})
TARGET_LINK_LIBRARIES(xsound
${CLUNK_LIBRARY}
${FFMPEG_LIBRARIES}
${OGG_LIBRARY}
${VORBIS_LIBRARY}
${VORBISFILE_LIBRARY}
)
endif()

11
lib/xtool/CMakeLists.txt
View File

@@ -30,8 +30,11 @@ ENDIF(DXSTREAM_DEBUG)
INCLUDE_DIRECTORIES(BEFORE .)
ADD_LIBRARY(xtool STATIC ${xtool_SRCS})
if (ANDROID)
ADD_LIBRARY(xtool OBJECT ${xtool_SRCS})
else()
ADD_LIBRARY(xtool STATIC ${xtool_SRCS})
TARGET_LINK_LIBRARIES(xtool ${WIN_DBG})
endif()
TARGET_COMPILE_DEFINITIONS (xtool PUBLIC "-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"" "-DGIT_BRANCH=\"${GIT_BRANCH}\"" "-DGITHUB_COMMIT_HASH=\"$ENV{GITHUB_SHA}\"" "-DGITHUB_BRANCH=\"$ENV{GITHUB_REF_NAME}\"")
TARGET_LINK_LIBRARIES(xtool ${WIN_DBG})
TARGET_COMPILE_DEFINITIONS (xtool PUBLIC "-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"" "-DGIT_BRANCH=\"${GIT_BRANCH}\"" "-DGITHUB_COMMIT_HASH=\"$ENV{GITHUB_SHA}\"" "-DGITHUB_BRANCH=\"$ENV{GITHUB_REF_NAME}\"")

56
src/CMakeLists.txt
View File

@@ -71,29 +71,37 @@ SET(vangers_SRCS
${WINDOWS_RES}
actint/layout.h)
ADD_EXECUTABLE(vangers ${vangers_SRCS})
IF(WIN32)
SET(WIN_LIB
wsock32
#-mwindows
#-Wl,-subsystem,windows
if (ANDROID)
ADD_LIBRARY(vangers STATIC ${vangers_SRCS}
$<TARGET_OBJECTS:xtool>
$<TARGET_OBJECTS:xgraph>
$<TARGET_OBJECTS:xsound>
)
ENDIF(WIN32)
else()
ADD_EXECUTABLE(vangers ${vangers_SRCS})
TARGET_LINK_LIBRARIES(vangers
${SDL2_LIBRARY}
${OGG_LIBRARY}
${VORBIS_LIBRARY}
${VORBISFILE_LIBRARY}
${CLUNK_LIBRARY}
${SDL2_NET_LIBRARY}
${FFMPEG_LIBRARIES}
${ZLIB_LIBRARIES}
${OPENGL_LIBRARIES}
${WIN_LIB}
${STEAM_LIBS}
xtool
xgraph
xsound
)
IF(WIN32)
SET(WIN_LIB
wsock32
#-mwindows
#-Wl,-subsystem,windows
)
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(vangers
${SDL2_LIBRARY}
${OGG_LIBRARY}
${VORBIS_LIBRARY}
${VORBISFILE_LIBRARY}
${CLUNK_LIBRARY}
${SDL2_NET_LIBRARY}
${FFMPEG_LIBRARIES}
${ZLIB_LIBRARIES}
${OPENGL_LIBRARIES}
${WIN_LIB}
${STEAM_LIBS}
xtool
xgraph
xsound
)
endif(ANDROID)