zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lunatic: update user_defs, CPLUSPLUS=0 in synthesis.sh, disable 'cutscene' for now.

Browse source 
BUILD_LUNATIC.

git-svn-id: https://svn.eduke32.com/eduke32@5029 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-02-22 19:31:17 +00:00
parent 06f0c0c06b
commit f5254f2114
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/source/lunatic/con_lang.lua
View file

@ -1258,7 +1258,7 @@ lpeg.P(false) +
"default" + "default" +
"debug" + "debug" +
"debris" + "debris" +
"cutscene" + --"cutscene" +
"cstator" + "cstator" +
"cstat" + "cstat" +
"count" + "count" +

2
polymer/eduke32/source/lunatic/defs.ilua
View file

@ -547,8 +547,6 @@ typedef struct {
// //
// Sound variables // Sound variables
// //
int32_t FXDevice;
int32_t MusicDevice;
int32_t MasterVolume; int32_t MasterVolume;
int32_t FXVolume; int32_t FXVolume;
int32_t MusicVolume; int32_t MusicVolume;

4
polymer/eduke32/source/lunatic/lunacon.lua
View file

@ -2951,8 +2951,8 @@ local Cinner = {
starttrackvar = cmd(R) starttrackvar = cmd(R)
/ "_con._starttrack(%1)", / "_con._starttrack(%1)",
cutscene = cmd(R) -- cutscene = cmd(R)
/ handle.NYI, -- / handle.NYI,
getmusicposition = cmd(W) getmusicposition = cmd(W)
/ "%1=_con._getmusicposition()", / "%1=_con._getmusicposition()",
setmusicposition = cmd(R) setmusicposition = cmd(R)

4
polymer/synthesis.sh
View file

@ -190,8 +190,8 @@ then
if [ -n "$BUILD_LUNATIC" ]; then if [ -n "$BUILD_LUNATIC" ]; then
# clean the tree and build # clean the tree and build
echo "${make64[@]}" LUNATIC=1 $clean all echo "${make64[@]}" LUNATIC=1 CPLUSPLUS=0 $clean all
"${make64[@]}" LUNATIC=1 $clean all "${make64[@]}" LUNATIC=1 CPLUSPLUS=0 $clean all
# make sure all the targets were produced # make sure all the targets were produced
verifytargets verifytargets