remove debug build and add more builds

Author: Baptistegrn

.github/workflows/workflow.yml

@@ -10,7 +10,27 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04, macos-latest, windows-latest]
-        buildtype: [debug, release]
+        buildtype: [release]
+        arch: [x64] 
+        include:
+          - os: windows-latest
+            buildtype: release
+            arch: x86
+          - os: windows-latest
+            buildtype: release
+            arch: x86
+          - os: windows-latest
+            buildtype: release
+            arch: arm64
+          - os: windows-latest
+            buildtype: release
+            arch: arm64
+          - os: macos-latest
+            buildtype: release
+            arch: x86_64
+          - os: macos-latest
+            buildtype: release
+            arch: x86_64
 
     runs-on: ${{ matrix.os }}
 
@@ -27,13 +47,13 @@ jobs:
           build-cache: true
 
       - name: Configure
-        run: xmake config -m ${{ matrix.buildtype }} -y -vv
+        run: xmake config -a ${{ matrix.arch }} -m ${{ matrix.buildtype }} -y -vv
 
       - name: Build
         run: xmake build -y -vv
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.os }}-${{ matrix.buildtype }}
+          name: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.buildtype }}
           path: build/*/*/${{ matrix.buildtype }}/

grngame/assets/embedded_asset.c

@@ -81,50 +81,9 @@ static void embed_callback(const char *path, void *userdata)
     fprintf(ctx->out, "// asset: %s = %s\n\n", path, var_name);
 
     char entry[1024];
-    
-    // 1. Full path
     snprintf(entry, sizeof(entry), "    {\"%s\", %s, %s_size},\n", path, var_name, var_name);
-    strcat(ctx->registry, entry);
-
-    // 2. Base name (e.g. "music.wav")
-    snprintf(entry, sizeof(entry), "    {\"%s\", %s, %s_size},\n", base, var_name, var_name);
-    if (!strstr(ctx->registry, entry)) {
-        strcat(ctx->registry, entry);
-    }
 
-    // 3. Stem for audio and images (e.g. "music")
-    if (FileIsLoadableAudio(path) || FileIsLoadableImage(path))
-    {
-        char *stem = FileStem(path);
-        if (stem)
-        {
-            snprintf(entry, sizeof(entry), "    {\"%s\", %s, %s_size},\n", stem, var_name, var_name);
-            if (!strstr(ctx->registry, entry)) {
-                strcat(ctx->registry, entry);
-            }
-            free(stem);
-        }
-    }
-
-    // 4. Std paths directly
-    const char *std_pos = strstr(path, "std/");
-    if (std_pos)
-    {
-        snprintf(entry, sizeof(entry), "    {\"%s\", %s, %s_size},\n", std_pos, var_name, var_name);
-        if (!strstr(ctx->registry, entry)) {
-            strcat(ctx->registry, entry);
-        }
-        
-        char no_ext[512];
-        snprintf(no_ext, sizeof(no_ext), "%s", std_pos);
-        char *ext_ptr = strrchr(no_ext, '.');
-        if (ext_ptr) *ext_ptr = '\0';
-        
-        snprintf(entry, sizeof(entry), "    {\"%s\", %s, %s_size},\n", no_ext, var_name, var_name);
-        if (!strstr(ctx->registry, entry)) {
-            strcat(ctx->registry, entry);
-        }
-    }
+    strcat(ctx->registry, entry);
 }
 
 void create_embedded_structure(int num_dirs, const char **dirs, const char *output_header)

grngame/assets/load.c

@@ -53,6 +53,12 @@ bool LoadSoundFile(const char *file)
 
     int32 ret;
     khiter_t k = kh_put(SoundMap, sound_map, key, &ret);
+    if (UNLIKELY(ret == 0))
+    {
+        free((char *)kh_key(sound_map, k));
+        kh_key(sound_map, k) = key;
+        WavStream_destroy(kh_value(sound_map, k));
+    }
     kh_value(sound_map, k) = stream;
     return true;
 }
@@ -97,6 +103,12 @@ bool LoadTextureFile(const char *file)
 
     int32 ret;
     khiter_t k = kh_put(TextureMap, texture_map, key, &ret);
+    if (ret == 0)
+    {
+        free((char *)kh_key(texture_map, k));
+        kh_key(texture_map, k) = key;
+        SDL_DestroyTexture(kh_value(texture_map, k).texture);
+    }
     Texture tex = {.texture = texture, .w = (int16)w, .h = (int16)h};
     kh_value(texture_map, k) = tex;
     return true;
@@ -107,10 +119,12 @@ bool UnloadSoundFile(const char *file)
     khash_t(SoundMap) *sound_map = g_app.asset_manager.sound_map;
     char *key = FileStem(file);
     khiter_t k = kh_get(SoundMap, sound_map, key);
+    free(key);
     if (k == kh_end(sound_map))
         return false;
 
     WavStream_destroy(kh_value(sound_map, k));
+    free((char *)kh_key(sound_map, k));
     kh_del(SoundMap, sound_map, k);
     return true;
 }
@@ -120,10 +134,12 @@ bool UnloadTextureFile(const char *file)
     khash_t(TextureMap) *texture_map = g_app.asset_manager.texture_map;
     char *key = FileStem(file);
     khiter_t k = kh_get(TextureMap, texture_map, key);
+    free(key);
     if (k == kh_end(texture_map))
         return false;
 
     SDL_DestroyTexture(kh_value(texture_map, k).texture);
+    free((char *)kh_key(texture_map, k));
     kh_del(TextureMap, texture_map, k);
     return true;
 }

grngame/bindings/wren/wren_engine.cpp

@@ -77,20 +77,17 @@ bool WrenEngine::LoadMainScript(const char *main_script_name)
 {
     std::string main_source;
 
-    // 1. Try to load from embedded assets first
     const EmbeddedAsset *asset = nullptr;
     if (g_app.info.embedded_assets)
     {
         std::string name_with_ext = std::string(main_script_name) + ".wren";
         for (int i = 0; g_app.info.embedded_assets[i].name != NULL; i++)
         {
-            // First pass, exactly "main.wren", avoids matching "main.das" fallback
             if (std::strcmp(g_app.info.embedded_assets[i].name, name_with_ext.c_str()) == 0)
             {
                 asset = &g_app.info.embedded_assets[i];
                 break;
             }
-            // Fallback match exactly "main"
             if (std::strcmp(g_app.info.embedded_assets[i].name, main_script_name) == 0 && !asset)
             {
                 asset = &g_app.info.embedded_assets[i];
@@ -105,7 +102,6 @@ bool WrenEngine::LoadMainScript(const char *main_script_name)
     }
     else
     {
-        // 2. Try to load from disk
         const std::filesystem::path path_of_script = BuildModulePath(main_script_name, ".wren");
         if (!ReadTextFile(path_of_script, main_source))
         {

wren_test/main.c

@@ -13,7 +13,7 @@ int main()
     AppInfo app;
     app.name = "Tests";
     app.version = "1.0.1";
-    app.fps = 80;
+    app.fps = 500;
     app.window_width = 200;
     app.window_height = 200;
     app.window_universe_height = 200;

xmake.lua

@@ -167,7 +167,7 @@ target("WrenTest")
     add_files("wren_test/main.c")
     add_deps("GrnGame")
     add_deps("Embedded")
-    --add_defines("GRN_EMBED_ASSETS")
+    add_defines("GRN_EMBED_ASSETS")
 
     before_build(function(target)
         local embedded_exe = target:dep("Embedded"):targetfile()