projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix uninitialized mem
[carveJwlIkooP6JGAAIwe30JlM.git]
/
build.sh
diff --git
a/build.sh
b/build.sh
index ace67bfe87e6e9ddddec5c1468fb4c7b587e5862..0b958721a60804f5854e175e43499f9694830e6a 100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-1,5
+1,6
@@
#!/bin/bash
#!/bin/bash
-# Copyright (C) 2021-2022 Harry Godden (hgn) - All Rights Reserved
+#
+# Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
#
# Main cross-compiling build script for Skate Rift
# Supports Linux and Windows building from a Linux Host
#
# Main cross-compiling build script for Skate Rift
# Supports Linux and Windows building from a Linux Host
@@
-17,7
+18,7
@@
_linux_folder="bin/linux"
_linux_server_folder="bin/linux_server"
_windows_compiler="i686-w64-mingw32-gcc"
_linux_server_folder="bin/linux_server"
_windows_compiler="i686-w64-mingw32-gcc"
-_windows_linkgraphics="-lglfw3dll -lopengl32 -lm -mwindows"
+_windows_linkgraphics="-lglfw3dll -lopengl32 -lm -
pthread -static -
mwindows"
_windows_asan=""
_windows_linksteam="vg/dep/steam/steam_api.dll"
_windows_folder="bin/win32"
_windows_asan=""
_windows_linksteam="vg/dep/steam/steam_api.dll"
_windows_folder="bin/win32"
@@
-72,9
+73,9
@@
delay_run_game(){
}
link_content(){
}
link_content(){
- ln -sr
bin/content/textures/
$1/textures
- ln -sr
bin/content/models/
$1/models
- ln -sr
bin/content/sound/
$1/sound
+ ln -sr
f bin/content/textures
$1/textures
+ ln -sr
f bin/content/models
$1/models
+ ln -sr
f bin/content/sound
$1/sound
}
TIMESTAMP=`date +%Y-%m-%d_%H-%M-%S`
}
TIMESTAMP=`date +%Y-%m-%d_%H-%M-%S`
@@
-144,10
+145,11
@@
vg_command(){
# Dependencies
cp vg/dep/steam/steamclient.so bin/linux_server/
cp vg/dep/steam/libsteam_api.so bin/linux_server/
# Dependencies
cp vg/dep/steam/steamclient.so bin/linux_server/
cp vg/dep/steam/libsteam_api.so bin/linux_server/
+ cp vg/dep/steam/libsdkencryptedappticket.so bin/linux_server/
_compiler=$_linux_compiler
_options=$_linux_options
_compiler=$_linux_compiler
_options=$_linux_options
- _link="-
lm
$_linux_linksteam"
+ _link="-
pthread -lm -lsdkencryptedappticket
$_linux_linksteam"
_src="server.c"
_folder=$_linux_server_folder
_dst="skaterift_server"
_src="server.c"
_folder=$_linux_server_folder
_dst="skaterift_server"
@@
-196,7
+198,7
@@
vg_command(){
run_command game
run_command server
;;
run_command game
run_command server
;;
- dis
tribution
)
+ dis
b
)
mkdir -p ./dist
run_command release
run_command tools
mkdir -p ./dist
run_command release
run_command tools
@@
-205,7
+207,9
@@
vg_command(){
run_command content
run_command textures
run_command server
run_command content
run_command textures
run_command server
+ ;;
+ distribution)
titleit "Compressing distributions"
logit "Linux"
tar -chzvf dist/skaterift_linux__$TIMESTAMP.tar.gz bin/linux/
titleit "Compressing distributions"
logit "Linux"
tar -chzvf dist/skaterift_linux__$TIMESTAMP.tar.gz bin/linux/
@@
-213,6
+217,7
@@
vg_command(){
tar -chzvf dist/skaterift_server__$TIMESTAMP.tar.gz bin/linux_server
logit "Windows"
tar -chzvf dist/skaterift_win32__$TIMESTAMP.tar.gz bin/win32/
tar -chzvf dist/skaterift_server__$TIMESTAMP.tar.gz bin/linux_server
logit "Windows"
tar -chzvf dist/skaterift_win32__$TIMESTAMP.tar.gz bin/win32/
+ zip -r9 dist/skaterift_win32__$TIMESTAMP.zip bin/win32/
;;
# Runners
# ========================================================================
;;
# Runners
# ========================================================================
@@
-238,5
+243,8
@@
vg_command(){
esac
}
esac
}
+lsan_file=$(realpath ".lsan_suppress.txt")
+export LSAN_OPTIONS="suppressions=$lsan_file"
+
vg_command debug
source vg/vg_build.sh
vg_command debug
source vg/vg_build.sh