diff --git a/meta/4ed_build.cpp b/meta/4ed_build.cpp index edb044ea..387d4ca4 100644 --- a/meta/4ed_build.cpp +++ b/meta/4ed_build.cpp @@ -100,9 +100,9 @@ char *linux_gcc_platform_inc[] = { "platform_all", "platform_unix", 0 }; char *mac_gcc_platform_inc[] = { "platform_all", "platform_unix", 0 }; char **platform_includes[Platform_COUNT][Compiler_COUNT] = { - {windows_cl_platform_inc, 0 }, - {0 , linux_gcc_platform_inc }, - {0 , mac_gcc_platform_inc }, + {windows_cl_platform_inc, 0 }, + {0 , linux_gcc_platform_inc}, + {0 , mac_gcc_platform_inc }, }; // @@ -416,7 +416,7 @@ site_build(char *cdir, u32 flags){ if (prev_error == 0){ BEGIN_TIME_SECTION(); - char *cmd = fm_str(BUILD_DIR"/sitegen"); + char *cmd = fm_str(BUILD_DIR "/sitegen"); char *code_dir = fm_str("."); char *asset_dir = fm_str("../4coder-non-source/site_resources"); char *site_source_dir = fm_str("site/source_material"); @@ -510,7 +510,7 @@ get_freetype_include(char *out, u32 max){ char *freetype_include = "/usr/local/include/freetype2"; size = strlen(freetype_include); memcpy(out, freetype_include, size - ); + ); #endif #endif return(size); diff --git a/meta/4ed_file_moving.h b/meta/4ed_file_moving.h index c02c6ec7..4e91851b 100644 --- a/meta/4ed_file_moving.h +++ b/meta/4ed_file_moving.h @@ -606,8 +606,15 @@ fm__prepare(umem item_size, void *i1, va_list list){ void *result = (void*)fm__push(size); memcpy(result, i1, size); + fprintf(stdout, "%p\n%.4s\n", i1, i1); + fflush(stdout); + void *ln = va_arg(list, void*); for (;ln != 0;){ + fprintf(stdout, "%p\n" , ln); + fprintf(stdout, "%.4s\n", ln); + fflush(stdout); + size = listsize(ln, item_size); void *new_str = (void*)fm__push(size); memcpy(new_str, ln, size); diff --git a/platform_mac/mac_4ed.m b/platform_mac/mac_4ed.m index 0ed862ad..0f66af9e 100644 --- a/platform_mac/mac_4ed.m +++ b/platform_mac/mac_4ed.m @@ -138,7 +138,8 @@ static DISPLINK_SIG(osx_display_link); } - (void)requestDisplay{ - NSRect rect = CGRectMake(0, 0, osx_objc.width, osx_objc.height); + CGRect cg_rect = CGRectMake(0, 0, osx_objc.width, osx_objc.height); + NSRect rect = NSRectFromCGRect(cg_rect); [self setNeedsDisplayInRect:rect]; } diff --git a/project.4coder b/project.4coder index e8b251d8..6954b467 100644 --- a/project.4coder +++ b/project.4coder @@ -19,5 +19,5 @@ fkey_command_mac[1] = {"echo build: x64 & ./build.sh", "*compilation*" , true , fkey_command_mac[2] = {"build_site.sh" , "*site*" , false, true }; fkey_command_mac[3] = {"build_string.sh" , "*compilation*" , true , true }; fkey_command_mac[4] = {"echo build: x86 & ./build.sh -DDEV_BUILD_X86" , "*compilation*", true, true }; -fkey_command_mac[12] = {"./package.sh" , "*package*" , false, true }; +fkey_command_mac[10] = {"./package.sh" , "*package*" , false, true };