SVN commit 1191702 by majewsky: Import a snapshot of Box2D from their SVN. M +6 -3 CMakeLists.txt A external (directory) A external/Box2D (directory) A external/Box2D/Collision (directory) A external/Box2D/Collision/Shapes (directory) A external/Box2D/Collision/Shapes/b2CircleShape.cpp [License: Unknown license] A external/Box2D/Collision/Shapes/b2CircleShape.h [License: Unknown license] A external/Box2D/Collision/Shapes/b2EdgeShape.cpp [License: Unknown license] A external/Box2D/Collision/Shapes/b2EdgeShape.h [License: Unknown license] A external/Box2D/Collision/Shapes/b2LoopShape.cpp [License: Unknown license] A external/Box2D/Collision/Shapes/b2LoopShape.h [License: Unknown license] A external/Box2D/Collision/Shapes/b2PolygonShape.cpp [License: Unknown license] A external/Box2D/Collision/Shapes/b2PolygonShape.h [License: Unknown license] A external/Box2D/Collision/Shapes/b2Shape.h [License: Unknown license] A external/Box2D/Collision/b2BroadPhase.cpp [License: Unknown license] A external/Box2D/Collision/b2BroadPhase.h [License: Unknown license] A external/Box2D/Collision/b2CollideCircle.cpp [License: Unknown license] A external/Box2D/Collision/b2CollideEdge.cpp [License: Unknown license] A external/Box2D/Collision/b2CollidePolygon.cpp [License: Unknown license] A external/Box2D/Collision/b2Collision.cpp [License: Unknown license] A external/Box2D/Collision/b2Collision.h [License: Unknown license] A external/Box2D/Collision/b2Distance.cpp [License: Unknown license] A external/Box2D/Collision/b2Distance.h [License: Unknown license] A external/Box2D/Collision/b2DynamicTree.cpp [License: Unknown license] A external/Box2D/Collision/b2DynamicTree.h [License: Unknown license] A external/Box2D/Collision/b2TimeOfImpact.cpp [License: Unknown license] A external/Box2D/Collision/b2TimeOfImpact.h [License: Unknown license] A external/Box2D/Common (directory) A external/Box2D/Common/b2BlockAllocator.cpp [License: Unknown license] A external/Box2D/Common/b2BlockAllocator.h [License: Unknown license] A external/Box2D/Common/b2GrowableStack.h [License: Unknown license] A external/Box2D/Common/b2Math.cpp [License: Unknown license] A external/Box2D/Common/b2Math.h [License: Unknown license] A external/Box2D/Common/b2Settings.cpp [License: Unknown license] A external/Box2D/Common/b2Settings.h [License: Unknown license] A external/Box2D/Common/b2StackAllocator.cpp [License: Unknown license] A external/Box2D/Common/b2StackAllocator.h [License: Unknown license] A external/Box2D/Dynamics (directory) A external/Box2D/Dynamics/Contacts (directory) A external/Box2D/Dynamics/Contacts/b2CircleContact.cpp [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2CircleContact.h [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2Contact.cpp [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2Contact.h [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2ContactSolver.cpp [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2ContactSolver.h [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.cpp [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.h [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.h [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2LoopAndCircleContact.cpp [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2LoopAndCircleContact.h [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2LoopAndPolygonContact.cpp [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2LoopAndPolygonContact.h [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.cpp [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.h [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2PolygonContact.cpp [License: Unknown license] A external/Box2D/Dynamics/Contacts/b2PolygonContact.h [License: Unknown license] A external/Box2D/Dynamics/Joints (directory) A external/Box2D/Dynamics/Joints/b2DistanceJoint.cpp [License: Unknown license] A external/Box2D/Dynamics/Joints/b2DistanceJoint.h [License: Unknown license] A external/Box2D/Dynamics/Joints/b2FrictionJoint.cpp [License: Unknown license] A external/Box2D/Dynamics/Joints/b2FrictionJoint.h [License: Unknown license] A external/Box2D/Dynamics/Joints/b2GearJoint.cpp [License: Unknown license] A external/Box2D/Dynamics/Joints/b2GearJoint.h [License: Unknown license] A external/Box2D/Dynamics/Joints/b2Joint.cpp [License: Unknown license] A external/Box2D/Dynamics/Joints/b2Joint.h [License: Unknown license] A external/Box2D/Dynamics/Joints/b2LineJoint.cpp [License: Unknown license] A external/Box2D/Dynamics/Joints/b2LineJoint.h [License: Unknown license] A external/Box2D/Dynamics/Joints/b2MouseJoint.cpp [License: Unknown license] A external/Box2D/Dynamics/Joints/b2MouseJoint.h [License: Unknown license] A external/Box2D/Dynamics/Joints/b2PrismaticJoint.cpp [License: Unknown license] A external/Box2D/Dynamics/Joints/b2PrismaticJoint.h [License: Unknown license] A external/Box2D/Dynamics/Joints/b2PulleyJoint.cpp [License: Unknown license] A external/Box2D/Dynamics/Joints/b2PulleyJoint.h [License: Unknown license] A external/Box2D/Dynamics/Joints/b2RevoluteJoint.cpp [License: Unknown license] A external/Box2D/Dynamics/Joints/b2RevoluteJoint.h [License: Unknown license] A external/Box2D/Dynamics/Joints/b2RopeJoint.cpp [License: Unknown license] A external/Box2D/Dynamics/Joints/b2RopeJoint.h [License: Unknown license] A external/Box2D/Dynamics/Joints/b2WeldJoint.cpp [License: Unknown license] A external/Box2D/Dynamics/Joints/b2WeldJoint.h [License: Unknown license] A external/Box2D/Dynamics/b2Body.cpp [License: Unknown license] A external/Box2D/Dynamics/b2Body.h [License: Unknown license] A external/Box2D/Dynamics/b2ContactManager.cpp [License: Unknown license] A external/Box2D/Dynamics/b2ContactManager.h [License: Unknown license] A external/Box2D/Dynamics/b2Fixture.cpp [License: Unknown license] A external/Box2D/Dynamics/b2Fixture.h [License: Unknown license] A external/Box2D/Dynamics/b2Island.cpp [License: Unknown license] A external/Box2D/Dynamics/b2Island.h [License: Unknown license] A external/Box2D/Dynamics/b2TimeStep.h [License: Unknown license] A external/Box2D/Dynamics/b2World.cpp [License: Unknown license] A external/Box2D/Dynamics/b2World.h [License: Unknown license] A external/Box2D/Dynamics/b2WorldCallbacks.cpp [License: Unknown license] A external/Box2D/Dynamics/b2WorldCallbacks.h [License: Unknown license] A external/CMakeLists.txt A external/README --- trunk/KDE/kdegames/kolf/CMakeLists.txt #1191701:1191702 @@ -8,15 +8,18 @@ include_directories( ${CMAKE_SOURCE_DIR}/libkdegames/highscore ) +# we have a static copy of Box2D in our source tree +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external) +add_subdirectory(external) ########### next target ############### set(kolf_LIB_SRCS + game.cpp kolf.cpp - game.cpp + newgame.cpp canvasitem.cpp ball.cpp - newgame.cpp config.cpp scoreboard.cpp editor.cpp @@ -31,7 +34,7 @@ kde4_add_library(kolfprivate SHARED ${kolf_LIB_SRCS}) -target_link_libraries(kolfprivate ${KDE4_KIO_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_PHONON_LIBS} kdegames) +target_link_libraries(kolfprivate ${KDE4_KIO_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_PHONON_LIBS} kdegames box2d) set_target_properties(kolfprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) install(TARGETS kolfprivate ${INSTALL_TARGETS_DEFAULT_ARGS})