Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 29, 2009, 11:35:54 PM (16 years ago)
Author:
rgrieder
Message:

This commit gets a little ugly, couldn't separate that anymore:

  • Renamed UseTolua.cmake to GenerateLuaBindings.cmake
  • Applied the macros for compiler flags, linker flags, header files and source groups Updated the whole build tree for that
  • Created real compiler config scripts (BuildConfigGCC.cmake and BuildConfigMSVC.cmake)
  • Large scale clean up in BuildConfig.cmake
  • You can now specify your own LibraryConfig and BuildConfig script via CMake Cache
  • Lots of small changes and fixes
Location:
code/branches/buildsystem2/src/orxonox/gui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem2/src/orxonox/gui/CMakeLists.txt

    r2569 r2621  
    1 ADD_SOURCE_FILES(
     1ADD_SOURCE_FILES(ORXONOX_SRC_FILES
    22  GUIManager.cc
    33)
  • code/branches/buildsystem2/src/orxonox/gui/GUIManager.cc

    r2610 r2621  
    3939#include <OgreRoot.h>
    4040#include <CEGUI.h>
    41 #include <ceguilua/CEGUILua.h>
    4241#include <ogreceguirenderer/OgreCEGUIRenderer.h>
     42#ifdef CEGUILUA_USE_INTERNAL_LIBRARY
     43#   include <ceguilua/CEGUILua.h>
     44#else
     45#   include <CEGUILua.h>
     46#endif
    4347
    4448#include "util/Exception.h"
     
    103107                //lua_pushnil(luaState_);
    104108                //lua_setglobal(luaState_, "Core");
    105             // TODO: deleting the script module fails an assertation.
     109            // TODO: deleting the script module fails an assertion.
    106110            // However there is not much we can do about it since it occurs too when
    107111            // we don't open Core or Orxonox. Might be a CEGUI issue.
Note: See TracChangeset for help on using the changeset viewer.