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

mac libfreetype linkage

This commit is contained in:
Allen Webster 2017-11-11 14:54:31 -05:00
parent f836f60b3b
commit f46c37f0d0
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
meta/4ed_build.cpp
View File

@ -309,20 +309,29 @@ build(u32 flags, u32 arch, char *code_path, char **code_files, char *out_path, c
"-D_GNU_SOURCE -fPIC " \ "-D_GNU_SOURCE -fPIC " \
"-fno-threadsafe-statics -pthread" "-fno-threadsafe-statics -pthread"
#define GCC_LIBS \ #define GCC_LIBS_COMMON \
"-L/usr/local/lib -lX11 -lpthread -lm -lrt " \ "-L/usr/local/lib -lX11 -lpthread -lm -lrt " \
"-lGL -ldl -lXfixes -lfreetype -lfontconfig" "-lGL -ldl -lXfixes -lfreetype -lfontconfig"
#define GCC_LIBS_X64 GCC_LIBS_COMMON
#define GCC_LIBS_X86 GCC_LIBS_COMMON
#elif defined(IS_MAC) #elif defined(IS_MAC)
# define GCC_OPTS \ # define GCC_OPTS \
"-Wno-write-strings -Wno-deprecated-declarations " \ "-Wno-write-strings -Wno-deprecated-declarations " \
"-Wno-comment -Wno-switch -Wno-null-dereference " "-Wno-comment -Wno-switch -Wno-null-dereference "
#define GCC_LIBS \ #define GCC_LIBS_COMMON \
"-framework Cocoa -framework QuartzCore " \ "-framework Cocoa -framework QuartzCore " \
"-framework CoreServices " \ "-framework CoreServices " \
"-framework OpenGL -framework IOKit -lfreetype" "-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 #else
# error gcc options not set for this platform # error gcc options not set for this platform
@ -382,7 +391,13 @@ build(u32 flags, u32 arch, char *code_path, char **code_files, char *out_path, c
} }
if (flags & LIBS){ if (flags & LIBS){
fm_add_to_line(line, GCC_LIBS); if (arch == Arch_X64){
fm_add_to_line(line, GCC_LIBS_X64);
}
else if (arch == Arch_X86)
{
fm_add_to_line(line, GCC_LIBS_X86);
}
} }
fm_finish_build_line(&line); fm_finish_build_line(&line);