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

main.v: fix broken thirdparty dependencies

pull/554/head
Alexander Medvednikov 2019-06-25 14:24:12 +02:00
parent ced6f7ffba
commit 9c1fc6717f
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/main.v
View File

@ -84,6 +84,7 @@ mut:
out_name string // "program.exe" 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_prod bool // use "-O2" and skip printlns (TODO I don't thik many people want printlns to disappear in prod buidls)
is_repl bool is_repl bool
vroot string
} }
fn main() { fn main() {
@ -825,6 +826,7 @@ fn new_v(args[]string) *V {
build_mode: build_mode build_mode: build_mode
is_run: args.contains('run') is_run: args.contains('run')
is_repl: args.contains('-repl') is_repl: args.contains('-repl')
vroot: lang_dir
} }
} }

4
compiler/parser.v
View File

@ -70,6 +70,7 @@ mut:
calling_c bool calling_c bool
cur_fn *Fn cur_fn *Fn
returns bool returns bool
vroot string
} }
const ( const (
@ -99,6 +100,7 @@ fn (c mut V) new_parser(path string, run Pass) Parser {
build_mode: c.build_mode build_mode: c.build_mode
is_repl: c.is_repl is_repl: c.is_repl
run: run run: run
vroot: c.vroot
} }
p.next() p.next()
// p.scanner.debug_tokens() // p.scanner.debug_tokens()
@ -2605,7 +2607,7 @@ fn (p mut Parser) chash() {
pos := flag.index(' ') pos := flag.index(' ')
flag = flag.right(pos) flag = flag.right(pos)
} }
flag = flag.trim_space() flag = flag.trim_space().replace('@VROOT', p.vroot)
if p.table.flags.contains(flag) { if p.table.flags.contains(flag) {
return return
} }

4
gl/gl.v
View File

@ -14,8 +14,8 @@ import const (
) )
// TODO: windows support // TODO: windows support
#flag linux -I$HOME/code/v/thirdparty/glad #flag linux -I @VROOT/thirdparty/glad
#flag darwin -I$HOME/code/v/thirdparty/glad #flag darwin -I @VROOT/thirdparty/glad
#include "glad.h" #include "glad.h"
#include "glad.c" #include "glad.c"

5
json/json_primitives.v
View File

@ -5,8 +5,9 @@
module json module json
// TODO: windows support // 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.c"
#include "cJSON.h" #include "cJSON.h"

4
stbi/stbi.v
View File

@ -6,8 +6,8 @@ module stbi
import gl import gl
#flag linux -I$HOME/code/v/thirdparty/stb_image #flag linux -I @VROOT/thirdparty/stb_image
#flag darwin -I$HOME/code/v/thirdparty/stb_image #flag darwin -I @VROOT/thirdparty/stb_image
#define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION
#include "stb_image.h" #include "stb_image.h"