Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8650


Ignore:
Timestamp:
May 28, 2011, 9:57:45 PM (13 years ago)
Author:
rgrieder
Message:

Also add tolua bind files to build units (for the sake of completeness ).

Location:
code/branches/unity_build
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/unity_build/cmake/tools/GenerateToluaBindings.cmake

    r8363 r8650  
    5858  )
    5959
    60   # Disable annoying GCC warnings
    6160  IF(CMAKE_COMPILER_IS_GNU)
     61    # Disable annoying GCC warnings
    6262    SET_SOURCE_FILES_PROPERTIES(${_tolua_cxxfile} PROPERTIES COMPILE_FLAGS "-w")
     63  ENDIF()
     64
     65  IF(MSVC)
     66    # Including the file in a build unit is impossible because CMAKE_CFG_INTDIR
     67    # exands to an expression that the compiler doesn't understand
     68    SET_SOURCE_FILES_PROPERTIES(${_tolua_cxxfile} PROPERTIES EXCLUDE_FROM_BUILD_UNITS TRUE)
    6369  ENDIF()
    6470
  • code/branches/unity_build/cmake/tools/TargetUtilities.cmake

    r8649 r8650  
    182182  LIST(REMOVE_DUPLICATES _${_target_name}_files)
    183183
    184   # Mark files to be excluded from build units
    185   IF(_arg_EXCLUDE_FROM_BUILD_UNITS)
    186     SET_SOURCE_FILES_PROPERTIES(${_arg_EXCLUDE_FROM_BUILD_UNITS}
    187       PROPERTIES EXCLUDE_FROM_BUILD_UNITS TRUE)
    188   ENDIF()
    189 
    190   # Full build units
    191   IF(NOT _arg_ORXONOX_EXTERNAL AND ENABLE_BUILD_UNITS MATCHES "full")
    192     GENERATE_BUILD_UNITS(${_target_name} _${_target_name}_files)
    193   ENDIF()
    194 
    195184  # TOLUA_FILES
    196185  IF(_arg_TOLUA_FILES)
     
    204193      ENDFOREACH(_dir)
    205194    ENDIF()
     195  ENDIF()
     196
     197  # Mark files to be excluded from build units
     198  IF(_arg_EXCLUDE_FROM_BUILD_UNITS)
     199    SET_SOURCE_FILES_PROPERTIES(${_arg_EXCLUDE_FROM_BUILD_UNITS}
     200      PROPERTIES EXCLUDE_FROM_BUILD_UNITS TRUE)
     201  ENDIF()
     202
     203  # Full build units
     204  IF(NOT _arg_ORXONOX_EXTERNAL AND ENABLE_BUILD_UNITS MATCHES "full")
     205    GENERATE_BUILD_UNITS(${_target_name} _${_target_name}_files)
    206206  ENDIF()
    207207
  • code/branches/unity_build/src/libraries/core/CMakeLists.txt

    r8558 r8650  
    1919
    2020SET_SOURCE_FILES(CORE_SRC_FILES
     21
     22#BUILD_UNIT CoreStableBuildUnit.cc
     23  ClassTreeMask.cc
    2124  CommandLineParser.cc
    2225  ConfigValueContainer.cc
    23   Core.cc
    2426  DynLib.cc
    2527  DynLibManager.cc
     
    2830  GameMode.cc
    2931  GameState.cc
    30   GraphicsManager.cc
    31   GUIManager.cc
     32  Identifier.cc
    3233  Language.cc
     34  Loader.cc
    3335  LuaState.cc
     36  MetaObjectList.cc
     37  Namespace.cc
     38  NamespaceNode.cc
    3439  ObjectListBase.cc
    3540  OrxonoxClass.cc
    36   Resource.cc
    37 
    38   # hierarchy
    39   Identifier.cc
    40   MetaObjectList.cc
    41 
    42   # level
    43   BaseObject.cc
    44   ClassTreeMask.cc
    45   Loader.cc
    46   Namespace.cc
    47   NamespaceNode.cc
    4841  Template.cc
    49   XMLPort.cc
    50 
    51 BUILD_UNIT ListenerBuildUnit.cc
    5242  ViewportEventListener.cc
    5343  WindowEventListener.cc
    5444  XMLNameListener.cc
     45  XMLPort.cc
     46#END_BUILD_UNIT
     47
     48  BaseObject.cc
     49  Core.cc
     50
     51BUILD_UNIT OgreBuildUnit.cc
     52  GraphicsManager.cc
     53  GUIManager.cc
     54  Resource.cc
    5555END_BUILD_UNIT
    5656
     
    6161END_BUILD_UNIT
    6262
    63   # multithreading
    64   ThreadPool.cc
    6563BUILD_UNIT ThreadBuildUnit.cc
    6664  command/TclThreadManager.cc
    6765  Thread.cc
     66  ThreadPool.cc
    6867END_BUILD_UNIT
    6968)
Note: See TracChangeset for help on using the changeset viewer.