From: <sf...@us...> - 2011-07-22 03:27:22
|
Revision: 2984 http://ogreaddons.svn.sourceforge.net/ogreaddons/?rev=2984&view=rev Author: sfcbias Date: 2011-07-22 03:27:15 +0000 (Fri, 22 Jul 2011) Log Message: ----------- Updated to build with Newton 2.33. Modified Paths: -------------- branches/ogrenewt/newton20/CMakeLists.txt branches/ogrenewt/newton20/INSTALL.TXT branches/ogrenewt/newton20/OgreNewt.pc.cmake Added Paths: ----------- branches/ogrenewt/newton20/OgreNewt.pc branches/ogrenewt/newton20/cmake_install.cmake Modified: branches/ogrenewt/newton20/CMakeLists.txt =================================================================== --- branches/ogrenewt/newton20/CMakeLists.txt 2011-07-22 03:16:44 UTC (rev 2983) +++ branches/ogrenewt/newton20/CMakeLists.txt 2011-07-22 03:27:15 UTC (rev 2984) @@ -8,7 +8,7 @@ SET(CPACK_PACKAGE_CONTACT "co...@ra...") SET(OgreNewt_MAJOR_VERSION 2) -SET(OgreNewt_MINOR_VERSION 0) +SET(OgreNewt_MINOR_VERSION 1) SET(OgreNewt_PATCH_VERSION 0) SET(CPACK_PACKAGE_VERSION_MAJOR ${OgreNewt_MAJOR_VERSION}) @@ -55,7 +55,7 @@ # Check for required components FIND_PACKAGE(PkgConfig) -FIND_PACKAGE(OGRE 1.4 REQUIRED) +FIND_PACKAGE(OGRE 1.6 REQUIRED) FIND_PACKAGE(Newton 2.0 REQUIRED) # Compile settings for build types @@ -68,7 +68,11 @@ ${OGRE_INCLUDE_DIRS} ${NEWTON_INCLUDE_DIR} ${NEWTON_INCLUDE_DIR}/dCustomJoints -${NEWTON_INCLUDE_DIR}/dMath) +${NEWTON_INCLUDE_DIR}/dMath +${NEWTON_INCLUDE_DIR}/../../../packages +${NEWTON_INCLUDE_DIR}/../../../packages/dCustomJoints +${NEWTON_INCLUDE_DIR}/../../../packages/dMath +) SET(OgreNewt_LIB_SRCS src/OgreNewt_BasicJoints.cpp @@ -122,4 +126,4 @@ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) ENDIF(NOT WIN32) -PRINT_ENABLED_FEATURES() \ No newline at end of file +PRINT_ENABLED_FEATURES() Modified: branches/ogrenewt/newton20/INSTALL.TXT =================================================================== --- branches/ogrenewt/newton20/INSTALL.TXT 2011-07-22 03:16:44 UTC (rev 2983) +++ branches/ogrenewt/newton20/INSTALL.TXT 2011-07-22 03:27:15 UTC (rev 2984) @@ -15,6 +15,12 @@ "BOOST_HOME" - boost directory (get the latest from http://boost.org) "NEWTON_HOME" - NGD install directory "OGRENEWT_HOME" - OgreNewt root directory + + FOR NEWTON 2.33: + The project files are those from the older versions of OgreNewt, you will need to change the project include directories to + newton-2.33(or whatever you have it named)/packages + newton-2.33(or whatever you have it named)/core_200/source/newton + If set properly, everything should compile and work out of the box, even the dll's are automaticly copied. @@ -41,4 +47,4 @@ > sudo make install -Visit the forum if you have problems or have new project files to share :) \ No newline at end of file +Visit the forum if you have problems or have new project files to share :) Added: branches/ogrenewt/newton20/OgreNewt.pc =================================================================== --- branches/ogrenewt/newton20/OgreNewt.pc (rev 0) +++ branches/ogrenewt/newton20/OgreNewt.pc 2011-07-22 03:27:15 UTC (rev 2984) @@ -0,0 +1,11 @@ +prefix=/usr/local +exec_prefix=/usr/local +libdir=/usr/local/lib +includedir=/usr/local/include/OgreNewt + +Name: OgreNewt +Description: Ogre Bindings for the Newton Physics SDK +Requires: OGRE >= 1.6 +Version: 2.1.0 +Libs: -L/usr/local/lib -lOgreNewt +Cflags: -I/usr/local/include/OgreNewt Modified: branches/ogrenewt/newton20/OgreNewt.pc.cmake =================================================================== --- branches/ogrenewt/newton20/OgreNewt.pc.cmake 2011-07-22 03:16:44 UTC (rev 2983) +++ branches/ogrenewt/newton20/OgreNewt.pc.cmake 2011-07-22 03:27:15 UTC (rev 2984) @@ -5,7 +5,7 @@ Name: OgreNewt Description: Ogre Bindings for the Newton Physics SDK -Requires: OGRE >= 1.4 +Requires: OGRE >= 1.6 Version: ${OgreNewt_MAJOR_VERSION}.${OgreNewt_MINOR_VERSION}.${OgreNewt_PATCH_VERSION} Libs: -L${CMAKE_INSTALL_PREFIX}/lib -lOgreNewt Cflags: -I${CMAKE_INSTALL_PREFIX}/include/OgreNewt Added: branches/ogrenewt/newton20/cmake_install.cmake =================================================================== --- branches/ogrenewt/newton20/cmake_install.cmake (rev 0) +++ branches/ogrenewt/newton20/cmake_install.cmake 2011-07-22 03:27:15 UTC (rev 2984) @@ -0,0 +1,111 @@ +# Install script for directory: /home/bryce/Dev/OgreNewt + +# Set the install prefix +IF(NOT DEFINED CMAKE_INSTALL_PREFIX) + SET(CMAKE_INSTALL_PREFIX "/usr/local") +ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) +STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") + +# Set the install configuration name. +IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) + IF(BUILD_TYPE) + STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" + CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") + ELSE(BUILD_TYPE) + SET(CMAKE_INSTALL_CONFIG_NAME "") + ENDIF(BUILD_TYPE) + MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") +ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) + +# Set the component getting installed. +IF(NOT CMAKE_INSTALL_COMPONENT) + IF(COMPONENT) + MESSAGE(STATUS "Install component: \"${COMPONENT}\"") + SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") + ELSE(COMPONENT) + SET(CMAKE_INSTALL_COMPONENT) + ENDIF(COMPONENT) +ENDIF(NOT CMAKE_INSTALL_COMPONENT) + +# Install shared libraries without execute permission? +IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) + SET(CMAKE_INSTALL_SO_NO_EXE "1") +ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) + +IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") + FOREACH(file + "$ENV{DESTDIR}/usr/local/lib/libOgreNewt.so.2.1.0" + "$ENV{DESTDIR}/usr/local/lib/libOgreNewt.so.2" + "$ENV{DESTDIR}/usr/local/lib/libOgreNewt.so" + ) + IF(EXISTS "${file}" AND + NOT IS_SYMLINK "${file}") + FILE(RPATH_CHECK + FILE "${file}" + RPATH "") + ENDIF() + ENDFOREACH() + list(APPEND CPACK_ABSOLUTE_DESTINATION_FILES + "/usr/local/lib/libOgreNewt.so.2.1.0;/usr/local/lib/libOgreNewt.so.2;/usr/local/lib/libOgreNewt.so") +FILE(INSTALL DESTINATION "/usr/local/lib" TYPE SHARED_LIBRARY FILES + "/home/bryce/Dev/OgreNewt/libOgreNewt.so.2.1.0" + "/home/bryce/Dev/OgreNewt/libOgreNewt.so.2" + "/home/bryce/Dev/OgreNewt/libOgreNewt.so" + ) + FOREACH(file + "$ENV{DESTDIR}/usr/local/lib/libOgreNewt.so.2.1.0" + "$ENV{DESTDIR}/usr/local/lib/libOgreNewt.so.2" + "$ENV{DESTDIR}/usr/local/lib/libOgreNewt.so" + ) + IF(EXISTS "${file}" AND + NOT IS_SYMLINK "${file}") + IF(CMAKE_INSTALL_DO_STRIP) + EXECUTE_PROCESS(COMMAND "/usr/bin/strip" "${file}") + ENDIF(CMAKE_INSTALL_DO_STRIP) + ENDIF() + ENDFOREACH() +ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") + +IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") + list(APPEND CPACK_ABSOLUTE_DESTINATION_FILES + "/usr/local/include/OgreNewt/OgreNewt_BasicJoints.h;/usr/local/include/OgreNewt/OgreNewt_Body.h;/usr/local/include/OgreNewt/OgreNewt_Collision.h;/usr/local/include/OgreNewt/OgreNewt_CollisionPrimitives.h;/usr/local/include/OgreNewt/OgreNewt_CollisionSerializer.h;/usr/local/include/OgreNewt/OgreNewt_ContactCallback.h;/usr/local/include/OgreNewt/OgreNewt_Debugger.h;/usr/local/include/OgreNewt/OgreNewt.h;/usr/local/include/OgreNewt/OgreNewt_Joint.h;/usr/local/include/OgreNewt/OgreNewt_MaterialID.h;/usr/local/include/OgreNewt/OgreNewt_MaterialPair.h;/usr/local/include/OgreNewt/OgreNewt_Prerequisites.h;/usr/local/include/OgreNewt/OgreNewt_RayCast.h;/usr/local/include/OgreNewt/OgreNewt_Tools.h;/usr/local/include/OgreNewt/OgreNewt_Vehicle.h;/usr/local/include/OgreNewt/OgreNewt_World.h;/usr/local/include/OgreNewt/OgreNewt_PlayerController.h;/usr/local/include/OgreNewt/OgreNewt_ContactJoint.h;/usr/local/include/OgreNewt/OgreNewt_BodyInAABBIterator.h;/usr/local/include/OgreNewt/OgreNewt_BasicFrameListener.h") +FILE(INSTALL DESTINATION "/usr/local/include/OgreNewt" TYPE FILE FILES + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_BasicJoints.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_Body.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_Collision.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_CollisionPrimitives.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_CollisionSerializer.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_ContactCallback.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_Debugger.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_Joint.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_MaterialID.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_MaterialPair.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_Prerequisites.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_RayCast.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_Tools.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_Vehicle.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_World.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_PlayerController.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_ContactJoint.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_BodyInAABBIterator.h" + "/home/bryce/Dev/OgreNewt/inc/OgreNewt_BasicFrameListener.h" + ) +ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") + +IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") + list(APPEND CPACK_ABSOLUTE_DESTINATION_FILES + "/usr/local/lib/pkgconfig/OgreNewt.pc") +FILE(INSTALL DESTINATION "/usr/local/lib/pkgconfig" TYPE FILE FILES "/home/bryce/Dev/OgreNewt/OgreNewt.pc") +ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") + +IF(CMAKE_INSTALL_COMPONENT) + SET(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt") +ELSE(CMAKE_INSTALL_COMPONENT) + SET(CMAKE_INSTALL_MANIFEST "install_manifest.txt") +ENDIF(CMAKE_INSTALL_COMPONENT) + +FILE(WRITE "/home/bryce/Dev/OgreNewt/${CMAKE_INSTALL_MANIFEST}" "") +FOREACH(file ${CMAKE_INSTALL_MANIFEST_FILES}) + FILE(APPEND "/home/bryce/Dev/OgreNewt/${CMAKE_INSTALL_MANIFEST}" "${file}\n") +ENDFOREACH(file) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |