diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-12-30 16:51:38 +0200 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-12-30 16:52:13 +0200 |
| commit | 727637718be197a77bed35a907de75426f11cfa2 (patch) | |
| tree | 937acfdabe52f85204661f5dc4bc1c4579fdbeb7 /CMakeLists.txt | |
| parent | e36bed146728f93d5be8a9b84d8756f0b5ccaada (diff) | |
Android: Updating for latest SDL and revised Gradle project
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 37afe9d2..e5de32f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -315,7 +315,7 @@ if (NOT ANDROID) | |||
| 315 | add_executable (app ${SOURCES} ${RESOURCES} ${EMB_FONTS}) | 315 | add_executable (app ${SOURCES} ${RESOURCES} ${EMB_FONTS}) |
| 316 | else () | 316 | else () |
| 317 | # The whole app becomes one shared library, based on this static one. | 317 | # The whole app becomes one shared library, based on this static one. |
| 318 | add_library (app STATIC ${SOURCES}) | 318 | add_library (app SHARED ${SOURCES}) |
| 319 | endif () | 319 | endif () |
| 320 | set_property (TARGET app PROPERTY C_STANDARD 11) | 320 | set_property (TARGET app PROPERTY C_STANDARD 11) |
| 321 | if (TARGET ext-deps) | 321 | if (TARGET ext-deps) |
| @@ -478,7 +478,7 @@ elseif (HAIKU) | |||
| 478 | LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/resources.lgr") | 478 | LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/resources.lgr") |
| 479 | install (FILES ${EMB_BIN} DESTINATION .) | 479 | install (FILES ${EMB_BIN} DESTINATION .) |
| 480 | elseif (ANDROID) | 480 | elseif (ANDROID) |
| 481 | file (COPY ${EMB_BIN} DESTINATION ${CMAKE_SOURCE_DIR}/../app/src/main/assets) | 481 | file (COPY ${EMB_BIN} DESTINATION ${CMAKE_SOURCE_DIR}/../src/main/assets) |
| 482 | elseif (UNIX AND NOT APPLE) | 482 | elseif (UNIX AND NOT APPLE) |
| 483 | include (GNUInstallDirs) | 483 | include (GNUInstallDirs) |
| 484 | set_target_properties (app PROPERTIES | 484 | set_target_properties (app PROPERTIES |