Some Linux fixes for Box2D and Bullet.

largerussiangames · Jul 12, 2011 · caffd3f · caffd3f
1 parent 86d9aef
commit caffd3f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/CMake/ExternalBox2D.cmake b/CMake/ExternalBox2D.cmake
@@ -35,13 +35,13 @@ INSTALL(DIRECTORY ${install_dir}/include/
     FILES_MATCHING PATTERN "*.h")
 
 # install debug lib
-INSTALL(FILES ${install_dir}/lib/Box2D${CMAKE_STATIC_LIBRARY_SUFFIX} 
+INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}Box2D${CMAKE_STATIC_LIBRARY_SUFFIX} 
     DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Debug
     CONFIGURATIONS Debug
     RENAME Box2D_d${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 # install release lib
-INSTALL(FILES ${install_dir}/lib/Box2D${CMAKE_STATIC_LIBRARY_SUFFIX} 
+INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}Box2D${CMAKE_STATIC_LIBRARY_SUFFIX} 
     DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Release
     CONFIGURATIONS Release)
 
diff --git a/CMake/ExternalBullet.cmake b/CMake/ExternalBullet.cmake
@@ -34,39 +34,39 @@ INSTALL(DIRECTORY ${install_dir}/include/
     FILES_MATCHING PATTERN "*.h")
 
 # install debug libs
-INSTALL(FILES ${install_dir}/lib/BulletDynamics${CMAKE_STATIC_LIBRARY_SUFFIX} 
+INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletDynamics${CMAKE_STATIC_LIBRARY_SUFFIX} 
     DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Debug
     CONFIGURATIONS Debug
     RENAME BulletDynamics_d${CMAKE_STATIC_LIBRARY_SUFFIX})
 
-INSTALL(FILES ${install_dir}/lib/BulletCollision${CMAKE_STATIC_LIBRARY_SUFFIX} 
+INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletCollision${CMAKE_STATIC_LIBRARY_SUFFIX} 
     DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Debug
     CONFIGURATIONS Debug
     RENAME BulletCollision_d${CMAKE_STATIC_LIBRARY_SUFFIX})
 
-INSTALL(FILES ${install_dir}/lib/BulletSoftBody${CMAKE_STATIC_LIBRARY_SUFFIX} 
+INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletSoftBody${CMAKE_STATIC_LIBRARY_SUFFIX} 
     DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Debug
     CONFIGURATIONS Debug
     RENAME BulletSoftBody_d${CMAKE_STATIC_LIBRARY_SUFFIX})
 
-INSTALL(FILES ${install_dir}/lib/LinearMath${CMAKE_STATIC_LIBRARY_SUFFIX} 
+INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LinearMath${CMAKE_STATIC_LIBRARY_SUFFIX} 
     DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Debug
     CONFIGURATIONS Debug
     RENAME LinearMath_d${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 # install release libs
-INSTALL(FILES ${install_dir}/lib/BulletDynamics${CMAKE_STATIC_LIBRARY_SUFFIX} 
+INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletDynamics${CMAKE_STATIC_LIBRARY_SUFFIX} 
     DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Release
     CONFIGURATIONS Release)
 
-INSTALL(FILES ${install_dir}/lib/BulletCollision${CMAKE_STATIC_LIBRARY_SUFFIX} 
+INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletCollision${CMAKE_STATIC_LIBRARY_SUFFIX} 
     DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Release
     CONFIGURATIONS Release)
 
-INSTALL(FILES ${install_dir}/lib/BulletSoftBody${CMAKE_STATIC_LIBRARY_SUFFIX} 
+INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletSoftBody${CMAKE_STATIC_LIBRARY_SUFFIX} 
     DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Release
     CONFIGURATIONS Release)
 
-INSTALL(FILES ${install_dir}/lib/LinearMath${CMAKE_STATIC_LIBRARY_SUFFIX} 
+INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LinearMath${CMAKE_STATIC_LIBRARY_SUFFIX} 
     DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Release
     CONFIGURATIONS Release)