Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 24, 2009, 11:02:42 AM (15 years ago)
Author:
rgrieder
Message:

Reverted trunk again. We might want to find a way to delete these revisions again (x3n's changes are still available as diff in the commit mails).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/CMakeLists.txt

    r5774 r5781  
    3838# If no defines are specified, these libs get linked statically
    3939ADD_COMPILER_FLAGS("-DBOOST_ALL_DYN_LINK" WIN32 LINK_BOOST_DYNAMIC)
     40ADD_COMPILER_FLAGS("-DENET_DLL"           WIN32 LINK_ENET_DYNAMIC)
    4041ADD_COMPILER_FLAGS("-DLUA_BUILD_AS_DLL"   WIN32 LINK_LUA_DYNAMIC)
     42ADD_COMPILER_FLAGS("-DOIS_DYNAMIC_LIB")
     43ADD_COMPILER_FLAGS("-DZLIB_DLL"           WIN32 LINK_ZLIB_DYNAMIC)
    4144# If no defines are specified, these libs get linked dynamically
     45ADD_COMPILER_FLAGS("-DCEGUI_STATIC"       WIN32 NOT LINK_CEGUI_DYNAMIC)
    4246ADD_COMPILER_FLAGS("-DOGRE_STATIC_LIB"    WIN32 NOT LINK_OGRE_DYNAMIC)
     47ADD_COMPILER_FLAGS("-DSTATIC_BUILD"       WIN32 NOT LINK_TCL_DYNAMIC)
     48
     49# Use TinyXML++
     50ADD_COMPILER_FLAGS("-DTIXML_USE_TICPP")
    4351
    4452############## Include Directories ##############
     
    4856  # External
    4957  ${OGRE_INCLUDE_DIR}
     58  ${CEGUI_INCLUDE_DIR}
     59  ${ENET_INCLUDE_DIR}
    5060  ${Boost_INCLUDE_DIRS}
     61  ${OPENAL_INCLUDE_DIRS}
     62  ${ALUT_INCLUDE_DIR}
     63  ${VORBIS_INCLUDE_DIR}
     64  ${OGG_INCLUDE_DIR}
    5165  ${LUA_INCLUDE_DIR}
     66  ${TCL_INCLUDE_PATH}
     67  ${DIRECTX_INCLUDE_DIR}
     68  ${ZLIB_INCLUDE_DIR}
    5269  ${VLD_INCLUDE_DIR}
    5370
     
    5572  # relative to "external" to avoid conflicts
    5673  ${CMAKE_CURRENT_SOURCE_DIR}/external
     74  # Include directories needed even if only included by Orxonox
     75  ${CMAKE_CURRENT_SOURCE_DIR}/external/bullet
     76  ${CMAKE_CURRENT_SOURCE_DIR}/external/ois
    5777
    5878  # OrxonoxConfig.h
    5979  ${CMAKE_CURRENT_BINARY_DIR}
    6080)
     81
     82IF(CEGUILUA_USE_INTERNAL_LIBRARY)
     83  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/ceguilua/ceguilua-${CEGUI_VERSION})
     84ENDIF()
    6185
    6286################### Tolua Bind ##################
Note: See TracChangeset for help on using the changeset viewer.