diff --git a/vlib/sokol/f/f.v b/vlib/sokol/f/f.v index 20d94e6579..615c4b3033 100644 --- a/vlib/sokol/f/f.v +++ b/vlib/sokol/f/f.v @@ -7,30 +7,6 @@ pub const ( used_import = fontstash.used_import + c.used_import ) -/* -#flag windows -I @VROOT/thirdparty/freetype/include -#flag windows -L @VROOT/thirdparty/freetype/win64 - -#flag linux -I/usr/include/freetype2 -#flag darwin -I/usr/local/include/freetype2 -// MacPorts -#flag darwin -I/opt/local/include/freetype2 -#flag darwin -L/opt/local/lib -#flag freebsd -I/usr/local/include/freetype2 -#flag freebsd -Wl -L/usr/local/lib - -#flag windows -lfreetype -#flag linux -lfreetype -#flag darwin -lfreetype - -#flag darwin -lpng -lbz2 -lz -*/ - - - - - - #flag linux -I. //#include "ft2build.h" diff --git a/vlib/sokol/f/f_d_use_freetype.v b/vlib/sokol/f/f_d_use_freetype.v new file mode 100644 index 0000000000..38ff462e7d --- /dev/null +++ b/vlib/sokol/f/f_d_use_freetype.v @@ -0,0 +1,20 @@ +module f + +#define FONS_USE_FREETYPE + +#flag windows -I @VROOT/thirdparty/freetype/include +#flag windows -L @VROOT/thirdparty/freetype/win64 + +#flag linux -I/usr/include/freetype2 +#flag darwin -I/usr/local/include/freetype2 +// MacPorts +#flag darwin -I/opt/local/include/freetype2 +#flag darwin -L/opt/local/lib +#flag freebsd -I/usr/local/include/freetype2 +#flag freebsd -Wl -L/usr/local/lib + +#flag windows -lfreetype +#flag linux -lfreetype +#flag darwin -lfreetype + +#flag darwin -lpng -lbz2 -lz diff --git a/vlib/v/pref/should_compile.v b/vlib/v/pref/should_compile.v index 2a71c51dfb..f20917d6dd 100644 --- a/vlib/v/pref/should_compile.v +++ b/vlib/v/pref/should_compile.v @@ -20,7 +20,10 @@ pub fn (prefs &Preferences) should_compile_filtered_files(dir string, files_ []s if prefs.backend == .js && !prefs.should_compile_js(file) { continue } - if prefs.compile_defines_all.len > 0 && file.contains('_d_') { + if file.contains('_d_') { + if prefs.compile_defines_all.len == 0 { + continue + } mut allowed := false for cdefine in prefs.compile_defines { file_postfix := '_d_${cdefine}.v'