Skip to content

Commit

Permalink
Build again after a long long time. Works now with 64 Bit!
Browse files Browse the repository at this point in the history
  • Loading branch information
theZiz committed Sep 22, 2016
1 parent 17a5250 commit b908c91
Show file tree
Hide file tree
Showing 26 changed files with 29 additions and 29 deletions.
18 changes: 9 additions & 9 deletions OpenParty/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@ all: openparty optestboard optestgame
all-4install: openparty-4install testboard-4install testgame-4install

openparty: openparty.cpp ingame_kalib.h main.h play_minigame.h var.h camera.h game.h level.h light.h objects.h sets.h texts.h dice.h scriptdefs.h script.h message.h choose.h turn.h menu.h opminigames.h minigamescontrol.h minigamespre.h minigameslast.h opvar.h ballon_background.h options.h all_control.h newgame_calib.h newgame_choose.h newgame_cpu.h newgame_gamekind.h newgame_rounds.h newgame_teams_2.h newgame_teams_3.h newgame_teams_4.h newgame_turnsort.h about.h aftergame.h joytest.h minigames.h newgame_login.h
g++ openparty.cpp -o openparty `sdl-config --cflags --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl
g++ openparty.cpp -o openparty `sdl-config --cflags --libs` -L. -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl

openparty-4install: openparty.cpp ingame_kalib.h main.h play_minigame.h var.h camera.h game.h level.h light.h objects.h sets.h texts.h dice.h scriptdefs.h script.h message.h choose.h turn.h menu.h opminigames.h minigamescontrol.h minigamespre.h minigameslast.h opvar.h ballon_background.h options.h all_control.h newgame_calib.h newgame_choose.h newgame_cpu.h newgame_gamekind.h newgame_rounds.h newgame_teams_2.h newgame_teams_3.h newgame_teams_4.h newgame_turnsort.h about.h aftergame.h joytest.h minigames.h newgame_login.h
g++ openparty.cpp -o openparty -DFORINSTALL `sdl-config --cflags --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl
g++ openparty.cpp -o openparty -DFORINSTALL `sdl-config --cflags --libs` -L. -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl

openparty-debug: openparty.cpp ingame_kalib.h main.h play_minigame.h var.h camera.h game.h level.h light.h objects.h sets.h texts.h dice.h scriptdefs.h script.h message.h choose.h turn.h menu.h opminigames.h minigamescontrol.h minigamespre.h minigameslast.h opvar.h ballon_background.h options.h all_control.h newgame_calib.h newgame_choose.h newgame_cpu.h newgame_gamekind.h about.h newgame_login.h newgame_rounds.h newgame_teams_2.h newgame_teams_3.h newgame_teams_4.h newgame_turnsort.h aftergame.h joytest.h minigames.h
g++ openparty.cpp -ggdb -o openparty `sdl-config --cflags --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl
g++ openparty.cpp -ggdb -o openparty `sdl-config --cflags --libs` -L. -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl

optestboard: testboard.cpp ingame_kalib.h play_minigame.h main.h var.h camera.h game.h level.h light.h objects.h sets.h texts.h dice.h scriptdefs.h script.h message.h choose.h turn.h partikel_funcs.h sounds.h choosecircle.h ./minigames.h ./minigamescontrol.h ./minigamespre.h ./minigameslast.h
g++ testboard.cpp -o optestboard `sdl-config --cflags --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl
g++ testboard.cpp -o optestboard `sdl-config --cflags --libs` -L. -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl

optestboard-4install: testboard.cpp ingame_kalib.h play_minigame.h main.h var.h camera.h game.h level.h light.h objects.h sets.h texts.h dice.h scriptdefs.h script.h message.h choose.h turn.h partikel_funcs.h sounds.h choosecircle.h ./minigames.h ./minigamescontrol.h ./minigamespre.h ./minigameslast.h
g++ testboard.cpp -o optestboard -DFORINSTALL `sdl-config --cflags --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl
g++ testboard.cpp -o optestboard -DFORINSTALL `sdl-config --cflags --libs` -L. -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl

optestboard-debug: testboard.cpp ingame_kalib.h play_minigame.h main.h var.h camera.h game.h level.h light.h objects.h sets.h texts.h dice.h scriptdefs.h script.h message.h choose.h turn.h partikel_funcs.h sounds.h choosecircle.h ./minigames.h ./minigamescontrol.h ./minigamespre.h ./minigameslast.h
g++ testboard.cpp -ggdb -o optestboard `sdl-config --cflags --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl
g++ testboard.cpp -ggdb -o optestboard `sdl-config --cflags --libs` -L. -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl

optestgame: testgame.cpp minigames.h minigamescontrol.h minigamespre.h minigameslast.h
g++ testgame.cpp -o optestgame `sdl-config --cflags --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl
g++ testgame.cpp -o optestgame `sdl-config --cflags --libs` -L. -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl

optestgame-4install: testgame.cpp minigames.h minigamescontrol.h minigamespre.h minigameslast.h
g++ testgame.cpp -o optestgame -DFORINSTALL `sdl-config --cflags --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl
g++ testgame.cpp -o optestgame -DFORINSTALL `sdl-config --cflags --libs` -L. -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl

optestgame-debug: testgame.cpp minigames.h minigamescontrol.h minigamespre.h minigameslast.h
g++ testgame.cpp -ggdb -o optestgame `sdl-config --cflags --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl
g++ testgame.cpp -ggdb -o optestgame `sdl-config --cflags --libs` -L. -lSDL_image -lSDL_ttf -lSDL_mixer -lGL -lGLU -lzizopenparty -ldl

4 changes: 2 additions & 2 deletions OpenParty/games_dev/Energizer/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
all: Energizer.pp
fpc Energizer.pp -oEnergizer.so -Xs -XX -fPIC
fpc -Fu"../../../zizutils/pascal_headers/" -Fl"../../../zizutils/" Energizer.pp -oEnergizer.so -Xs -XX -fPIC

debug: Energizer.pp
fpc Energizer.pp -oEnergizer.so -gw -fPIC
fpc -Fu"../../../zizutils/pascal_headers/" -Fl"../../../zizutils/" Energizer.pp -oEnergizer.so -gw -fPIC
4 changes: 2 additions & 2 deletions OpenParty/games_dev/ikosaeder_implosion/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
all: ikosaeder_implosion.pp
fpc ikosaeder_implosion.pp -oikosaeder_implosion.so -Xs -XX -fPIC
fpc -Fu"../../../zizutils/pascal_headers/" -Fl"../../../zizutils/" ikosaeder_implosion.pp -oikosaeder_implosion.so -Xs -XX -fPIC

debug: ikosaeder_implosion.pp
fpc ikosaeder_implosion.pp -oikosaeder_implosion.so -gw -fPIC
fpc -Fu"../../../zizutils/pascal_headers/" -Fl"../../../zizutils/" ikosaeder_implosion.pp -oikosaeder_implosion.so -gw -fPIC
4 changes: 2 additions & 2 deletions OpenParty/games_dev/ikosaeder_memory/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
all: ikosaeder_memory.pp
fpc ikosaeder_memory.pp -oikosaeder_memory.so -Xs -XX -fPIC
fpc -Fu"../../../zizutils/pascal_headers/" -Fl"../../../zizutils/" ikosaeder_memory.pp -oikosaeder_memory.so -Xs -XX -fPIC

debug: ikosaeder_memory.pp
fpc ikosaeder_memory.pp -oikosaeder_memory.so -gw -fPIC
fpc -Fu"../../../zizutils/pascal_headers/" -Fl"../../../zizutils/" ikosaeder_memory.pp -oikosaeder_memory.so -gw -fPIC
4 changes: 2 additions & 2 deletions OpenParty/games_dev/king_pong/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
all: king_pong.pp
fpc king_pong.pp -oking_pong.so -Xs -XX -fPIC
fpc -Fu"../../../zizutils/pascal_headers/" -Fl"../../../zizutils/" king_pong.pp -oking_pong.so -Xs -XX -fPIC

debug: king_pong.pp
fpc king_pong.pp -oking_pong.so -gw -fPIC
fpc -Fu"../../../zizutils/pascal_headers/" -Fl"../../../zizutils/" king_pong.pp -oking_pong.so -gw -fPIC
4 changes: 2 additions & 2 deletions OpenParty/games_dev/skeleton_pascal/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
all: skeleton_pascal.pp
fpc skeleton_pascal.pp -oskeleton_pascal.so -Xs -XX -fPIC
fpc -Fu"../../../zizutils/pascal_headers/" -Fl"../../../zizutils/" skeleton_pascal.pp -oskeleton_pascal.so -Xs -XX -fPIC

debug: skeleton_pascal.pp
fpc skeleton_pascal.pp -oskeleton_pascal.so -gw -fPIC
fpc -Fu"../../../zizutils/pascal_headers/" -Fl"../../../zizutils/" skeleton_pascal.pp -oskeleton_pascal.so -gw -fPIC
4 changes: 2 additions & 2 deletions OpenParty/games_dev/worm_hole_surfer/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
all: worm_hole_surfer.lpr
fpc worm_hole_surfer.lpr -oworm_hole_surfer.so -Xs -XX -fPIC
fpc -Fu"../../../zizutils/pascal_headers/" -Fl"../../../zizutils/" worm_hole_surfer.lpr -oworm_hole_surfer.so -Xs -XX -fPIC

debug: worm_hole_surfer.lpr
fpc worm_hole_surfer.lpr -oworm_hole_surfer.so -gw -fPIC
fpc -Fu"../../../zizutils/pascal_headers/" -Fl"../../../zizutils/" worm_hole_surfer.lpr -oworm_hole_surfer.so -gw -fPIC
Binary file modified OpenParty/games_dev/worm_hole_surfer/glLight.ppu
Binary file not shown.
Binary file modified OpenParty/games_dev/worm_hole_surfer/glMesh.ppu
Binary file not shown.
Binary file modified OpenParty/games_dev/worm_hole_surfer/glVBOMesh.ppu
Binary file not shown.
Binary file modified OpenParty/games_dev/worm_hole_surfer/u3DSpline.ppu
Binary file not shown.
Binary file modified OpenParty/games_dev/worm_hole_surfer/uParticles.ppu
Binary file not shown.
Binary file modified OpenParty/games_dev/worm_hole_surfer/uPositionList.ppu
Binary file not shown.
Binary file modified OpenParty/games_dev/worm_hole_surfer/uSplineTube.ppu
Binary file not shown.
Binary file modified OpenParty/games_dev/worm_hole_surfer/uUtils.ppu
Binary file not shown.
Binary file modified OpenParty/games_dev/worm_hole_surfer/uWormHoleSurfer.ppu
Binary file not shown.
4 changes: 2 additions & 2 deletions OpenParty/joytest.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ void draw_joytest(pmenudata data)
glColor4f(0,0,0,0.8);
ZWdrawtext(text,-2.7+(float)zeile*dist_x+0.65*(float)spalte,0.5-(float)zeile*dist_y,-4,buffer,zoom*0.8);
if (a%2==0)
sprintf(buffer,"[>]",a);
sprintf(buffer,"[>]");
else
sprintf(buffer,"[v]",a);
sprintf(buffer,"[v]");
if (ZWattribute->realjoystick[joy].axis[a]>0)
glColor4f(1.0,0.5,0.5,0.8);
else
Expand Down
2 changes: 1 addition & 1 deletion OpenParty/objects.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,6 @@ void deleteallobjects(void)
ZWdeletedrawlist(sky.sky);
ZWdeleteobject(sky.sky);
}
sprintf(sky.texture,"");
sky.texture[0] = 0;
}

6 changes: 3 additions & 3 deletions OpenParty/script.h
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ pcompiledblock createblock(ptermelem term)
pknownvar newvar;
pfunctab functab=NULL;
pfunctab ft;
int *varanz;
long int *varanz;
pjumpstack jumpstack=NULL;
pjumpstack tempstack;
while (now!=NULL)
Expand Down Expand Up @@ -860,7 +860,7 @@ pcompiledblock createblock(ptermelem term)
case '{': //Funktion
block[pos].art='{';
block[pos].param.wert_i=0;
block[pos].jump=(int)now->function;
block[pos].jump=(long int)now->function;
tempstack=(pjumpstack)malloc(sizeof(tjumpstack));
tempstack->nr=pos;
tempstack->next=jumpstack;
Expand Down Expand Up @@ -931,7 +931,7 @@ pcompiledblock createblock(ptermelem term)
pos++;
break;
case 'p':
block[pos].jump=NULL;
block[pos].jump=0; //NULL
block[pos].art='p';
block[pos].param.wert_i=0;
tempstack=(pjumpstack)malloc(sizeof(tjumpstack));
Expand Down
2 changes: 1 addition & 1 deletion OpenParty/scriptdefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ typedef struct sblockelem {
// 'w' while, 'x' elihw (until), 'd' do, 'o' od, 'i' if, 'j' fi, 'l' else, 'v' Variable,'s' set,
// '#' Aufrufende, 'g' globale Variable
blockparameter param; //bei art=='b' größe des benötigten Stacks (inklusive Parameter)
int jump; //Jumpziel oder bei art=='b' Anzahl der Parameter
long int jump; //Jumpziel oder bei art=='b' Anzahl der Parameter
} tblockelem;

typedef struct sfunctab *pfunctab;
Expand Down
2 changes: 1 addition & 1 deletion OpenParty/var.h
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ void init_var(void)

ZWattribute->on_resize=on_resize;
srand( time(0));
sprintf(sky.texture,"");
sky.texture[0] = 0;
maindata.player[0].momset=NULL; maindata.player[1].momset=NULL; maindata.player[2].momset=NULL; maindata.player[3].momset=NULL;
maindata.player[4].momset=NULL; maindata.player[5].momset=NULL; maindata.player[6].momset=NULL; maindata.player[7].momset=NULL;

Expand Down
Binary file modified zizutils/pascal_headers/minigames.ppu
Binary file not shown.
Binary file modified zizutils/pascal_headers/texture.ppu
Binary file not shown.
Binary file modified zizutils/pascal_headers/threedobjects.ppu
Binary file not shown.
Binary file modified zizutils/pascal_headers/ttf.ppu
Binary file not shown.
Binary file modified zizutils/pascal_headers/zizwindow.ppu
Binary file not shown.

0 comments on commit b908c91

Please sign in to comment.