projects
/
vg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
95c9a82
)
dont force mingw
author
hgn
<hgodden00@gmail.com>
Sat, 14 May 2022 08:34:43 +0000
(09:34 +0100)
committer
hgn
<hgodden00@gmail.com>
Sat, 14 May 2022 08:34:43 +0000
(09:34 +0100)
vg_compiler.sh
patch
|
blob
|
history
diff --git
a/vg_compiler.sh
b/vg_compiler.sh
index 2573a403abe7d09ae34d9fed0bc86ff0a3bc012e..1af7fa8840dea5f9691ccdd88ba12849d0ef1e01 100755
(executable)
--- a/
vg_compiler.sh
+++ b/
vg_compiler.sh
@@
-69,7
+69,7
@@
target_os_windows(){
target_os_linux(){
target_ext=""
target_compiler="gcc"
target_os_linux(){
target_ext=""
target_compiler="gcc"
- target_libs="-lGL -lglfw -lX11 -lXxf86vm -lXrandr -lm -lpthread -lXi -ldl"
+ target_libs="-lGL -lglfw -lX11 -lXxf86vm -lXrandr -lm -lpthread -lXi -ldl
-static-libgcc
"
if [ "$opt_steam" != "" ]; then
target_libs="$target_libs -lsteam_api"
if [ "$opt_steam" != "" ]; then
target_libs="$target_libs -lsteam_api"
@@
-79,7
+79,7
@@
target_os_linux(){
target_steam_api="libsteam_api.so"
target_miniaudio="$vg_root/dep/dr_soft/miniaudio_linux.o"
if [ $opt_release = true ]; then
target_steam_api="libsteam_api.so"
target_miniaudio="$vg_root/dep/dr_soft/miniaudio_linux.o"
if [ $opt_release = true ]; then
- target_opts="-O
0
"
+ target_opts="-O
3
"
else
target_opts="-O0 -fsanitize=address -ggdb3 -fno-omit-frame-pointer"
fi
else
target_opts="-O0 -fsanitize=address -ggdb3 -fno-omit-frame-pointer"
fi
@@
-182,11
+182,7
@@
compile_assets(){
}
recompile_miniaudio(){
}
recompile_miniaudio(){
- target_os_windows
- precompile_x $vg_root/dep/dr_soft/miniaudio_impl.c $vg_root/dep/dr_soft/miniaudio_win32
-
- target_os_linux
- precompile_x $vg_root/dep/dr_soft/miniaudio_impl.c $vg_root/dep/dr_soft/miniaudio_linux
+ precompile_x $vg_root/dep/dr_soft/miniaudio_impl.c $target_miniaudio
}
# ==============================================================
}
# ==============================================================
@@
-294,8
+290,6
@@
detect_os(){
detect_os
detect_os
-if [ ! -f $vg_root/dep/dr_soft/miniaudio_linux.o ]; then opt_recompile_mini_audio=true; fi
-
titleit " vgc ver: $vg_version\n host: $host_os"
logit " assets: $opt_assets"
logit " release: $opt_release"
titleit " vgc ver: $vg_version\n host: $host_os"
logit " assets: $opt_assets"
logit " release: $opt_release"