Просмотр исходного кода

Some Linux fixes for Box2D and Bullet.

Cameron Hart 14 лет назад
Родитель
Сommit
caffd3ff74
2 измененных файлов с 10 добавлено и 10 удалено
  1. 2 2
      CMake/ExternalBox2D.cmake
  2. 8 8
      CMake/ExternalBullet.cmake

+ 2 - 2
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)
 

+ 8 - 8
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)