Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3106 for code/branches/ggz


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ggz/src/CMakeLists.txt

    r3002 r3106  
    3232# Tolua binding speedup if required
    3333ADD_COMPILER_FLAGS("-DTOLUA_RELEASE" Release MinSizeRel TOLUA_PARSER_RELEASE)
    34 # Enable GGZMode support if found
    35 IF(GGZMODE_FOUND)
    36   ADD_COMPILER_FLAGS("-DHAS_GGZ")
    37 ENDIF()
    3834
    3935################ OrxonoxConfig.h ################
  • code/branches/ggz/src/SpecialConfig.h.in

    r2710 r3106  
    5959#define MACRO_QUOTEME(x) MACRO_QUOTEME_AUX(x)
    6060
     61/* Macro for availability of the ggzmod library */
     62#cmakedefine GGZMOD_FOUND
     63
    6164/* Handle default ConfigValues */
    6265namespace orxonox
  • code/branches/ggz/src/orxonox/gamestates/GSClient.cc

    r3000 r3106  
    3535#include "core/Core.h"
    3636#include "network/Client.h"
     37#ifdef GGZMOD_FOUND
     38#include "GGZClient.h"
     39#endif /* GGZMOD_FOUND */
    3740
    3841namespace orxonox
     
    5457        Core::setIsClient(true);
    5558
    56 #ifdef HAS_GGZ
     59#ifdef GGZMOD_FOUND
    5760        ggzClient = NULL;
    5861        if (GGZClient::isActive()) {
     
    6366            COUT(3) << "Not using GGZ\n";
    6467        }
    65 #else  /* HAS_GGZ */
     68#else  /* GGZMOD_FOUND */
    6669        COUT(3) << "GGZ support disabled\n";
    67 #endif /* HAS_GGZ */
     70#endif /* GGZMOD_FOUND */
    6871
    6972        this->client_ = new Client(CommandLine::getValue("ip").getString(), CommandLine::getValue("port"));
     
    8386        client_->closeConnection();
    8487
    85 #ifdef HAS_GGZ
     88#ifdef GGZMOD_FOUND
    8689        if (ggzClient)
    8790        {
    8891            delete ggzClient;
    8992        }
    90 #endif /* HAS_GGZ */
     93#endif /* GGZMOD_FOUND */
    9194
    9295        // destroy client
  • code/branches/ggz/src/orxonox/gamestates/GSClient.h

    r3000 r3106  
    3030#define _GSClient_H__
    3131
     32#include "SpecialConfig.h"
    3233#include "OrxonoxPrereqs.h"
    3334#include "network/NetworkPrereqs.h"
    3435#include "GSLevel.h"
    3536#include "GSGraphics.h"
    36 #ifdef HAS_GGZ
    37 #include "GGZClient.h"
    38 #endif /* HAS_GGZ */
    3937
    4038namespace orxonox
    4139{
     40#ifdef GGZMOD_FOUND
     41    class _OrxonoxExport GGZClient;
     42#endif /* GGZMOD_FOUND */
     43
    4244    class _OrxonoxExport GSClient : public GameState<GSGraphics>, public GSLevel
    4345    {
     
    4547        GSClient();
    4648        ~GSClient();
    47 
    4849
    4950    private:
     
    5354
    5455        Client* client_;
    55 #ifdef HAS_GGZ
     56#ifdef GGZMOD_FOUND
    5657        GGZClient* ggzClient;
    57 #endif /* HAS_GGZ */
    58 
     58#endif /* GGZMOD_FOUND */
    5959    };
    6060}
Note: See TracChangeset for help on using the changeset viewer.