mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #6751: Android CLI client is missing

This commit is contained in:
Michał Janiszewski 2017-11-29 23:14:20 +01:00 committed by Michał Janiszewski
parent 085cb7f3b1
commit 362852f12e
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-android/app/build.gradle
View File

@ -15,7 +15,7 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
arguments '-DANDROID_STL=c++_shared' arguments '-DANDROID_STL=c++_shared'
targets 'openrct2', 'openrct2-ui' targets 'openrct2', 'openrct2-ui', 'openrct2-cli'
} }
} }
} }

10
src/openrct2-android/app/src/main/CMakeLists.txt
View File

@ -159,6 +159,11 @@ if(X86 OR X86_64)
set_source_files_properties(${ORCT2_ROOT}/src/openrct2/drawing/AVX2Drawing.cpp PROPERTIES COMPILE_FLAGS -mavx2) set_source_files_properties(${ORCT2_ROOT}/src/openrct2/drawing/AVX2Drawing.cpp PROPERTIES COMPILE_FLAGS -mavx2)
endif() endif()
file(GLOB_RECURSE OPENRCT2_CLI_SOURCES
"${ORCT2_ROOT}/src/openrct2-cli/*.cpp"
"${ORCT2_ROOT}/src/openrct2-cli/*.h"
"${ORCT2_ROOT}/src/openrct2-cli/*.hpp")
add_library(openrct2 SHARED ${LIBOPENRCT2_SOURCES}) add_library(openrct2 SHARED ${LIBOPENRCT2_SOURCES})
target_link_libraries(openrct2 target_link_libraries(openrct2
android log dl GLESv1_CM GLESv2 z android log dl GLESv1_CM GLESv2 z
@ -166,5 +171,10 @@ target_link_libraries(openrct2
) )
add_library(openrct2-ui SHARED ${OPENRCT2_GUI_SOURCES}) add_library(openrct2-ui SHARED ${OPENRCT2_GUI_SOURCES})
add_executable(openrct2-cli ${OPENRCT2_CLI_SOURCES})
target_link_libraries(openrct2-ui openrct2 SDL2main) target_link_libraries(openrct2-ui openrct2 SDL2main)
target_link_libraries(openrct2-cli openrct2)
target_include_directories(openrct2-ui PRIVATE "${ORCT2_ROOT}/src") target_include_directories(openrct2-ui PRIVATE "${ORCT2_ROOT}/src")
target_include_directories(openrct2-cli PRIVATE "${ORCT2_ROOT}/src")