Merge branch 'main' of dev.v4.games:v4games/v4k

MAKE.sh

@@ -75,15 +75,19 @@ while [ $# -ge 1 ]; do
     fi
     if [ "$1" = "dbg" ]; then 
         export build=dbg
-        export flags="-O0 -g"
+        export flags="-O0 -g -DDEBUG"
     fi
     if [ "$1" = "dev" ]; then 
         export build=dev
-        export flags="-O1 -g"
+        export flags="-O0 -g -DNDEBUG=1"
+    fi
+    if [ "$1" = "ret" ]; then 
+        export build=ret
+        export flags="-O3 -DNDEBUG=3 -DENABLE_RETAIL"
     fi
     if [ "$1" = "rel" ]; then 
         export build=rel
-        export flags="-O3 -DNDEBUG"
+        export flags="-O3 -DNDEBUG=2"
     fi
     if [ "$1" = "gcc" ]; then 
         export cc=gcc

depot

@@ -1 +1 @@
-Subproject commit 01f1199523561529b0a4a8f581a05211adb1458d
+Subproject commit a2784f8ff2c1afe9bee7350acb86fc605bb47cde

engine/split/3rd_aseprite.h

@@ -937,7 +937,10 @@ ase_t* cute_aseprite_load_from_memory(const void* memory, int size, void* mem_ct
 
 	s_skip(s, sizeof(uint32_t)); // File size.
 	int magic = (int)s_read_uint16(s);
-	if (magic != 0xA5E0) return CUTE_ASEPRITE_FREE(ase, mem_ctx), 0; // CUTE_ASEPRITE_ASSERT(magic == 0xA5E0); //< r-lyeh: soft abort
+	if (magic != 0xA5E0) {
+		CUTE_ASEPRITE_FREE(ase, mem_ctx); // CUTE_ASEPRITE_ASSERT(magic == 0xA5E0); //< r-lyeh: soft abort
+		return NULL;
+	}
 
 	ase->frame_count = (int)s_read_uint16(s);
 	ase->w = s_read_uint16(s);

engine/split/3rd_luaffi.h

@@ -148,7 +148,7 @@ static char* luaL_prepbuffsize(luaL_Buffer* B, size_t sz) {
 # define ARCH_X86
 #elif defined __amd64__ || defined _M_X64
 # define ARCH_X64
-#elif defined __arm__ || defined __ARM__ || defined ARM || defined __ARM || defined __arm
+#elif defined __arm__ || defined __ARM__ || defined ARM || defined __ARM || defined __arm || defined __arm64__
 # define ARCH_ARM
 #elif defined OS_LINUX && defined __TINYC__ //< @r-lyeh: tcc+linux
 # define ARCH_X64 //< @r-lyeh: tcc+linux

engine/split/v4k.x.inl

@@ -161,6 +161,7 @@ static char *ui_filter = 0;
 {{FILE:3rd_plmpeg.h}}
 {{FILE:3rd_jo_mpeg.h}}
 //#define _RTL_RUN_ONCE _RTL_RUN_ONCE2 // __MINGW64__
+#undef I
 {{FILE:3rd_https.h}}
 #undef F2
 #undef F3

engine/split/v4k_system.c

@@ -109,13 +109,7 @@ const char * app_exec( const char *cmd ) {
 
     // pick the fastest code path per platform
 #if is(osx)
-    for( FILE *fp = popen( cmd, "r" ); fp; rc = pclose(fp), fp = 0) {
-        // while( fgets(buf, 4096 - 1, fp) ) {}
-    }
-    // if( rc != 0 ) {
-    //     char *r = strrchr(buf, '\r'); if(r) *r = 0;
-    //     char *n = strrchr(buf, '\n'); if(n) *n = 0;
-    // }
+    rc = system(cmd);
 #elif is(win32)
     STARTUPINFOA si = {0}; si.cb = sizeof(si);
     PROCESS_INFORMATION pi = {0};

engine/v4k

@@ -182001,7 +182001,7 @@ static char* luaL_prepbuffsize(luaL_Buffer* B, size_t sz) {
 # define ARCH_X86
 #elif defined __amd64__ || defined _M_X64
 # define ARCH_X64
-#elif defined __arm__ || defined __ARM__ || defined ARM || defined __ARM || defined __arm
+#elif defined __arm__ || defined __ARM__ || defined ARM || defined __ARM || defined __arm || defined __arm64__
 # define ARCH_ARM
 #elif defined OS_LINUX && defined __TINYC__ //< @r-lyeh: tcc+linux
 # define ARCH_X64 //< @r-lyeh: tcc+linux
@@ -255294,6 +255294,7 @@ void jo_write_mpeg(FILE *fp, const unsigned char *bgrx, int width, int height, i
 #endif
 #line 0
 //#define _RTL_RUN_ONCE _RTL_RUN_ONCE2 // __MINGW64__
+#undef I
 #line 1 "3rd_https.h"
 /*
 ------------------------------------------------------------------------------

engine/v4k.c

@@ -25115,13 +25115,7 @@ const char * app_exec( const char *cmd ) {
 
     // pick the fastest code path per platform
 #if is(osx)
-    for( FILE *fp = popen( cmd, "r" ); fp; rc = pclose(fp), fp = 0) {
-        // while( fgets(buf, 4096 - 1, fp) ) {}
-    }
-    // if( rc != 0 ) {
-    //     char *r = strrchr(buf, '\r'); if(r) *r = 0;
-    //     char *n = strrchr(buf, '\n'); if(n) *n = 0;
-    // }
+    rc = system(cmd);
 #elif is(win32)
     STARTUPINFOA si = {0}; si.cb = sizeof(si);
     PROCESS_INFORMATION pi = {0};