[Opentnl-cvs] tnl/zap Makefile,1.1,1.2 point.h,1.1,1.2 sfx.cpp,1.2,1.3
Brought to you by:
mark_frohnmayer,
s_alanet
From: John Q. <jm...@us...> - 2004-04-20 09:28:35
|
Update of /cvsroot/opentnl/tnl/zap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15237 Modified Files: Makefile point.h sfx.cpp Log Message: Added new files to makefile include #stdlib in point.h for atoi function Re-enabled sound on linux Index: point.h =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/point.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** point.h 20 Apr 2004 04:27:20 -0000 1.1 --- point.h 20 Apr 2004 09:28:26 -0000 1.2 *************** *** 28,31 **** --- 28,32 ---- #define _POINT_H_ #include <math.h> + #include <stdlib.h> namespace Zap Index: Makefile =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 20 Apr 2004 04:27:19 -0000 1.1 --- Makefile 20 Apr 2004 09:28:25 -0000 1.2 *************** *** 5,11 **** # Configuration # ! CC=g++ -g -I../tnl #-O2 OBJECTS_ZAP=\ game.o\ gameConnection.o\ --- 5,12 ---- # Configuration # ! CC=g++ -g -I../tnl -I../glut -I../openal -DTNL_DEBUG #-O2 OBJECTS_ZAP=\ + CTFGame.o\ game.o\ gameConnection.o\ *************** *** 13,19 **** --- 14,23 ---- gameNetInterface.o\ gameObject.o\ + gameType.o\ gridDB.o\ + item.o\ masterConnection.o\ ../master/masterInterface.o\ + moveObject.o\ UI.o\ UIGame.o\ *************** *** 23,26 **** --- 27,31 ---- projectile.o\ ship.o\ + sfx.o\ SweptEllipsoid.o\ sparkManager.o\ *************** *** 36,40 **** default: $(OBJECTS_ZAP) ! $(CC) -o zap $(OBJECTS_ZAP) ../tnl/libtnl.a ../libtomcrypt/libtomcrypt.a -lstdc++ -lGL -lGLU -lglut -lm ../master/masterInterface.o: --- 41,45 ---- default: $(OBJECTS_ZAP) ! $(CC) -o zap $(OBJECTS_ZAP) ../tnl/libtnl.a ../libtomcrypt/libtomcrypt.a ../openal/linux/libopenal.a -lpthread -lstdc++ -lGL -lGLU -lglut -lm ../master/masterInterface.o: Index: sfx.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/sfx.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sfx.cpp 20 Apr 2004 08:51:29 -0000 1.2 --- sfx.cpp 20 Apr 2004 09:28:26 -0000 1.3 *************** *** 29,33 **** #include "tnlLog.h" ! #if defined (TNL_OS_WIN32) #include "alInclude.h" --- 29,33 ---- #include "tnlLog.h" ! #if defined (TNL_OS_WIN32) || defined (TNL_OS_LINUX) #include "alInclude.h" *************** *** 453,455 **** }; ! #endif \ No newline at end of file --- 453,455 ---- }; ! #endif |