fixed more macos tooling
parent
050accbce1
commit
6f9433b743
|
@ -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.
|
s_skip(s, sizeof(uint32_t)); // File size.
|
||||||
int magic = (int)s_read_uint16(s);
|
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->frame_count = (int)s_read_uint16(s);
|
||||||
ase->w = s_read_uint16(s);
|
ase->w = s_read_uint16(s);
|
||||||
|
|
|
@ -109,13 +109,7 @@ const char * app_exec( const char *cmd ) {
|
||||||
|
|
||||||
// pick the fastest code path per platform
|
// pick the fastest code path per platform
|
||||||
#if is(osx)
|
#if is(osx)
|
||||||
for( FILE *fp = popen( cmd, "r" ); fp; rc = pclose(fp), fp = 0) {
|
rc = system(cmd);
|
||||||
// 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;
|
|
||||||
// }
|
|
||||||
#elif is(win32)
|
#elif is(win32)
|
||||||
STARTUPINFOA si = {0}; si.cb = sizeof(si);
|
STARTUPINFOA si = {0}; si.cb = sizeof(si);
|
||||||
PROCESS_INFORMATION pi = {0};
|
PROCESS_INFORMATION pi = {0};
|
||||||
|
|
|
@ -25115,13 +25115,7 @@ const char * app_exec( const char *cmd ) {
|
||||||
|
|
||||||
// pick the fastest code path per platform
|
// pick the fastest code path per platform
|
||||||
#if is(osx)
|
#if is(osx)
|
||||||
for( FILE *fp = popen( cmd, "r" ); fp; rc = pclose(fp), fp = 0) {
|
rc = system(cmd);
|
||||||
// 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;
|
|
||||||
// }
|
|
||||||
#elif is(win32)
|
#elif is(win32)
|
||||||
STARTUPINFOA si = {0}; si.cb = sizeof(si);
|
STARTUPINFOA si = {0}; si.cb = sizeof(si);
|
||||||
PROCESS_INFORMATION pi = {0};
|
PROCESS_INFORMATION pi = {0};
|
||||||
|
|
Binary file not shown.
BIN
tools/cook.osx
BIN
tools/cook.osx
Binary file not shown.
Loading…
Reference in New Issue