vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

build scripts: shuffle things around so that we override FTE's makefile properly in regards to CC

Browse source
This commit is contained in:
Marco Cawthorne 2022-05-05 15:28:37 -07:00
parent 32ae91d54f
commit 10adaaff54
Signed by: eukara
GPG key ID: C196CD8BA993248A
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build_editor.sh
View file

@ -83,7 +83,7 @@ then
gmake clean gmake clean
fi fi
CC=$WS_CC CXX=$WS_CXX CFLAGS="$WS_CFLAGS" LDFLAGS="$WS_LDFLAGS" gmake -j $BUILD_PROC gmake -j $BUILD_PROC CC=$WS_CC CXX=$WS_CXX CFLAGS="$WS_CFLAGS" LDFLAGS="$WS_LDFLAGS"
mkdir -p ../../bin/bitmaps mkdir -p ../../bin/bitmaps
mv_wsfile defaultkeys.ini mv_wsfile defaultkeys.ini

8
build_engine.sh
View file

@ -122,19 +122,19 @@ fi
if [ "$BUILD_ENGINE_DEPENDENCIES" -eq 1 ] if [ "$BUILD_ENGINE_DEPENDENCIES" -eq 1 ]
then then
CC=$ENGINE_CC CXX=$ENGINE_CXX gmake -j $BUILD_PROC makelibs FTE_TARGET=$PLATFORM gmake -j $BUILD_PROC CC=$ENGINE_CC CXX=$ENGINE_CXX makelibs FTE_TARGET=$PLATFORM
printf "Built the static dependencies successfully.\n\n" printf "Built the static dependencies successfully.\n\n"
fi fi
CC=$ENGINE_CC CXX=$ENGINE_CXX gmake -j $BUILD_PROC $MAKETARGET CFLAGS=-DMULTITHREAD FTE_TARGET=$PLATFORM gmake -j $BUILD_PROC CC=$ENGINE_CC CXX=$ENGINE_CXX $MAKETARGET CFLAGS=-DMULTITHREAD FTE_TARGET=$PLATFORM
cp -v "$OUTPUT" ../../../bin/fteqw cp -v "$OUTPUT" ../../../bin/fteqw
printf "Built the client engine successfully.\n\n" printf "Built the client engine successfully.\n\n"
CC=$ENGINE_CC CXX=$ENGINE_CXX gmake -j $BUILD_PROC sv-dbg gmake -j $BUILD_PROC CC=$ENGINE_CC CXX=$ENGINE_CXX sv-dbg
cp -v ./debug/fteqw-sv ../../../bin/fteqw-sv cp -v ./debug/fteqw-sv ../../../bin/fteqw-sv
printf "Built the dedicated server successfully.\n\n" printf "Built the dedicated server successfully.\n\n"
CC=$ENGINE_CC CXX=$ENGINE_CXX gmake -j $BUILD_PROC qcc-rel gmake -j $BUILD_PROC CC=$ENGINE_CC CXX=$ENGINE_CXX qcc-rel
cp -v ./release/fteqcc ../../../bin/fteqcc cp -v ./release/fteqcc ../../../bin/fteqcc
printf "Built the QuakeC compiler successfully.\n\n" printf "Built the QuakeC compiler successfully.\n\n"

2
build_tools.sh
View file

@ -65,7 +65,7 @@ then
gmake clean gmake clean
fi fi
CC=$ENGINE_CC CXX=$ENGINE_CXX gmake -j $BUILD_PROC gmake -j $BUILD_PROC CC=$ENGINE_CC CXX=$ENGINE_CXX
printf "Built vvmtool successfully.\n" printf "Built vvmtool successfully.\n"
cp -v vvmtool ../../bin/vvmtool cp -v vvmtool ../../bin/vvmtool
printf "DONE. Built ALL components successfully.\n" printf "DONE. Built ALL components successfully.\n"

2
src/gs-entbase/shared/ambient_generic.qc
View file

@ -21,7 +21,7 @@ Plays a sound sample of whatever format the engine is configured to support.
"targetname" : Name "targetname" : Name
"target" : Target when triggered. "target" : Target when triggered.
"killtarget" : Target to kill when triggered. "killtarget" : Target to kill when triggered.
"message" : Sound file to play "message" : Sound file to play, or sentences.txt entry if prefixed with a '!'
"volume" : Playback volume from 0.0 to 1.0 "volume" : Playback volume from 0.0 to 1.0
"pitch" : Playback pitch from 0.0 to 2.0 "pitch" : Playback pitch from 0.0 to 2.0