mr4th-public
/
4coder
1
Fork 0
Code Issues Releases Activity

got build working on Mac, doing more cleanup

master
Allen Webster 2017-07-07 23:38:29 -04:00
parent 2c0e22e7e1
commit 0a7b7d0d60
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
meta/4ed_file_moving.h
View File

@ -93,6 +93,39 @@ static char platform_correct_slash = '/';
#error Slash not set for this platform. #error Slash not set for this platform.
#endif #endif
// File Extensions
#if defined(IS_WINDOWS)
#define EXE ".exe"
#elif defined(IS_LINUX) || defined(IS_MAC)
#define EXE ""
#else
#error No EXE format specified for this OS
#endif
#if defined(IS_WINDOWS)
#define PDB ".pdb"
#elif defined(IS_LINUX) || defined(IS_MAC)
#define PDB ""
#else
#error No PDB format specified for this OS
#endif
#if defined(IS_WINDOWS)
#define DLL ".dll"
#elif defined(IS_LINUX) || defined(IS_MAC)
#define DLL ".so"
#else
#error No DLL format specified for this OS
#endif
#if defined(IS_WINDOWS)
#define BAT ".bat"
#elif defined(IS_LINUX) || defined(IS_MAC)
#define BAT ".sh"
#else
#error No BAT format specified for this OS
#endif
#endif #endif
// //
@ -349,7 +382,7 @@ fm_popdir(Temp_Dir temp){
} }
static void static void
fm_init_time_system(){ fm_init_system(){
// NOTE(allen): do nothing // NOTE(allen): do nothing
} }
@ -378,12 +411,12 @@ fm_execute_in_dir(char *dir, char *str, char *args){
if (args){ if (args){
Temp_Dir temp = fm_pushdir(dir); Temp_Dir temp = fm_pushdir(dir);
systemf("%s %s", str, args); systemf("%s %s", str, args);
popdir(temp); fm_popdir(temp);
} }
else{ else{
Temp_Dir temp = fm_pushdir(dir); Temp_Dir temp = fm_pushdir(dir);
systemf("%s", str); systemf("%s", str);
popdir(temp); fm_popdir(temp);
} }
} }
else{ else{
@ -458,8 +491,7 @@ fm_zip(char *parent, char *folder, char *file){
Temp_Dir temp = fm_pushdir(parent); Temp_Dir temp = fm_pushdir(parent);
printf("PARENT DIR: %s\n", parent); printf("PARENT DIR: %s\n", parent);
systemf("zip -r %s %s", file, folder); systemf("zip -r %s %s", file, folder);
fm_popdir(temp);
popdir(temp);
} }
#else #else

36
meta/build.cpp
View File

@ -21,38 +21,6 @@
// reusable // reusable
// //
#if defined(IS_WINDOWS)
#define EXE ".exe"
#elif defined(IS_LINUX) || defined(IS_MAC)
#define EXE ""
#else
#error No EXE format specified for this OS
#endif
#if defined(IS_WINDOWS)
#define PDB ".pdb"
#elif defined(IS_LINUX) || defined(IS_MAC)
#define PDB ""
#else
#error No PDB format specified for this OS
#endif
#if defined(IS_WINDOWS)
#define DLL ".dll"
#elif defined(IS_LINUX) || defined(IS_MAC)
#define DLL ".so"
#else
#error No DLL format specified for this OS
#endif
#if defined(IS_WINDOWS)
#define BAT ".bat"
#elif defined(IS_LINUX) || defined(IS_MAC)
#define BAT ".sh"
#else
#error No BAT format specified for this OS
#endif
static void static void
swap_ptr(char **A, char **B){ swap_ptr(char **A, char **B){
char *a = *A; char *a = *A;
@ -431,9 +399,9 @@ build(u32 flags, char *code_path, char **code_files, char *out_path, char *out_f
swap_ptr(&line.build_options, &line.build_options_prev); swap_ptr(&line.build_options, &line.build_options_prev);
Temp_Dir temp = pushdir(out_path); Temp_Dir temp = fm_pushdir(out_path);
systemf("g++ %s -o %s", line.build_options, out_file); systemf("g++ %s -o %s", line.build_options, out_file);
popdir(temp); fm_popdir(temp);
} }
#else #else