Changeset 3106

Timestamp:

May 28, 2009, 5:18:42 PM (16 years ago)

Author:

adrfried

Message:

ggz build configuration bug fixed

Location:

code/branches/ggz/src

Files:

• CMakeLists.txt (modified) (1 diff)
• SpecialConfig.h.in (modified) (1 diff)
• orxonox/gamestates/GSClient.cc (modified) (4 diffs)
• orxonox/gamestates/GSClient.h (modified) (3 diffs)

code/branches/ggz/src/CMakeLists.txt

@@ -32 +32 @@
 # Tolua binding speedup if required
 ADD_COMPILER_FLAGS("-DTOLUA_RELEASE" Release MinSizeRel TOLUA_PARSER_RELEASE)
-# Enable GGZMode support if found
-IF(GGZMODE_FOUND)
-  ADD_COMPILER_FLAGS("-DHAS_GGZ")
-ENDIF()
 
 ################ OrxonoxConfig.h ################

code/branches/ggz/src/SpecialConfig.h.in

@@ -59 +59 @@
 #define MACRO_QUOTEME(x) MACRO_QUOTEME_AUX(x)
 
+/* Macro for availability of the ggzmod library */
+#cmakedefine GGZMOD_FOUND
+
 /* Handle default ConfigValues */
 namespace orxonox

code/branches/ggz/src/orxonox/gamestates/GSClient.cc

@@ -35 +35 @@
 #include "core/Core.h"
 #include "network/Client.h"
+#ifdef GGZMOD_FOUND
+#include "GGZClient.h"
+#endif /* GGZMOD_FOUND */
 
 namespace orxonox
@@ -54 +57 @@
         Core::setIsClient(true);
 
-#ifdef HAS_GGZ
+#ifdef GGZMOD_FOUND
         ggzClient = NULL;
         if (GGZClient::isActive()) {
@@ -63 +66 @@
             COUT(3) << "Not using GGZ\n";
         }
-#else  /* HAS_GGZ */
+#else  /* GGZMOD_FOUND */
         COUT(3) << "GGZ support disabled\n";
-#endif /* HAS_GGZ */
+#endif /* GGZMOD_FOUND */
 
         this->client_ = new Client(CommandLine::getValue("ip").getString(), CommandLine::getValue("port"));
@@ -83 +86 @@
         client_->closeConnection();
 
-#ifdef HAS_GGZ
+#ifdef GGZMOD_FOUND
         if (ggzClient)
         {
             delete ggzClient;
         }
-#endif /* HAS_GGZ */
+#endif /* GGZMOD_FOUND */
 
         // destroy client

code/branches/ggz/src/orxonox/gamestates/GSClient.h

@@ -30 +30 @@
 #define _GSClient_H__
 
+#include "SpecialConfig.h"
 #include "OrxonoxPrereqs.h"
 #include "network/NetworkPrereqs.h"
 #include "GSLevel.h"
 #include "GSGraphics.h"
-#ifdef HAS_GGZ
-#include "GGZClient.h"
-#endif /* HAS_GGZ */
 
 namespace orxonox
 {
+#ifdef GGZMOD_FOUND
+    class _OrxonoxExport GGZClient;
+#endif /* GGZMOD_FOUND */
+
     class _OrxonoxExport GSClient : public GameState<GSGraphics>, public GSLevel
     {
@@ -45 +47 @@
         GSClient();
         ~GSClient();
-
 
     private:
@@ -53 +54 @@
 
         Client* client_;
-#ifdef HAS_GGZ
+#ifdef GGZMOD_FOUND
         GGZClient* ggzClient;
-#endif /* HAS_GGZ */
-
+#endif /* GGZMOD_FOUND */
     };
 }