Changeset 5929 for code/trunk/src/external
- Timestamp:
- Oct 12, 2009, 8:20:07 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 1 deleted
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk ¶
- Property svn:mergeinfo changed
/code/branches/core5 (added) merged: 5768-5769,5772,5775-5780,5783-5785,5791-5792,5795-5807,5809-5814,5816-5832,5836-5839,5842-5853,5855-5899,5904-5922,5924-5928
- Property svn:mergeinfo changed
-
TabularUnified code/trunk/src/external/bullet/BulletCollision/CMakeLists.txt ¶
r5781 r5929 1 1 ADD_SOURCE_FILES(BULLET_FILES 2 3 COMPILATION_BEGIN BulletCollisionCompilation.cpp 4 2 5 BroadphaseCollision/btAxisSweep3.cpp 3 6 BroadphaseCollision/btBroadphaseProxy.cpp … … 68 71 Gimpact/btContactProcessing.cpp 69 72 Gimpact/btGImpactShape.cpp 70 Gimpact/gim_contact.cpp71 73 Gimpact/btGImpactBvh.cpp 72 74 Gimpact/btGenericPoolAllocator.cpp 73 Gimpact/gim_memory.cpp74 75 Gimpact/btGImpactCollisionAlgorithm.cpp 75 76 Gimpact/btTriangleShapeEx.cpp 76 Gimpact/gim_tri_collision.cpp77 77 Gimpact/btGImpactQuantizedBvh.cpp 78 Gimpact/gim_box_set.cpp79 78 80 79 NarrowPhaseCollision/btContinuousConvexCollision.cpp … … 89 88 NarrowPhaseCollision/btSubSimplexConvexCast.cpp 90 89 NarrowPhaseCollision/btVoronoiSimplexSolver.cpp 90 91 COMPILATION_END 92 93 COMPILATION_BEGIN BulletGImpactCompilation.cpp 94 Gimpact/gim_contact.cpp 95 Gimpact/gim_memory.cpp 96 Gimpact/gim_tri_collision.cpp 97 Gimpact/gim_box_set.cpp 98 COMPILATION_END 91 99 92 100 # Headers -
TabularUnified code/trunk/src/external/bullet/BulletDynamics/CMakeLists.txt ¶
r5781 r5929 1 1 ADD_SOURCE_FILES(BULLET_FILES 2 3 COMPILATION_BEGIN BulletDynamicsCompilation.cpp 4 2 5 ConstraintSolver/btContactConstraint.cpp 3 6 ConstraintSolver/btConeTwistConstraint.cpp … … 19 22 20 23 Character/btKinematicCharacterController.cpp 24 25 COMPILATION_END 21 26 22 27 # Headers -
TabularUnified code/trunk/src/external/bullet/CMakeLists.txt ¶
r5781 r5929 27 27 ADD_SUBDIRECTORY(LinearMath) 28 28 29 # No warnings needed from third party libraries30 REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)31 ADD_COMPILER_FLAGS("-w")32 33 29 ORXONOX_ADD_LIBRARY(bullet_orxonox 34 30 ORXONOX_EXTERNAL 35 31 NO_DLL_INTERFACE 36 PCH_FILE37 BulletPrecompiledHeaders.h38 32 VERSION 39 33 2.74 -
TabularUnified code/trunk/src/external/bullet/LinearMath/CMakeLists.txt ¶
r5781 r5929 1 1 ADD_SOURCE_FILES(BULLET_FILES 2 3 COMPILATION_BEGIN BulletLinearMathCompilation.cpp 2 4 btConvexHull.cpp 3 5 btQuickprof.cpp 4 6 btGeometryUtil.cpp 5 7 btAlignedAllocator.cpp 8 COMPILATION_END 6 9 7 10 # Headers -
TabularUnified code/trunk/src/external/ceguilua/CMakeLists.txt ¶
r5781 r5929 67 67 ) 68 68 69 # No warnings needed from third party libraries70 REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)71 ADD_COMPILER_FLAGS("-w")72 73 69 SOURCE_GROUP("Source" FILES ${CEGUILUA_FILES}) 74 70 -
TabularUnified code/trunk/src/external/cpptcl/CMakeLists.txt ¶
r5781 r5929 32 32 ) 33 33 34 # No warnings needed from third party libraries35 REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)36 ADD_COMPILER_FLAGS("-w")37 38 34 ORXONOX_ADD_LIBRARY(cpptcl_orxonox 39 35 ORXONOX_EXTERNAL -
TabularUnified code/trunk/src/external/ogreceguirenderer/CMakeLists.txt ¶
r5781 r5929 18 18 # 19 19 20 SET (OCR_FILES20 SET_SOURCE_FILES(OCR_FILES 21 21 OgreCEGUIRenderer.h 22 22 OgreCEGUIResourceProvider.h 23 23 OgreCEGUITexture.h 24 24 25 COMPILATION_BEGIN OgreCEGUIRendererCompilation.cpp 25 26 OgreCEGUIRenderer.cpp 26 27 OgreCEGUIResourceProvider.cpp 27 28 OgreCEGUITexture.cpp 29 COMPILATION_END 28 30 ) 29 30 # No warnings needed from third party libraries31 REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)32 ADD_COMPILER_FLAGS("-w")33 31 34 32 ORXONOX_ADD_LIBRARY(ogreceguirenderer_orxonox -
TabularUnified code/trunk/src/external/ois/CMakeLists.txt ¶
r5781 r5929 34 34 OISPrereqs.h 35 35 36 COMPILATION_BEGIN OISCompilation.cpp 36 37 OISEffect.cpp 37 38 OISException.cpp … … 41 42 OISKeyboard.cpp 42 43 OISObject.cpp 44 COMPILATION_END 43 45 ) 44 46 IF(WIN32) … … 49 51 ADD_SUBDIRECTORY(linux) 50 52 ENDIF() 51 52 # No warnings needed from third party libraries53 REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)54 ADD_COMPILER_FLAGS("-w")55 53 56 54 INCLUDE_DIRECTORIES(.) -
TabularUnified code/trunk/src/external/ois/changes_orxonox.diff ¶
r5781 r5929 23 23 24 24 25 --- win32/Win32ForceFeedback.cpp 26 +++ win32/Win32ForceFeedback.cpp 27 @@ -25,7 +25,7 @@ 28 #include <Math.h> 29 30 // 0 = No trace; 1 = Important traces; 2 = Debug traces 31 -#define OIS_WIN32_JOYFF_DEBUG 1 32 +#define OIS_WIN32_JOYFF_DEBUG 0 33 34 #if (defined (_DEBUG) || defined(OIS_WIN32_JOYFF_DEBUG)) 35 #include <iostream> -
TabularUnified code/trunk/src/external/ois/linux/CMakeLists.txt ¶
r5781 r5929 8 8 LinuxPrereqs.h 9 9 10 COMPILATION_BEGIN OISLinuxCompilation.cpp 10 11 EventHelpers.cpp 11 12 LinuxForceFeedback.cpp … … 14 15 LinuxKeyboard.cpp 15 16 LinuxMouse.cpp 17 COMPILATION_END 16 18 ) -
TabularUnified code/trunk/src/external/ois/mac/CMakeLists.txt ¶
r5781 r5929 7 7 MacPrereqs.h 8 8 9 COMPILATION_BEGIN OISMacCompilation.cpp 9 10 MacHelpers.cpp 10 11 MacHIDManager.cpp … … 12 13 MacKeyboard.cpp 13 14 MacMouse.cpp 15 COMPILATION_END 14 16 ) -
TabularUnified code/trunk/src/external/ois/win32/CMakeLists.txt ¶
r5781 r5929 7 7 Win32Prereqs.h 8 8 9 COMPILATION_BEGIN OISWin32Compilation.cpp 9 10 Win32ForceFeedback.cpp 10 11 Win32InputManager.cpp … … 12 13 Win32KeyBoard.cpp 13 14 Win32Mouse.cpp 15 COMPILATION_END 14 16 ) -
TabularUnified code/trunk/src/external/ois/win32/Win32ForceFeedback.cpp ¶
r5781 r5929 26 26 27 27 // 0 = No trace; 1 = Important traces; 2 = Debug traces 28 #define OIS_WIN32_JOYFF_DEBUG 128 #define OIS_WIN32_JOYFF_DEBUG 0 29 29 30 30 #if (defined (_DEBUG) || defined(OIS_WIN32_JOYFF_DEBUG)) -
TabularUnified code/trunk/src/external/tinyxml/CMakeLists.txt ¶
r5781 r5929 18 18 # 19 19 20 SET (TINYXML++_FILES20 SET_SOURCE_FILES(TINYXML++_FILES 21 21 ticpp.h 22 22 ticpprc.h … … 24 24 tinyxml.h 25 25 26 COMPILATION_BEGIN TicppCompilation.cpp 26 27 ticpp.cpp 27 28 tinystr.cpp … … 29 30 tinyxmlerror.cpp 30 31 tinyxmlparser.cpp 32 COMPILATION_END 31 33 ) 32 33 # No warnings needed from third party libraries34 REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)35 ADD_COMPILER_FLAGS("-w")36 34 37 35 ORXONOX_ADD_LIBRARY(tinyxml++_orxonox -
TabularUnified code/trunk/src/external/tolua/CMakeLists.txt ¶
r5738 r5929 20 20 ################### Tolua++ library ################### 21 21 22 SET (TOLUA++_FILES22 SET_SOURCE_FILES(TOLUA++_FILES 23 23 tolua_event.h 24 24 tolua++.h 25 25 COMPILATION_BEGIN ToluaCompilation.c 26 26 tolua_event.c 27 27 tolua_is.c … … 29 29 tolua_push.c 30 30 tolua_to.c 31 COMPILATION_END 31 32 ) 32 GENERATE_SOURCE_GROUPS(${TOLUA++_FILES})33 34 # No warnings needed from third party libraries35 REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)36 ADD_COMPILER_FLAGS("-w")37 33 38 34 ORXONOX_ADD_LIBRARY(tolua++_orxonox
Note: See TracChangeset
for help on using the changeset viewer.