From 6237cb00e5f823fbb3938ddffb7aff6541e25d06 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Thu, 29 Jun 2017 20:10:34 -0400 Subject: [PATCH] setup platform folders (not on windows) --- meta/build.cpp | 7 +++---- gen_linux_icon.c => platform_linux/gen_linux_icon.c | 0 linux_4ed.cpp => platform_linux/linux_4ed.cpp | 0 .../linux_4ed_file_track.cpp | 0 linux_4ed_fonts.cpp => platform_linux/linux_4ed_fonts.cpp | 0 linux_font.cpp => platform_linux/linux_font.cpp | 0 linux_icon.h => platform_linux/linux_icon.h | 0 .../linux_release_compat.c | 0 mac_4ed.c => platform_mac/mac_4ed.c | 0 mac_4ed.m => platform_mac/mac_4ed.m | 0 10 files changed, 3 insertions(+), 4 deletions(-) rename gen_linux_icon.c => platform_linux/gen_linux_icon.c (100%) rename linux_4ed.cpp => platform_linux/linux_4ed.cpp (100%) rename linux_4ed_file_track.cpp => platform_linux/linux_4ed_file_track.cpp (100%) rename linux_4ed_fonts.cpp => platform_linux/linux_4ed_fonts.cpp (100%) rename linux_font.cpp => platform_linux/linux_font.cpp (100%) rename linux_icon.h => platform_linux/linux_icon.h (100%) rename linux_release_compat.c => platform_linux/linux_release_compat.c (100%) rename mac_4ed.c => platform_mac/mac_4ed.c (100%) rename mac_4ed.m => platform_mac/mac_4ed.m (100%) diff --git a/meta/build.cpp b/meta/build.cpp index 245a3e2e..1b3d8d78 100644 --- a/meta/build.cpp +++ b/meta/build.cpp @@ -385,11 +385,10 @@ buildsuper(char *code_path, char *out_path, char *filename, b32 x86_build){ } #elif defined(IS_GCC) { - fprintf(stdout, "out_path: %s\n", out_path); systemf("\"%s/buildsuper.sh\" \"%s\"", code_path, filename); } #else -#error The build rule for this compiler is not ready +# error The build rule for this compiler is not ready #endif popdir(temp); } @@ -397,9 +396,9 @@ buildsuper(char *code_path, char *out_path, char *filename, b32 x86_build){ #if defined(IS_WINDOWS) #define PLAT_LAYER "win32_4ed.cpp" #elif defined(IS_LINUX) -#define PLAT_LAYER "linux_4ed.cpp" +#define PLAT_LAYER "platform_linux/linux_4ed.cpp" #elif defined(IS_MAC) -#define PLAT_LAYER "mac_4ed.m" +#define PLAT_LAYER "platform_mac/mac_4ed.m" #else #error No platform layer defined for this OS. #endif diff --git a/gen_linux_icon.c b/platform_linux/gen_linux_icon.c similarity index 100% rename from gen_linux_icon.c rename to platform_linux/gen_linux_icon.c diff --git a/linux_4ed.cpp b/platform_linux/linux_4ed.cpp similarity index 100% rename from linux_4ed.cpp rename to platform_linux/linux_4ed.cpp diff --git a/linux_4ed_file_track.cpp b/platform_linux/linux_4ed_file_track.cpp similarity index 100% rename from linux_4ed_file_track.cpp rename to platform_linux/linux_4ed_file_track.cpp diff --git a/linux_4ed_fonts.cpp b/platform_linux/linux_4ed_fonts.cpp similarity index 100% rename from linux_4ed_fonts.cpp rename to platform_linux/linux_4ed_fonts.cpp diff --git a/linux_font.cpp b/platform_linux/linux_font.cpp similarity index 100% rename from linux_font.cpp rename to platform_linux/linux_font.cpp diff --git a/linux_icon.h b/platform_linux/linux_icon.h similarity index 100% rename from linux_icon.h rename to platform_linux/linux_icon.h diff --git a/linux_release_compat.c b/platform_linux/linux_release_compat.c similarity index 100% rename from linux_release_compat.c rename to platform_linux/linux_release_compat.c diff --git a/mac_4ed.c b/platform_mac/mac_4ed.c similarity index 100% rename from mac_4ed.c rename to platform_mac/mac_4ed.c diff --git a/mac_4ed.m b/platform_mac/mac_4ed.m similarity index 100% rename from mac_4ed.m rename to platform_mac/mac_4ed.m