summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2021-12-30 16:51:38 +0200
committerJaakko Keränen <jaakko.keranen@iki.fi>2021-12-30 16:51:38 +0200
commitd5169339b3454c80a6f2ed5f8cb937e5d5613fc0 (patch)
tree8c74ed9685d9ff0c7760af94277aaec072a48e74 /CMakeLists.txt
parentecad69f94750b16d201f025a87c3635ce41b417e (diff)
Android: Updating for latest SDL and revised Gradle project
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b47f8537..e060736c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -196,7 +196,7 @@ set (SOURCES
196 src/ui/scrollwidget.c 196 src/ui/scrollwidget.c
197 src/ui/scrollwidget.h 197 src/ui/scrollwidget.h
198 src/ui/sidebarwidget.c 198 src/ui/sidebarwidget.c
199 src/ui/sidebarwidget.h 199 src/ui/sidebarwidget.h
200 src/ui/text.c 200 src/ui/text.c
201 src/ui/text.h 201 src/ui/text.h
202 src/ui/touch.c 202 src/ui/touch.c
@@ -290,7 +290,7 @@ if (NOT ANDROID)
290 add_executable (app ${SOURCES} ${RESOURCES}) 290 add_executable (app ${SOURCES} ${RESOURCES})
291else () 291else ()
292 # The whole app becomes one shared library, based on this static one. 292 # The whole app becomes one shared library, based on this static one.
293 add_library (app STATIC ${SOURCES}) 293 add_library (app SHARED ${SOURCES})
294endif () 294endif ()
295set_property (TARGET app PROPERTY C_STANDARD 11) 295set_property (TARGET app PROPERTY C_STANDARD 11)
296if (TARGET ext-deps) 296if (TARGET ext-deps)
@@ -398,7 +398,7 @@ if (APPLE)
398 XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "fi.skyjake.lagrange" 398 XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "fi.skyjake.lagrange"
399 ) 399 )
400 if (IOS) 400 if (IOS)
401 target_compile_definitions (app PUBLIC 401 target_compile_definitions (app PUBLIC
402 LAGRANGE_IOS_VERSION="${IOS_BUNDLE_VERSION}" 402 LAGRANGE_IOS_VERSION="${IOS_BUNDLE_VERSION}"
403 LAGRANGE_IOS_BUILD_DATE="${IOS_BUILD_DATE}" 403 LAGRANGE_IOS_BUILD_DATE="${IOS_BUILD_DATE}"
404 ) 404 )
@@ -421,7 +421,7 @@ endif ()
421if (MSYS) 421if (MSYS)
422 target_link_libraries (app PUBLIC d2d1 uuid dwmapi) # querying DPI 422 target_link_libraries (app PUBLIC d2d1 uuid dwmapi) # querying DPI
423 if (ENABLE_WINSPARKLE) 423 if (ENABLE_WINSPARKLE)
424 target_link_libraries (app PUBLIC winsparkle) 424 target_link_libraries (app PUBLIC winsparkle)
425 endif () 425 endif ()
426endif () 426endif ()
427if (UNIX) 427if (UNIX)
@@ -452,7 +452,7 @@ elseif (HAIKU)
452 LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/resources.lgr") 452 LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/resources.lgr")
453 install (FILES ${EMB_BIN} DESTINATION .) 453 install (FILES ${EMB_BIN} DESTINATION .)
454elseif (ANDROID) 454elseif (ANDROID)
455 file (COPY ${EMB_BIN} DESTINATION ${CMAKE_SOURCE_DIR}/../app/src/main/assets) 455 file (COPY ${EMB_BIN} DESTINATION ${CMAKE_SOURCE_DIR}/../src/main/assets)
456elseif (UNIX AND NOT APPLE) 456elseif (UNIX AND NOT APPLE)
457 include (GNUInstallDirs) 457 include (GNUInstallDirs)
458 set_target_properties (app PROPERTIES 458 set_target_properties (app PROPERTIES