main.v: fix broken thirdparty dependencies
parent
ced6f7ffba
commit
9c1fc6717f
|
@ -84,6 +84,7 @@ mut:
|
|||
out_name string // "program.exe"
|
||||
is_prod bool // use "-O2" and skip printlns (TODO I don't thik many people want printlns to disappear in prod buidls)
|
||||
is_repl bool
|
||||
vroot string
|
||||
}
|
||||
|
||||
fn main() {
|
||||
|
@ -825,6 +826,7 @@ fn new_v(args[]string) *V {
|
|||
build_mode: build_mode
|
||||
is_run: args.contains('run')
|
||||
is_repl: args.contains('-repl')
|
||||
vroot: lang_dir
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -70,6 +70,7 @@ mut:
|
|||
calling_c bool
|
||||
cur_fn *Fn
|
||||
returns bool
|
||||
vroot string
|
||||
}
|
||||
|
||||
const (
|
||||
|
@ -99,6 +100,7 @@ fn (c mut V) new_parser(path string, run Pass) Parser {
|
|||
build_mode: c.build_mode
|
||||
is_repl: c.is_repl
|
||||
run: run
|
||||
vroot: c.vroot
|
||||
}
|
||||
p.next()
|
||||
// p.scanner.debug_tokens()
|
||||
|
@ -2605,7 +2607,7 @@ fn (p mut Parser) chash() {
|
|||
pos := flag.index(' ')
|
||||
flag = flag.right(pos)
|
||||
}
|
||||
flag = flag.trim_space()
|
||||
flag = flag.trim_space().replace('@VROOT', p.vroot)
|
||||
if p.table.flags.contains(flag) {
|
||||
return
|
||||
}
|
||||
|
|
4
gl/gl.v
4
gl/gl.v
|
@ -14,8 +14,8 @@ import const (
|
|||
)
|
||||
|
||||
// TODO: windows support
|
||||
#flag linux -I$HOME/code/v/thirdparty/glad
|
||||
#flag darwin -I$HOME/code/v/thirdparty/glad
|
||||
#flag linux -I @VROOT/thirdparty/glad
|
||||
#flag darwin -I @VROOT/thirdparty/glad
|
||||
|
||||
#include "glad.h"
|
||||
#include "glad.c"
|
||||
|
|
|
@ -5,8 +5,9 @@
|
|||
module json
|
||||
|
||||
// TODO: windows support
|
||||
#flag linux -I$HOME/code/v/thirdparty/cJSON
|
||||
#flag darwin -I$HOME/code/v/thirdparty/cJSON
|
||||
|
||||
#flag linux -I @VROOT/thirdparty/cJSON
|
||||
#flag darwin -I @VROOT/thirdparty/cJSON
|
||||
|
||||
// #include "cJSON.c"
|
||||
#include "cJSON.h"
|
||||
|
|
|
@ -6,8 +6,8 @@ module stbi
|
|||
|
||||
import gl
|
||||
|
||||
#flag linux -I$HOME/code/v/thirdparty/stb_image
|
||||
#flag darwin -I$HOME/code/v/thirdparty/stb_image
|
||||
#flag linux -I @VROOT/thirdparty/stb_image
|
||||
#flag darwin -I @VROOT/thirdparty/stb_image
|
||||
|
||||
#define STB_IMAGE_IMPLEMENTATION
|
||||
#include "stb_image.h"
|
||||
|
|
Loading…
Reference in New Issue