vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

"#flag mingw ..." support

pull/4002/head
vitalyster 2020-03-12 20:20:19 +03:00 committed by GitHub
parent 07921194f2
commit 0df6eaa927
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vlib/compiler/cflags.v
View File

@ -25,7 +25,7 @@ fn (v &V) get_os_cflags() []CFlag {
}
for flag in v.table.cflags {
if flag.os == '' || (flag.os == 'linux' && v.pref.os == .linux) || (flag.os == 'darwin' && v.pref.os == .mac) || (flag.os == 'freebsd' && v.pref.os == .freebsd) || (flag.os == 'windows' && v.pref.os == .windows) {
if flag.os == '' || (flag.os == 'linux' && v.pref.os == .linux) || (flag.os == 'darwin' && v.pref.os == .mac) || (flag.os == 'freebsd' && v.pref.os == .freebsd) || (flag.os == 'windows' && v.pref.os == .windows) || (flag.os == 'mingw' && v.pref.os == .windows && v.pref.ccompiler != 'msvc') {
flags << flag
}
if flag.os in ctimedefines {
@ -82,7 +82,7 @@ fn (table mut Table) parse_cflag(cflag string, mod string, ctimedefines []string
return true
}
mut fos := ''
mut allowed_os_overrides := ['linux','darwin','freebsd','windows']
mut allowed_os_overrides := ['linux', 'darwin', 'freebsd', 'windows', 'mingw']
allowed_os_overrides << ctimedefines
for os_override in allowed_os_overrides {
if !flag.starts_with( os_override ) { continue }

1
vlib/glfw/glfw.v
View File

@ -22,6 +22,7 @@ import gl
#flag freebsd -Wl,-L/usr/local/lib,-lglfw
#flag linux -lglfw
#flag windows -lgdi32 -lshell32 -lglfw3
#flag mingw -mwindows
#include <GLFW/glfw3.h>
// #flag darwin -framework Carbon
// #flag darwin -framework Cocoa