diff --git a/dist_files/fonts/CutiveMono-Regular.ttf b/dist_files/fonts/CutiveMono-Regular.ttf new file mode 100644 index 00000000..efe0f334 Binary files /dev/null and b/dist_files/fonts/CutiveMono-Regular.ttf differ diff --git a/dist_files/fonts/Hack-Regular.ttf b/dist_files/fonts/Hack-Regular.ttf new file mode 100644 index 00000000..7c8e65b8 Binary files /dev/null and b/dist_files/fonts/Hack-Regular.ttf differ diff --git a/dist_files/fonts/Inconsolata-Regular.ttf b/dist_files/fonts/Inconsolata-Regular.ttf new file mode 100644 index 00000000..a87ffba6 Binary files /dev/null and b/dist_files/fonts/Inconsolata-Regular.ttf differ diff --git a/dist_files/fonts/LiberationSans-Regular.ttf b/dist_files/fonts/LiberationSans-Regular.ttf new file mode 100644 index 00000000..a788fbdd Binary files /dev/null and b/dist_files/fonts/LiberationSans-Regular.ttf differ diff --git a/dist_files/fonts/liberation-mono.ttf b/dist_files/fonts/liberation-mono.ttf new file mode 100644 index 00000000..61af64ea Binary files /dev/null and b/dist_files/fonts/liberation-mono.ttf differ diff --git a/meta/build.cpp b/meta/build.cpp index 7f648191..f633e20b 100644 --- a/meta/build.cpp +++ b/meta/build.cpp @@ -356,13 +356,15 @@ buildsuper(char *code_path, char *out_path, char *filename, b32 x86_build){ Temp_Dir temp = pushdir(out_path); #if defined(IS_CL) { - char *prefix = ""; + char *prefix_1 = ""; + char *prefix_2 = ""; char *build_script = "buildsuper.bat"; if (x86_build){ - prefix = "setup_clx86 & "; + prefix_1 = code_path; + prefix_2 = "\\setup_cl_x86.bat & "; build_script = "buildsuper_x86.bat"; } - systemf("%scall \"%s\\%s\" %s", prefix, code_path, build_script, filename); + systemf("%s%scall \"%s\\%s\" %s", prefix_1, prefix_2, code_path, build_script, filename); } #elif defined(IS_GCC) { @@ -597,8 +599,7 @@ package(char *cdir){ metagen(cdir); #define SITE_DIR "../site" -#define PACK_DATA_DIR "../data/dist_files" -#define PACK_FONTS_DIR PACK_DATA_DIR"/fonts" +#define PACK_FONTS_DIR "../code/dist_files/fonts" DECL_STR(build_dir, BUILD_DIR); DECL_STR(site_dir, SITE_DIR);