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

added new externals repository for fonts and libs

This commit is contained in:
Allen Webster 2017-07-13 16:26:19 -04:00
parent 665fc2ba35
commit 5db53af699
6 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist_files/fonts/CutiveMono-Regular.ttf
View File

Binary file not shown.

BIN
dist_files/fonts/Hack-Regular.ttf
View File

Binary file not shown.

BIN
dist_files/fonts/Inconsolata-Regular.ttf
View File

Binary file not shown.

BIN
dist_files/fonts/LiberationSans-Regular.ttf
View File

Binary file not shown.

BIN
dist_files/fonts/liberation-mono.ttf
View File

Binary file not shown.

11
meta/4ed_build.cpp
View File

@ -76,7 +76,10 @@ char *compiler_names[] = {
#define PACK_DIR "../distributions" #define PACK_DIR "../distributions"
#define SITE_DIR "../site" #define SITE_DIR "../site"
char *includes[] = { "../foreign", "../foreign/freetype2", 0, }; #define FOREIGN "../4coder-non-source/foreign"
#define FOREIGN_WIN "..\\4coder-non-source\\foreign"
char *includes[] = { FOREIGN, FOREIGN"/freetype2", 0, };
// //
// Platform layer file tables // Platform layer file tables
@ -188,11 +191,11 @@ get_defines_from_flags(u32 flags){
#define CL_LIBS_X64 \ #define CL_LIBS_X64 \
"user32.lib winmm.lib gdi32.lib opengl32.lib " \ "user32.lib winmm.lib gdi32.lib opengl32.lib " \
"..\\foreign_x64\\freetype.lib" FOREIGN_WIN"\\x64\\freetype.lib"
#define CL_LIBS_X86 \ #define CL_LIBS_X86 \
"user32.lib winmm.lib gdi32.lib opengl32.lib " \ "user32.lib winmm.lib gdi32.lib opengl32.lib " \
"..\\foreign_x86\\freetype.lib" FOREIGN_WIN"\\x86\\freetype.lib"
#define CL_ICON "..\\res\\icon.res" #define CL_ICON "..\\res\\icon.res"
@ -572,7 +575,7 @@ package(char *cdir){
char *build_dir = fm_str(BUILD_DIR); char *build_dir = fm_str(BUILD_DIR);
char *pack_dir = fm_str(PACK_DIR); char *pack_dir = fm_str(PACK_DIR);
char *fonts_source_dir = fm_str("../code/dist_files/fonts"); char *fonts_source_dir = fm_str("../4coder-non-source/dist_files/fonts");
char *base_package_root = "../current_dist"; char *base_package_root = "../current_dist";