From 362852f12e15f8b955cdf4725215bba489f03361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 29 Nov 2017 23:14:20 +0100 Subject: [PATCH] Fix #6751: Android CLI client is missing --- src/openrct2-android/app/build.gradle | 2 +- src/openrct2-android/app/src/main/CMakeLists.txt | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/openrct2-android/app/build.gradle b/src/openrct2-android/app/build.gradle index 42043598a1..32f1ef1ca3 100644 --- a/src/openrct2-android/app/build.gradle +++ b/src/openrct2-android/app/build.gradle @@ -15,7 +15,7 @@ android { externalNativeBuild { cmake { arguments '-DANDROID_STL=c++_shared' - targets 'openrct2', 'openrct2-ui' + targets 'openrct2', 'openrct2-ui', 'openrct2-cli' } } } diff --git a/src/openrct2-android/app/src/main/CMakeLists.txt b/src/openrct2-android/app/src/main/CMakeLists.txt index de7cc7bd06..1221f4e4e4 100644 --- a/src/openrct2-android/app/src/main/CMakeLists.txt +++ b/src/openrct2-android/app/src/main/CMakeLists.txt @@ -159,6 +159,11 @@ if(X86 OR X86_64) set_source_files_properties(${ORCT2_ROOT}/src/openrct2/drawing/AVX2Drawing.cpp PROPERTIES COMPILE_FLAGS -mavx2) 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}) target_link_libraries(openrct2 android log dl GLESv1_CM GLESv2 z @@ -166,5 +171,10 @@ target_link_libraries(openrct2 ) 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-cli openrct2) + target_include_directories(openrct2-ui PRIVATE "${ORCT2_ROOT}/src") +target_include_directories(openrct2-cli PRIVATE "${ORCT2_ROOT}/src")