From 4b03abdaffb1fce4b99bbc167298df3e4801ee4f Mon Sep 17 00:00:00 2001 From: sunnylcw <54568172+sunnylcw@users.noreply.github.com> Date: Sat, 28 Sep 2019 19:18:04 +0800 Subject: [PATCH] compiler: enable FreeBSD's cflags for freetype & glfw --- compiler/cflags.v | 3 ++- vlib/freetype/freetype.v | 2 ++ vlib/glfw/glfw.v | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/compiler/cflags.v b/compiler/cflags.v index ec7e1e5a65..2393870337 100644 --- a/compiler/cflags.v +++ b/compiler/cflags.v @@ -25,6 +25,7 @@ fn (v &V) get_os_cflags() []CFlag { if flag.os == '' || (flag.os == 'linux' && v.os == .linux) || (flag.os == 'darwin' && v.os == .mac) + || (flag.os == 'freebsd' && v.os == .freebsd) || (flag.os == 'windows' && (v.os == .windows || v.os == .msvc)) { flags << flag } @@ -81,7 +82,7 @@ fn (table mut Table) parse_cflag(cflag string, mod string) { } mut fos := '' mut name := '' - if flag.starts_with('linux') || flag.starts_with('darwin') || flag.starts_with('windows') { + if flag.starts_with('linux') || flag.starts_with('darwin') || flag.starts_with('freebsd') || flag.starts_with('windows') { pos := flag.index(' ') fos = flag.left(pos).trim_space() flag = flag.right(pos).trim_space() diff --git a/vlib/freetype/freetype.v b/vlib/freetype/freetype.v index 6534b58f60..fe5f92b927 100644 --- a/vlib/freetype/freetype.v +++ b/vlib/freetype/freetype.v @@ -17,6 +17,8 @@ import ( #flag darwin -I/usr/local/include/freetype2 #flag darwin -I/opt/local/include/freetype2 +#flag freebsd -I/usr/local/include/freetype2 +#flag freebsd -Wl,-L/usr/local/lib #flag -lfreetype //#flag -I @VROOT/thirdparty/freetype diff --git a/vlib/glfw/glfw.v b/vlib/glfw/glfw.v index abd95ce547..2c0c43561d 100644 --- a/vlib/glfw/glfw.v +++ b/vlib/glfw/glfw.v @@ -18,6 +18,8 @@ import gl #flag darwin -L/opt/local/lib #flag darwin -lglfw +#flag freebsd -I/usr/local/include +#flag freebsd -Wl,-L/usr/local/lib,-lglfw #flag linux -lglfw #flag windows -lglfw3 #include