[Opentnl-cvs] tnl/test Makefile,1.1,1.2 client.cpp,1.1,1.2
Brought to you by:
mark_frohnmayer,
s_alanet
From: John Q. <jm...@us...> - 2004-04-20 09:25:15
|
Update of /cvsroot/opentnl/tnl/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14767 Modified Files: Makefile client.cpp Log Message: Removed wxgui references in makefile and replaced with glut Fixed compile errors in client.cpp Index: client.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/test/client.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** client.cpp 20 Apr 2004 04:27:18 -0000 1.1 --- client.cpp 20 Apr 2004 09:25:06 -0000 1.2 *************** *** 7,10 **** --- 7,11 ---- #include "testGame.h" #include <stdio.h> + #include <string.h> class DedicatedServerLogConsumer : public LogConsumer *************** *** 23,27 **** S32 port = 28999; if(argc == 2) ! port = TNL::atoi(argv[1]); TestGame* theGame = new TestGame(false, Address(IPProtocol, Address::Any, port),Address(localBroadcastAddress)); for(;;) --- 24,28 ---- S32 port = 28999; if(argc == 2) ! port = atoi(argv[1]); TestGame* theGame = new TestGame(false, Address(IPProtocol, Address::Any, port),Address(localBroadcastAddress)); for(;;) Index: Makefile =================================================================== RCS file: /cvsroot/opentnl/tnl/test/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 20 Apr 2004 04:27:18 -0000 1.1 --- Makefile 20 Apr 2004 09:25:06 -0000 1.2 *************** *** 18,22 **** client.o ! OBJECTS_WXGUI=\ testGame.o\ testWindow.o \ --- 18,22 ---- client.o ! OBJECTS_TNLTEST=\ testGame.o\ testWindow.o \ *************** *** 33,40 **** $(CC) -o client $(OBJECTS_CLIENT) ../tnl/libtnl.a ../libtomcrypt/libtomcrypt.a -lstdc++ -lm ! wxgui: CFLAGS += `wx-config --cxxflags` ! wxgui: $(OBJECTS_WXGUI) ! @echo Building WX gui... ! $(CC) -o wxgui $(OBJECTS_WXGUI) ../tnl/libtnl.a ../libtomcrypt/libtomcrypt.a `wx-config --libs --gl-libs ` -lGL clean: ! rm -f $(OBJECTS_SERVER) $(OBJECTS_CLIENT) $(OBJECTS_WXGUI) server client wxgui --- 33,39 ---- $(CC) -o client $(OBJECTS_CLIENT) ../tnl/libtnl.a ../libtomcrypt/libtomcrypt.a -lstdc++ -lm ! tnltest: $(OBJECTS_TNLTEST) ! @echo Building TNLTest gui... ! $(CC) -o tnltest $(OBJECTS_TNLTEST) ../tnl/libtnl.a ../libtomcrypt/libtomcrypt.a -lGL -lGLU -lglut -lm clean: ! rm -f $(OBJECTS_SERVER) $(OBJECTS_CLIENT) $(OBJECTS_TNLTEST) server client tnltest |