Merge branch 'master' of skyjake.fi:skyjake/lagrange

1 files changed, 5 insertions, 5 deletions

diff --git a/Embed.cmake b/Embed.cmake
index 4d51f418..c75f19e4 100644
--- a/Embed.cmake
+++ b/Embed.cmake
@@ -2,9 +2,9 @@
 # Copyright: 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
 # License: BSD 2-Clause
 
-option (EMBED_IN_EXECUTABLE "Embed resources inside the executable" OFF)
+option (ENABLE_RESOURCE_EMBED "Embed resources inside the executable" OFF)
 # Note: If disabled, the Unix "cat" tool is required for concatenating
-# the resources into a single "resources.bin" file.
+# the resources into a single "resources.binary" file.
 
 function (embed_getname output fn)
     get_filename_component (name ${fn} NAME_WE)
@@ -57,7 +57,7 @@ endfunction (embed_filesize)
 function (embed_make)
     set (EMB_H ${CMAKE_CURRENT_BINARY_DIR}/embedded.h)
     set (EMB_C ${CMAKE_CURRENT_BINARY_DIR}/embedded.c)
-    if (EMBED_IN_EXECUTABLE)
+    if (ENABLE_RESOURCE_EMBED)
         set (needGen NO)
         if (NOT EXISTS ${EMB_H} OR NOT EXISTS ${EMB_C})
             set (needGen YES)
@@ -75,7 +75,7 @@ function (embed_make)
         set (needGen YES)
     endif ()
     if (needGen)
-        if (EMBED_IN_EXECUTABLE)
+        if (ENABLE_RESOURCE_EMBED)
             # Compose a source file with the resource data in an array.
             file (WRITE ${EMB_H} "#include <the_Foundation/block.h>\n")
             file (WRITE ${EMB_C} "#include \"embedded.h\"\n")
@@ -85,7 +85,7 @@ function (embed_make)
             endforeach (fn)
         else ()
             # Collect resources in a single binary file.
-            set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.bin)
+            set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.binary)
             file (REMOVE ${EMB_BIN})
             execute_process (COMMAND cat ${ARGV} OUTPUT_FILE ${EMB_BIN}
                 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})