Menu
▾
▴
[Opengate-svn] SF.net SVN: opengate: [305] trunk/current
|
From: <qr...@us...> - 2006-12-12 15:41:23
|
Revision: 305
http://svn.sourceforge.net/opengate/?rev=305&view=rev
Author: qrstuvw
Date: 2006-12-12 07:41:21 -0800 (Tue, 12 Dec 2006)
Log Message:
-----------
Some adjustments to allow for canonical naming of libraries
Modified Paths:
--------------
trunk/current/configure.in
trunk/current/opengate.kdevelop
trunk/current/src/Makefile.am
trunk/current/src/client/GraphicsSetup.cpp
trunk/current/src/client/Makefile.am
trunk/current/src/client/OpenGateApp.cpp
Removed Paths:
-------------
trunk/current/src/client/logic/
trunk/current/src/client/state/
Modified: trunk/current/configure.in
===================================================================
--- trunk/current/configure.in 2006-12-12 13:00:08 UTC (rev 304)
+++ trunk/current/configure.in 2006-12-12 15:41:21 UTC (rev 305)
@@ -7,4 +7,4 @@
AC_PROG_CXX
AM_PROG_LIBTOOL
-AC_OUTPUT(Makefile src/Makefile src/client/Makefile src/common/Makefile src/deps/Makefile src/server/Makefile src/client/logic/Makefile src/client/state/Makefile src/deps/tinyxml/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/client/Makefile src/common/Makefile src/deps/Makefile src/server/Makefile src/deps/tinyxml/Makefile)
Modified: trunk/current/opengate.kdevelop
===================================================================
--- trunk/current/opengate.kdevelop 2006-12-12 13:00:08 UTC (rev 304)
+++ trunk/current/opengate.kdevelop 2006-12-12 15:41:21 UTC (rev 305)
@@ -13,24 +13,24 @@
<ignoreparts/>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
- <description></description>
- <versioncontrol></versioncontrol>
+ <description/>
+ <versioncontrol/>
</general>
<kdevautoproject>
<general>
- <activetarget>src/opengate</activetarget>
- <useconfiguration>debug</useconfiguration>
+ <activetarget>src/client/libOpenGateClient.la</activetarget>
+ <useconfiguration>optimized</useconfiguration>
</general>
<run>
- <mainprogram></mainprogram>
+ <mainprogram/>
<terminal>true</terminal>
<directoryradio>build</directoryradio>
<customdirectory>/</customdirectory>
- <programargs></programargs>
+ <programargs/>
<autocompile>true</autocompile>
<envvars/>
<runarguments>
- <opengate-client></opengate-client>
+ <opengate-client/>
</runarguments>
</run>
<configurations>
@@ -60,7 +60,7 @@
<runmultiplejobs>false</runmultiplejobs>
<numberofjobs>1</numberofjobs>
<dontact>false</dontact>
- <makebin></makebin>
+ <makebin/>
<prio>0</prio>
</make>
</kdevautoproject>
@@ -133,7 +133,7 @@
<projectdoc>
<docsystem>Doxygen Documentation Collection</docsystem>
<docurl>opengate.tag</docurl>
- <usermanualurl></usermanualurl>
+ <usermanualurl/>
</projectdoc>
</kdevdocumentation>
<substmap>
@@ -169,7 +169,7 @@
<root>/usr/lib/qt-3.3</root>
</qt>
<creategettersetter>
- <prefixGet></prefixGet>
+ <prefixGet/>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>
@@ -185,12 +185,12 @@
</cppsupportpart>
<kdevdebugger>
<general>
- <programargs></programargs>
- <gdbpath></gdbpath>
- <dbgshell></dbgshell>
- <configGdbScript></configGdbScript>
- <runShellScript></runShellScript>
- <runGdbScript></runGdbScript>
+ <programargs/>
+ <gdbpath/>
+ <dbgshell/>
+ <configGdbScript/>
+ <runShellScript/>
+ <runGdbScript/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
Modified: trunk/current/src/Makefile.am
===================================================================
--- trunk/current/src/Makefile.am 2006-12-12 13:00:08 UTC (rev 304)
+++ trunk/current/src/Makefile.am 2006-12-12 15:41:21 UTC (rev 305)
@@ -10,5 +10,4 @@
bin_PROGRAMS = opengate-client
opengate_client_SOURCES = Client.cpp
opengate_client_LDADD = $(top_builddir)/src/deps/tinyxml/libTinyXML.la \
- $(top_builddir)/src/client/state/libStates.la $(top_builddir)/src/client/libClient.la -L/usr/local/lib -lOgreMain \
- -lCEGUIOgreRenderer -lCEGUIBase
+ $(top_builddir)/src/client/state/libStates.la -L/usr/local/lib -lOgreMain -lCEGUIOgreRenderer -lCEGUIBase
Modified: trunk/current/src/client/GraphicsSetup.cpp
===================================================================
--- trunk/current/src/client/GraphicsSetup.cpp 2006-12-12 13:00:08 UTC (rev 304)
+++ trunk/current/src/client/GraphicsSetup.cpp 2006-12-12 15:41:21 UTC (rev 305)
@@ -39,20 +39,15 @@
// Load the render system (Linux only has OpenGL)
mFramework->ogreRoot->loadPlugin("/usr/local/lib/OGRE/RenderSystem_GL.so");
-
+ return false;
// Load engines settings
if (!loadEngineSettings(mFramework))
- {
- // Create the Graphics.xml file using default options
- if (!saveEngineSettings(mFramework))
- return false;
- if (!loadEngineSettings(mFramework))
- return false;
- }
+ return false;
+
// Write all the currently available settings as comment
- //if (!saveEngineSettings(mFramework))
- // return false;
+ if (!saveEngineSettings(mFramework))
+ return false;
// Load all resources from XML
if (!setupResources())
Modified: trunk/current/src/client/Makefile.am
===================================================================
--- trunk/current/src/client/Makefile.am 2006-12-12 13:00:08 UTC (rev 304)
+++ trunk/current/src/client/Makefile.am 2006-12-12 15:41:21 UTC (rev 305)
@@ -1,8 +1,9 @@
-INCLUDES = -I$(top_srcdir)/src/client -I$(top_srcdir)/src/deps \
- -I/usr/local/include/CEGUI -I/usr/local/include/OGRE $(all_includes)
+INCLUDES = -I$(top_srcdir)/src/deps -I/usr/local/include/CEGUI \
+ -I/usr/local/include/OGRE $(all_includes)
METASOURCES = AUTO
-SUBDIRS = logic state
-lib_LTLIBRARIES = libClient.la
-libClient_la_SOURCES = GameStateManager.cpp GraphicsSetup.cpp OpenGateApp.cpp
+
noinst_HEADERS = GameStateManager.h GameState.h Global.h OpenGateApp.h \
- GraphicsSetup.h
+ GraphicsSetup.h IntroState.h LoginListener.h LoginState.h
+lib_LTLIBRARIES = libOpenGateClient.la
+libOpenGateClient_la_SOURCES = GameStateManager.cpp GraphicsSetup.cpp \
+ OpenGateApp.cpp IntroState.cpp LoginState.cpp
Modified: trunk/current/src/client/OpenGateApp.cpp
===================================================================
--- trunk/current/src/client/OpenGateApp.cpp 2006-12-12 13:00:08 UTC (rev 304)
+++ trunk/current/src/client/OpenGateApp.cpp 2006-12-12 15:41:21 UTC (rev 305)
@@ -23,7 +23,7 @@
#include "GameStateManager.h"
// Game states
-#include "state/IntroState.h"
+#include "IntroState.h"
//--------------------------------------------------------------------------------//
/** Default constructor. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
