projects
/
vg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
getting stuff working on windows again
[vg.git]
/
vg_build.h
diff --git
a/vg_build.h
b/vg_build.h
index 03f82fc1f4f819c7e2b8337f6adc5b18d0d4b942..37f00338019419ce20cdbc5556881fc9995d8a4e 100644
(file)
--- a/
vg_build.h
+++ b/
vg_build.h
@@
-110,11
+110,20
@@
void vg_build_add_link_for_graphics(void)
}
else
{
}
else
{
- vg_build_link( "-lmingw32 -lSDL2main -lSDL2 -lopengl32 -mwindows " );
+ vg_build_link( "-lmingw32 -lSDL2main -lSDL2 -lopengl32 -mwindows \\\n" );
+ vg_build_link( " -Wl,--dynamicbase -Wl,--nxcompat " );
}
vg_build_object( "vg/dep/glad/glad.c " );
}
vg_build_object( "vg/dep/glad/glad.c " );
- vg_build_link( "-lm -pthread " );
+
+ vg_build_link( "-lm " );
+ if( vg_compiler.compiler == k_compiler_mingw ){
+ //vg_build_link( "-mthreads " );
+ //vg_build_link( "-static-libgcc " );
+ }
+ else{
+ vg_build_link( "-pthread " );
+ }
}
void vg_build_add_link_for_game(void)
}
void vg_build_add_link_for_game(void)
@@
-217,9
+226,13
@@
void vg_build(void)
" -Wall\\\n"
" -Wno-unused-function -Wno-unused-variable\\\n"
" -Wno-unused-command-line-argument -Wno-unused-but-set-variable\\\n"
" -Wall\\\n"
" -Wno-unused-function -Wno-unused-variable\\\n"
" -Wno-unused-command-line-argument -Wno-unused-but-set-variable\\\n"
- " -ferror-limit=5\\\n"
);
);
+ if( vg_compiler.compiler == k_compiler_clang ){
+ strcat( cmd,
+ " -ferror-limit=5\\\n" );
+ }
+
/* Include */
strcat( cmd, " " );
strcat( cmd, vg_compiler.include );
/* Include */
strcat( cmd, " " );
strcat( cmd, vg_compiler.include );