Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 113


Ignore:
Timestamp:
Oct 27, 2007, 11:35:38 PM (16 years ago)
Author:
anonymous
Message:

nicolasc: some modification, removed cegui-opengl as it is not working

Location:
code/trunk
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/CMakeLists.txt

    r112 r113  
    4141FIND_PACKAGE(OIS)
    4242FIND_PACKAGE(CEGUI)
    43 FIND_PACKAGE(CEGUI_OPENGL)
     43#FIND_PACKAGE(CEGUI_OPENGL)
    4444FIND_PACKAGE(CEGUI_OGRE)
    4545
    4646
    4747#Sets the search paths for the linking
    48 LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${CEGUI_OGRE_LIB_DIR})
     48LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR})
    4949#Sets the search path for include files
    50 INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR})
     50INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR})
    5151
    5252#add main source dir
  • code/trunk/cmake/FindCEGUI.cmake

    r112 r113  
    2525ELSE (WIN32) #Unix
    2626    FIND_PACKAGE(PkgConfig)
    27     PKG_SEARCH_MODULE(CEGUI CEGUI CEGUI-OPENGL /usr/pack/cegui-0.5.0-sd/i686-debian-linux3.1/lib/pkgconfig/CEGUI.pc /usr/pack/cegui-0.5.0-sd/i686-debian-linux3.1/lib/pkgconfig/CEGUI_OPENGL.pc) # tardis specific hack
     27    PKG_SEARCH_MODULE(CEGUI CEGUI /usr/pack/cegui-0.5.0-sd/i686-debian-linux3.1/lib/pkgconfig/CEGUI.pc) # tardis specific hack
    2828    SET(CEGUI_INCLUDE_DIR ${CEGUI_INCLUDE_DIRS})
    2929    SET(CEGUI_LIB_DIR ${CEGUI_LIBDIR})
  • code/trunk/cmake/FindCEGUI_OGRE.cmake

    r112 r113  
    22#
    33# This module defines
    4 #  CEGUI_CEGUI_OGRE_INCLUDE_DIR
     4#  CEGUI_OGRE_INCLUDE_DIR
    55#  CEGUI_OGRE_LIBRARIES, the libraries to link against to use CEGUI_OGRE.
    66#  CEGUI_OGRE_LIB_DIR, the location of the libraries
  • code/trunk/src/CMakeLists.txt

    r89 r113  
    88ADD_EXECUTABLE(../bin/main ${SRC_FILES} ${INC_FILES})
    99#Links the executable against OGRE and OIS
    10 TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES})
    11 
     10TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})
Note: See TracChangeset for help on using the changeset viewer.