Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 14, 2009, 10:53:45 PM (16 years ago)
Author:
rgrieder
Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:
code/branches/buildsystem3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem3

  • code/branches/buildsystem3/src/orxonox/CMakeLists.txt

    r2662 r2664  
    1 SET( ORXONOX_SRC_FILES
     1 #
     2 #             ORXONOX - the hottest 3D action shooter ever to exist
     3 #                             > www.orxonox.net <
     4 #
     5 #        This program is free software; you can redistribute it and/or
     6 #         modify it under the terms of the GNU General Public License
     7 #        as published by the Free Software Foundation; either version 2
     8 #            of the License, or (at your option) any later version.
     9 #
     10 #       This program is distributed in the hope that it will be useful,
     11 #        but WITHOUT ANY WARRANTY; without even the implied warranty of
     12 #        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     13 #                 GNU General Public License for more details.
     14 #
     15 #   You should have received a copy of the GNU General Public License along
     16 #      with this program; if not, write to the Free Software Foundation,
     17 #     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     18 #
     19
     20SET_SOURCE_FILES(ORXONOX_SRC_FILES
    221  CameraManager.cc
    322  GraphicsEngine.cc
     
    726  PlayerManager.cc
    827  Settings.cc
    9  
    10   tolua/tolua_bind.cc
    1128)
     29ADD_SUBDIRECTORY(gamestates)
     30ADD_SUBDIRECTORY(gui)
     31ADD_SUBDIRECTORY(objects)
     32ADD_SUBDIRECTORY(overlays)
     33ADD_SUBDIRECTORY(tools)
     34GET_ALL_HEADER_FILES(ORXONOX_HDR_FILES)
     35SET(ORXONOX_FILES ${ORXONOX_SRC_FILES} ${ORXONOX_HDR_FILES})
    1236
    13 ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES gamestates)
    14 ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES gui)
    15 ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES objects)
    16 ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES overlays)
    17 ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES tools)
     37GENERATE_SOURCE_GROUPS(${ORXONOX_FILES})
     38GENERATE_TOLUA_BINDINGS(Orxonox ORXONOX_FILES INPUTFILES gui/GUIManager.h)
    1839
    19 GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
    20 ADD_CUSTOM_COMMAND(
    21   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.h
    22   COMMAND ${TOLUA_EXE} -n Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
    23   DEPENDS
    24     tolua_orxonox
    25     tolua/tolua.pkg
    26     gui/GUIManager.h
    27   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
    28 )
     40# Not using precompiled header files: Avoid dependencies
     41INCLUDE_DIRECTORIES(pch/nopch)
    2942
     43IF(GCC_NO_SYSTEM_HEADER_SUPPORT)
     44  # Get around displaying a few hundred lines of warning code
     45  SET_SOURCE_FILES_PROPERTIES(gamestates/GSGraphics.cc PROPERTIES COMPILE_FLAGS "-w")
     46ENDIF()
    3047
    31 ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )
     48ADD_EXECUTABLE(orxonox ${ORXONOX_FILES})
     49GET_TARGET_PROPERTY(_exec_loc orxonox LOCATION)
     50GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
     51SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE INTERNAL "")
    3252
    3353IF(NETWORKTRAFFIC_TESTING_ENABLED)
    34 
    35   SET( ORXONOXS_SRC_FILES
     54  SET(ORXONOXS_SRC_FILES
    3655    GraphicsEngine.cc
    3756    objects/Camera.cc
    3857    CameraManager.cc
    3958  )
    40 
    41   ADD_LIBRARY(orxonoxs SHARED ${ORXONOX_SRC_FILES})
     59  ADD_LIBRARY(orxonoxs SHARED ${ORXONOXS_SRC_FILES})
    4260ENDIF(NETWORKTRAFFIC_TESTING_ENABLED)
    4361
    44 TARGET_LINK_LIBRARIES( orxonox
    45   ${OGRE_LIBRARIES}
    46   ${CEGUI_LIBRARIES}
    47   lua_orxonox
    48   ceguilua_orxonox
    49   tinyxml_orxonox
    50   tolualib_orxonox
     62TARGET_LINK_LIBRARIES(orxonox
     63  ${OGRE_LIBRARY}
     64  ${CEGUI_LIBRARY}
     65  ${LUA_LIBRARIES}
     66  ${CEGUILUA_LIBRARY}
     67  ${Boost_SYSTEM_LIBRARY}
     68  ogreceguirenderer_orxonox
     69  tinyxml++_orxonox
     70  tolua++_orxonox
    5171  BulletDynamics
    5272  BulletCollision
     
    5474  util
    5575  core
    56   audio
    5776  network
     77  #audio
    5878)
    5979
     80# When using Visual Studio we want to use the output directory as working
     81# directory and we also want to specify where the external dlls
     82# (lua, ogre, etc.) are. The problem hereby is that these information cannot
     83# be specified in CMake because they are not stored in the actual project file.
     84# This workaround will create a configured *.vcproj.user file that holds the
     85# right values. When starting the solution for the first time,
     86# these get written to the *vcproj.yourPCname.yourname.user
     87IF(MSVC)
     88  IF(CMAKE_CL_64)
     89    SET(MSVC_PLATFORM "x64")
     90  ELSE()
     91    SET(MSVC_PLATFORM "Win32")
     92  ENDIF()
     93  STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?) .*$" "\\1"
     94         VISUAL_STUDIO_VERSION_SIMPLE "${CMAKE_GENERATOR}")
     95  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox.vcproj.user" "${CMAKE_CURRENT_BINARY_DIR}/orxonox.vcproj.user")
     96ENDIF(MSVC)
     97
     98ORXONOX_INSTALL(orxonox)
Note: See TracChangeset for help on using the changeset viewer.