LoweBowe/LumixEngine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

assimp vs2015

Browse source
This commit is contained in:
Mikulas Florek 2015-11-15 21:57:53 +01:00
parent af8986ee8b
commit 11662cb9f2
13 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
external/assimp/dll/win32/release/assimp.dll → external/assimp/dll/vs2013/win32/release/assimp.dll vendored
View file

0
external/assimp/dll/win64/release/assimp.dll → external/assimp/dll/vs2013/win64/release/assimp.dll vendored
View file

BIN
external/assimp/dll/vs2015/win32/release/assimp.dll vendored Normal file
View file

Binary file not shown.

BIN
external/assimp/dll/vs2015/win64/release/assimp.dll vendored Normal file
View file

Binary file not shown.

0
external/assimp/lib/win32/debug/assimp.lib → external/assimp/lib/vs2013/win32/debug/assimp.lib vendored
View file

0
external/assimp/lib/win32/release/assimp.lib → external/assimp/lib/vs2013/win32/release/assimp.lib vendored
View file

0
external/assimp/lib/win64/debug/assimp.lib → external/assimp/lib/vs2013/win64/debug/assimp.lib vendored
View file

0
external/assimp/lib/win64/release/assimp.lib → external/assimp/lib/vs2013/win64/release/assimp.lib vendored
View file

BIN
external/assimp/lib/vs2015/win32/debug/assimp.lib vendored Normal file
View file

Binary file not shown.

BIN
external/assimp/lib/vs2015/win32/release/assimp.lib vendored Normal file
View file

Binary file not shown.

BIN
external/assimp/lib/vs2015/win64/debug/assimp.lib vendored Normal file
View file

Binary file not shown.

BIN
external/assimp/lib/vs2015/win64/release/assimp.lib vendored Normal file
View file

Binary file not shown.

5
projects/CMakeLists.txt
View file

@ -252,8 +252,7 @@ set_target_properties(studio PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
target_link_libraries(studio engine)
target_link_libraries(studio renderer)
target_link_libraries(studio editor)
target_link_libraries(studio optimized ${EXTERNAL_PATH}assimp/lib/${PLATFORM_DIR}/${CMAKE_CFG_INTDIR}/assimp.lib)
target_link_libraries(studio debug ${EXTERNAL_PATH}assimp/lib/${PLATFORM_DIR}/${CMAKE_CFG_INTDIR}/assimp.lib)
target_link_libraries(studio ${EXTERNAL_PATH}assimp/lib/vs2013/${PLATFORM_DIR}/${CMAKE_CFG_INTDIR}/assimp.lib)
target_link_libraries(studio ${EXTERNAL_PATH}crunch/lib/vs2013/${PLATFORM_DIR}/${CMAKE_CFG_INTDIR}/crnlib.lib)
target_link_libraries(studio winmm.lib)
@ -283,7 +282,7 @@ target_link_libraries(lua_script renderer)
add_custom_command(TARGET studio POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${EXTERNAL_PATH}assimp/dll/${PLATFORM_DIR}/${CMAKE_CFG_INTDIR}/assimp.dll"
"${EXTERNAL_PATH}assimp/dll/vs2013/${PLATFORM_DIR}/${CMAKE_CFG_INTDIR}/assimp.dll"
$<TARGET_FILE_DIR:studio>)
if(${IS64})