summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--Resources.cmake4
2 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22fe36f0..321014ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,7 +96,7 @@ set (RESOURCES
96 res/shadow.png 96 res/shadow.png
97 res/fontpack.ini 97 res/fontpack.ini
98) 98)
99file (GLOB FONTS RELATIVE ${CMAKE_SOURCE_DIR} res/fonts/*) 99file (GLOB FONTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} res/fonts/*)
100list (APPEND RESOURCES ${FONTS}) 100list (APPEND RESOURCES ${FONTS})
101if ((UNIX AND NOT APPLE) OR MSYS) 101if ((UNIX AND NOT APPLE) OR MSYS)
102 list (APPEND RESOURCES res/lagrange-64.png) 102 list (APPEND RESOURCES res/lagrange-64.png)
@@ -450,6 +450,8 @@ elseif (HAIKU)
450 target_compile_definitions (app PUBLIC 450 target_compile_definitions (app PUBLIC
451 LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/resources.lgr") 451 LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/resources.lgr")
452 install (FILES ${EMB_BIN} DESTINATION .) 452 install (FILES ${EMB_BIN} DESTINATION .)
453elseif (ANDROID)
454 file (COPY ${EMB_BIN} DESTINATION ${CMAKE_SOURCE_DIR}/../app/src/main/assets)
453elseif (UNIX AND NOT APPLE) 455elseif (UNIX AND NOT APPLE)
454 include (GNUInstallDirs) 456 include (GNUInstallDirs)
455 set_target_properties (app PROPERTIES 457 set_target_properties (app PROPERTIES
diff --git a/Resources.cmake b/Resources.cmake
index fc5d20c6..15ef15ea 100644
--- a/Resources.cmake
+++ b/Resources.cmake
@@ -16,11 +16,11 @@ function (make_resources dst)
16 file (REMOVE ${dst}) 16 file (REMOVE ${dst})
17 get_filename_component (dstName ${dst} NAME) 17 get_filename_component (dstName ${dst} NAME)
18 message (STATUS " ${dstName}") 18 message (STATUS " ${dstName}")
19 set (versionTempPath ${CMAKE_SOURCE_DIR}/res/VERSION) 19 set (versionTempPath ${CMAKE_CURRENT_SOURCE_DIR}/res/VERSION)
20 file (WRITE ${versionTempPath} ${PROJECT_VERSION}) 20 file (WRITE ${versionTempPath} ${PROJECT_VERSION})
21 execute_process ( 21 execute_process (
22 COMMAND ${ZIP_EXECUTABLE} -1 ${dst} VERSION ${files} 22 COMMAND ${ZIP_EXECUTABLE} -1 ${dst} VERSION ${files}
23 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/res 23 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res
24 OUTPUT_QUIET 24 OUTPUT_QUIET
25 ) 25 )
26 file (REMOVE ${versionTempPath}) 26 file (REMOVE ${versionTempPath})