4 files changed, 71 insertions, 17 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4b0376c..cb97185c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,6 @@
 #   https://libsdl.org/). To make configuration easier, consider writing
 #   for your personal use a pkg-config sdl2.pc file that uses the Windows
 #   version of the library.
-# - `cat` is relied upon for merging all the resource files together.
 
 cmake_minimum_required (VERSION 3.9)
 
@@ -33,7 +32,7 @@ option (ENABLE_RESOURCE_EMBED   "Embed resources inside the executable" OFF)
 option (ENABLE_WINDOWPOS_FIX    "Set position after showing window (workaround for SDL bug)" OFF)
 
 include (BuildType.cmake)
-include (Embed.cmake)
+include (res/Embed.cmake)
 if (NOT EXISTS ${CMAKE_SOURCE_DIR}/lib/the_Foundation/CMakeLists.txt)
     set (INSTALL_THE_FOUNDATION YES)
     find_package (the_Foundation REQUIRED)
diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
new file mode 100644
index 00000000..0a8c6260
--- /dev/null
+++ b/res/CMakeLists.txt
@@ -0,0 +1,4 @@
+# CMakeLists for bincat
+cmake_minimum_required (VERSION 3.0)
+project (BINCAT VERSION 1.0 LANGUAGES C)
+add_executable (bincat bincat.c)
diff --git a/Embed.cmake b/res/Embed.cmake
index 75f3e06f..8da9e1d6 100644
--- a/Embed.cmake
+++ b/res/Embed.cmake
@@ -3,8 +3,16 @@
 # License: BSD 2-Clause
 
 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.binary" file.
+
+# Build "bincat" for concatenating files.
+if (NOT ENABLE_RESOURCE_EMBED)
+    message (STATUS "Compiling bincat for merging resource files...")
+    set (_catDir ${CMAKE_BINARY_DIR}/res)
+    execute_process (COMMAND ${CMAKE_COMMAND} -E make_directory ${_catDir})
+    execute_process (COMMAND ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR}/res WORKING_DIRECTORY ${_catDir})
+    execute_process (COMMAND ${CMAKE_COMMAND} --build . WORKING_DIRECTORY ${_catDir})
+    set (BINCAT_COMMAND ${_catDir}/bincat)
+endif ()
 
 function (embed_getname output fn)
     get_filename_component (name ${fn} NAME_WE)
@@ -48,13 +56,6 @@ const iBlock ${name} = { &data_${name}_ };
     file (APPEND ${fnHeader} "${header}")
 endfunction (embed_write)
 
-function (embed_filesize path sizeVar)
-    file (READ ${path} data HEX)
-    string (LENGTH ${data} fsize)
-    math (EXPR fsize "${fsize}/2")
-    set (${sizeVar} ${fsize} PARENT_SCOPE)
-endfunction (embed_filesize)
-
 function (embed_make)
     set (EMB_H ${CMAKE_CURRENT_BINARY_DIR}/embedded.h)
     set (EMB_C ${CMAKE_CURRENT_BINARY_DIR}/embedded.c)
@@ -88,15 +89,17 @@ function (embed_make)
             # Collect resources in a single binary file.
             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})
+            list (LENGTH ARGV fileCount)            
+            execute_process (COMMAND ${BINCAT_COMMAND} ${EMB_BIN} ${ARGV}
+                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                OUTPUT_VARIABLE fileSizes
+            )
             set (offsets)
             set (fpos 0)
-            foreach (fn ${ARGV})
-                embed_filesize (${CMAKE_SOURCE_DIR}/${fn} fileSize)
+            foreach (fileSize ${fileSizes})
                 list (APPEND offsets "${fpos}")
                 math (EXPR fpos "${fpos} + ${fileSize}")
-            endforeach (fn)
+            endforeach (fileSize)
             file (WRITE ${EMB_H} "#include <the_Foundation/block.h>\n
 #define iHaveLoadEmbed 1
 iBool load_Embed(const char *path);\n\n")
@@ -116,7 +119,7 @@ static const iEmbedChunk chunks_Embed_[] = {
 ]])
             set (index 0)
             foreach (fn ${ARGV})
-                embed_filesize (${CMAKE_SOURCE_DIR}/${fn} fileSize)
+                list (GET fileSizes ${index} fileSize)
                 list (GET offsets ${index} fpos)
                 file (APPEND ${EMB_C} "    { ${fpos}, ${fileSize} },\n")
                 math (EXPR index "${index} + 1")
diff --git a/res/bincat.c b/res/bincat.c
new file mode 100644
index 00000000..8fc9d831
--- /dev/null
+++ b/res/bincat.c
@@ -0,0 +1,48 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+/* bincat.c: Tiny tool for concatenating binary files */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(int argc, char *argv[]) {
+    const size_t bufSize = 1024 * 256;
+    char *buf = malloc(bufSize);
+    FILE *out = fopen(argv[1], "wb");
+    int i;
+    for (i = 2; i < argc; ++i) {
+        FILE *f = fopen(argv[i], "rb");
+        size_t fileSize = 0;
+        for (;;) {
+            size_t num = fread(buf, 1, bufSize, f);
+            if (num <= 0) break;
+            fileSize += num;
+            fwrite(buf, 1, num, out); 
+        }
+        fclose(f);
+        printf("%zu;", fileSize);
+    }
+    fclose(out);
+    free(buf);
+    return 0;
+}