ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge other things that didn't come up on windows build

This commit is contained in:
Allen Webster 2020-01-16 18:33:00 -08:00
parent 9e72096bdf
commit 99f30cfe77
1 changed files with 6 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
bin/4ed_build.cpp
View File

@ -69,11 +69,8 @@ char *compiler_names[] = {
# define This_Compiler Compiler_CL # define This_Compiler Compiler_CL
#elif COMPILER_GCC #elif COMPILER_GCC
# define This_Compiler Compiler_GCC # define This_Compiler Compiler_GCC
<<<<<<< HEAD
=======
#elif COMPILER_CLANG #elif COMPILER_CLANG
# define This_Compiler Compiler_Clang # define This_Compiler Compiler_Clang
>>>>>>> yuval_macos_platform_layer
#else #else
# error This compilers is not enumerated. # error This compilers is not enumerated.
#endif #endif
@ -306,29 +303,6 @@ build(Arena *arena, u32 flags, u32 arch, char *code_path, char **code_files, cha
#define GCC_LIBS_X64 GCC_LIBS_COMMON #define GCC_LIBS_X64 GCC_LIBS_COMMON
#define GCC_LIBS_X86 GCC_LIBS_COMMON #define GCC_LIBS_X86 GCC_LIBS_COMMON
<<<<<<< HEAD
#elif OS_MAC
# define GCC_OPTS \
"-Wno-write-strings -Wno-deprecated-declarations " \
"-Wno-comment -Wno-switch -Wno-null-dereference " \
"-Wno-tautological-compare " \
"-Wno-unused-result "
#define GCC_LIBS_COMMON \
"-framework Cocoa -framework QuartzCore " \
"-framework CoreServices " \
"-framework OpenGL -framework IOKit "
#define GCC_LIBS_X64 GCC_LIBS_COMMON \
FOREIGN "/x64/libfreetype-mac.a"
#define GCC_LIBS_X86 GCC_LIBS_COMMON \
FOREIGN "/x86/libfreetype-mac.a"
#else
# error gcc options not set for this platform
=======
#else #else
# error gcc options not set for this platform # error gcc options not set for this platform
#endif #endif
@ -427,7 +401,6 @@ FOREIGN "/x86/libfreetype-mac.a"
#else #else
# error clang options not set for this platform # error clang options not set for this platform
>>>>>>> yuval_macos_platform_layer
#endif #endif
internal void internal void
@ -448,11 +421,7 @@ build(Arena *arena, u32 flags, u32 arch, char *code_path, char **code_files, cha
} }
if (flags & OPTS){ if (flags & OPTS){
<<<<<<< HEAD fm_add_to_line(line, CLANG_OPTS);
fm_add_to_line(line, GCC_OPTS);
=======
fm_add_to_line(line, CLANG_OPTS);
>>>>>>> yuval_macos_platform_layer
} }
fm_add_to_line(line, "-I%s", code_path); fm_add_to_line(line, "-I%s", code_path);
@ -489,32 +458,21 @@ build(Arena *arena, u32 flags, u32 arch, char *code_path, char **code_files, cha
if (flags & LIBS){ if (flags & LIBS){
if (arch == Arch_X64){ if (arch == Arch_X64){
<<<<<<< HEAD fm_add_to_line(line, CLANG_LIBS_X64);
fm_add_to_line(line, GCC_LIBS_X64);
}
else if (arch == Arch_X86)
{
fm_add_to_line(line, GCC_LIBS_X86);
=======
fm_add_to_line(line, CLANG_LIBS_X64);
} }
else if (arch == Arch_X86) else if (arch == Arch_X86)
{ {
fm_add_to_line(line, CLANG_LIBS_X86); fm_add_to_line(line, CLANG_LIBS_X86);
>>>>>>> yuval_macos_platform_layer
} }
} }
fm_finish_build_line(&line); fm_finish_build_line(&line);
Temp_Dir temp = fm_pushdir(out_path); Temp_Dir temp = fm_pushdir(out_path);
<<<<<<< HEAD
systemf("g++ %s -o %s", line.build_options, out_file); // systemf("clang++ %s -E -o %s", line.build_options, "4ed.i");
======= systemf("clang++ %s -o %s", line.build_options, out_file);
// systemf("clang++ %s -E -o %s", line.build_options, "4ed.i"); fm_popdir(temp);
systemf("clang++ %s -o %s", line.build_options, out_file);
>>>>>>> yuval_macos_platform_layer
fm_popdir(temp);
} }
#else #else