Browse Source

Merge pull request #113 from dannywarren/polyimport_assimp_symbols_fix

Fix for multiply defined symbols fatal error in polyimport.cpp on win32
Ivan Safrin 13 năm trước cách đây
mục cha
commit
daae97a343

+ 2 - 0
Tools/Contents/polyimport/CMakeLists.txt

@@ -16,6 +16,8 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
 ADD_EXECUTABLE(polyimport Source/polyimport.cpp Include/polyimport.h)
 ADD_EXECUTABLE(polyimport Source/polyimport.cpp Include/polyimport.h)
 IF(APPLE)
 IF(APPLE)
 	TARGET_LINK_LIBRARIES(polyimport Polycore ${PHYSFS_LIBRARY}  ${ZLIB_LIBRARIES} ${ASSIMP_LIBRARY} "-framework IOKit" "-framework Cocoa")
 	TARGET_LINK_LIBRARIES(polyimport Polycore ${PHYSFS_LIBRARY}  ${ZLIB_LIBRARIES} ${ASSIMP_LIBRARY} "-framework IOKit" "-framework Cocoa")
+ELSEIF(WIN32)
+	TARGET_LINK_LIBRARIES(polyimport Polycore ${PHYSFS_LIBRARY}  ${ASSIMP_LIBRARY})
 ELSE()
 ELSE()
 	TARGET_LINK_LIBRARIES(polyimport Polycore ${PHYSFS_LIBRARY}  ${ZLIB_LIBRARIES} ${ASSIMP_LIBRARY})
 	TARGET_LINK_LIBRARIES(polyimport Polycore ${PHYSFS_LIBRARY}  ${ZLIB_LIBRARIES} ${ASSIMP_LIBRARY})
 ENDIF(APPLE)
 ENDIF(APPLE)