Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9670 for code/branches/libs


Ignore:
Timestamp:
Sep 8, 2013, 5:34:34 PM (11 years ago)
Author:
landauf
Message:

adjusted build-system and include-paths for cegui 0.8 (doesn't compile yet)

Location:
code/branches/libs
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/libs/cmake/tools/FindCEGUI.cmake

    r9163 r9670  
    3131INCLUDE(HandleLibraryTypes)
    3232
    33 # Find CEGUI headers
    34 FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
     33# Determine CEGUI's version
     34FIND_FILE(CEGUI_VERSION_FILE CEGUIVersion.h Version.h
    3535  PATHS $ENV{CEGUIDIR}
    3636  PATH_SUFFIXES include include/CEGUI
    3737)
     38DETERMINE_VERSION(CEGUI ${CEGUI_VERSION_FILE})
    3839
    39 # Inspect CEGUIVersion.h for the version number
    40 DETERMINE_VERSION(CEGUI ${CEGUI_INCLUDE_DIR}/CEGUIVersion.h)
     40# Find CEGUI headers
     41COMPARE_VERSION_STRINGS("${CEGUI_VERSION}" "0.8" _version_0_8_compare TRUE)
     42# Version 0.8 introduced a new directory and file naming convention
     43IF(_version_0_8_compare GREATER -1)
     44  # 0.8 and newer
     45  FIND_PATH(CEGUI_INCLUDE_DIR CEGUI/CEGUI.h
     46    PATHS $ENV{CEGUIDIR}
     47    PATH_SUFFIXES include
     48  )
     49ELSE()
     50  # 0.8 and older
     51  FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
     52    PATHS $ENV{CEGUIDIR}
     53    PATH_SUFFIXES include include/CEGUI
     54  )
     55ENDIF()
    4156
    4257# Find CEGUI library
    4358FIND_LIBRARY(CEGUI_LIBRARY_OPTIMIZED
    44   NAMES CEGUIBase CEGUI
     59  NAMES CEGUIBase CEGUI CEGUIBase-0
    4560  PATHS $ENV{CEGUIDIR}
    4661  PATH_SUFFIXES lib bin
     
    5570
    5671# Find CEGUILua headers
    57 FIND_PATH(CEGUILUA_INCLUDE_DIR CEGUILua.h
     72FIND_PATH(CEGUILUA_INCLUDE_DIR CEGUILua.h Functor.h
    5873  PATHS
    5974    $ENV{CEGUIDIR}
    6075    $ENV{CEGUILUADIR}
    6176    ${CEGUI_INCLUDE_DIR}/ScriptingModules/LuaScriptModule
     77    ${CEGUI_INCLUDE_DIR}/CEGUI/ScriptModules/Lua
    6278  PATH_SUFFIXES include include/CEGUI
    6379)
    6480# Find CEGUILua libraries
    6581FIND_LIBRARY(CEGUILUA_LIBRARY_OPTIMIZED
    66   NAMES CEGUILua CEGUILuaScriptModule
     82  NAMES CEGUILua CEGUILuaScriptModule CEGUILuaScriptModule-0
    6783  PATHS $ENV{CEGUIDIR} $ENV{CEGUILUADIR}
    6884  PATH_SUFFIXES lib bin
     
    8298    # For newer CEGUI versions >= 0.7
    8399    ${CEGUILUA_INCLUDE_DIR}/support/tolua++
     100    ${DEP_INCLUDE_DIR}/tolua++/include
    84101    # For Mac OS X, tolua++ is a separate framework in the dependency package
    85102    ${DEP_FRAMEWORK_DIR}
     
    99116
    100117# Newer versions of CEGUI have the renderer for OGRE shipped with them
    101 COMPARE_VERSION_STRINGS("${CEGUI_VERSION}" "0.7" _version_compare TRUE)
    102 IF(_version_compare GREATER -1)
     118COMPARE_VERSION_STRINGS("${CEGUI_VERSION}" "0.7" _version_0_7_compare TRUE)
     119IF(_version_0_7_compare GREATER -1)
    103120  # Find CEGUI OGRE Renderer headers
    104   FIND_PATH(CEGUI_OGRE_RENDERER_INCLUDE_DIR CEGUIOgreRenderer.h
     121  FIND_PATH(CEGUI_OGRE_RENDERER_INCLUDE_DIR CEGUIOgreRenderer.h Renderer.h
    105122    PATHS
    106123      $ENV{CEGUIDIR}
     
    111128  # Find CEGUI OGRE Renderer libraries
    112129  FIND_LIBRARY(CEGUI_OGRE_RENDERER_LIBRARY_OPTIMIZED
    113     NAMES CEGUIOgreRenderer
     130    NAMES CEGUIOgreRenderer CEGUIOgreRenderer-0
    114131    PATHS $ENV{CEGUIDIR} $ENV{CEGUIOGRERENDERERDIR}
    115132    PATH_SUFFIXES lib bin
  • code/branches/libs/src/OrxonoxConfig.h.in

    r8858 r9670  
    246246#endif
    247247
     248// CEGUI changed its file naming convention in version 0.8 thus we cannot even include CEGUI's Version.h file before knowing its version
     249#include <@CEGUI_VERSION_FILE@>
     250#define CEGUI_VERSION ((CEGUI_VERSION_MAJOR << 16) | (CEGUI_VERSION_MINOR << 8) | CEGUI_VERSION_PATCH)
     251
    248252#endif /* _OrxonoxConfig_H__ */
  • code/branches/libs/src/libraries/core/CorePrereqs.h

    r9667 r9670  
    3838#include "OrxonoxConfig.h"
    3939#include <boost/version.hpp>
    40 #include <CEGUIVersion.h>
    4140
    4241//-----------------------------------------------------------------------
  • code/branches/libs/src/libraries/core/GUIManager.cc

    r9667 r9670  
    3636#include <OgreRenderWindow.h>
    3737
    38 #include <CEGUIDefaultLogger.h>
    39 #include <CEGUIExceptions.h>
    40 #include <CEGUIFontManager.h>
    41 #include <CEGUIInputEvent.h>
    42 #include <CEGUIMouseCursor.h>
    43 #include <CEGUIResourceProvider.h>
    44 #include <CEGUISystem.h>
    45 #include <CEGUIWindow.h>
    46 #include <CEGUIWindowManager.h>
    47 #include <CEGUIXMLAttributes.h>
    48 #include <elements/CEGUIListbox.h>
    49 #include <elements/CEGUIListboxItem.h>
     38#if CEGUI_VERSION >= 0x000800
     39#   include <CEGUI/DefaultLogger.h>
     40#   include <CEGUI/Exceptions.h>
     41#   include <CEGUI/FontManager.h>
     42#   include <CEGUI/InputEvent.h>
     43#   include <CEGUI/MouseCursor.h>
     44#   include <CEGUI/ResourceProvider.h>
     45#   include <CEGUI/System.h>
     46#   include <CEGUI/Window.h>
     47#   include <CEGUI/WindowManager.h>
     48#   include <CEGUI/XMLAttributes.h>
     49#   include <CEGUI/widgets/Listbox.h>
     50#   include <CEGUI/widgets/ListboxItem.h>
     51#else
     52#   include <CEGUIDefaultLogger.h>
     53#   include <CEGUIExceptions.h>
     54#   include <CEGUIFontManager.h>
     55#   include <CEGUIInputEvent.h>
     56#   include <CEGUIMouseCursor.h>
     57#   include <CEGUIResourceProvider.h>
     58#   include <CEGUISystem.h>
     59#   include <CEGUIWindow.h>
     60#   include <CEGUIWindowManager.h>
     61#   include <CEGUIXMLAttributes.h>
     62#   include <elements/CEGUIListbox.h>
     63#   include <elements/CEGUIListboxItem.h>
     64#endif
    5065
    5166#ifdef ORXONOX_OLD_CEGUI
    52 include <CEGUILua.h>
    53 include <ogreceguirenderer/OgreCEGUIRenderer.h>
     67 include <CEGUILua.h>
     68 include <ogreceguirenderer/OgreCEGUIRenderer.h>
    5469extern "C" {
    55 include <lauxlib.h>
     70 include <lauxlib.h>
    5671}
    5772#else
    58 #  include <ScriptingModules/LuaScriptModule/CEGUILua.h>
    59 #  include <RendererModules/Ogre/CEGUIOgreImageCodec.h>
    60 #  include <RendererModules/Ogre/CEGUIOgreRenderer.h>
    61 #  include <RendererModules/Ogre/CEGUIOgreResourceProvider.h>
    62 #  include <OgreCamera.h>
    63 #  include <OgreRenderQueueListener.h>
    64 #  include <OgreRenderSystem.h>
    65 #  include <OgreRoot.h>
    66 #  include <OgreSceneManager.h>
     73#   if CEGUI_VERSION >= 0x000800
     74#       include <CEGUI/ScriptModules/Lua/ScriptModule.h>
     75#       include <CEGUI/RendererModules/Ogre/ImageCodec.h>
     76#       include <CEGUI/RendererModules/Ogre/Renderer.h>
     77#       include <CEGUI/RendererModules/Ogre/ResourceProvider.h>
     78#   else
     79#       include <ScriptingModules/LuaScriptModule/CEGUILua.h>
     80#       include <RendererModules/Ogre/CEGUIOgreImageCodec.h>
     81#       include <RendererModules/Ogre/CEGUIOgreRenderer.h>
     82#       include <RendererModules/Ogre/CEGUIOgreResourceProvider.h>
     83#   endif
     84#   include <OgreCamera.h>
     85#   include <OgreRenderQueueListener.h>
     86#   include <OgreRenderSystem.h>
     87#   include <OgreRoot.h>
     88#   include <OgreSceneManager.h>
    6789#endif
    6890
  • code/branches/libs/src/libraries/core/GUIManager.h

    r9667 r9670  
    4040#include <map>
    4141#include <string>
    42 #include <CEGUIForwardRefs.h>
    43 #include <CEGUIVersion.h>
     42
     43#if CEGUI_VERSION >= 0x000800
     44#   include <CEGUI/ForwardRefs.h>
     45#   include <CEGUI/Version.h>
     46#else
     47#   include <CEGUIForwardRefs.h>
     48#   include <CEGUIVersion.h>
     49#endif
     50
    4451#include <boost/shared_ptr.hpp>
    4552
  • code/branches/libs/src/libraries/util/Exception.cc

    r8858 r9670  
    3636
    3737#include <cstddef>
    38 #include <CEGUIExceptions.h>
     38
     39#if CEGUI_VERSION >= 0x000800
     40#   include <CEGUI/Exceptions.h>
     41#else
     42#   include <CEGUIExceptions.h>
     43#endif
     44
    3945#include "Output.h"
    4046
Note: See TracChangeset for help on using the changeset viewer.