CMake: Think this is the reason linking python statically causes problems on some platforms (linking order)
This commit is contained in:
@@ -49,7 +49,6 @@ ENDIF(WIN32)
|
|||||||
|
|
||||||
ADD_DEPENDENCIES(blenderplayer makesdna)
|
ADD_DEPENDENCIES(blenderplayer makesdna)
|
||||||
|
|
||||||
SETUP_LIBLINKS(blenderplayer)
|
|
||||||
FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
|
FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
|
||||||
|
|
||||||
SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} gp_common gp_ghost blenkernel_blc)
|
SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} gp_common gp_ghost blenkernel_blc)
|
||||||
@@ -121,3 +120,4 @@ ELSE(UNIX)
|
|||||||
TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_LINK_LIBS})
|
TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_LINK_LIBS})
|
||||||
ENDIF(UNIX)
|
ENDIF(UNIX)
|
||||||
|
|
||||||
|
SETUP_LIBLINKS(blenderplayer)
|
||||||
|
@@ -186,7 +186,6 @@ ENDIF(WIN32)
|
|||||||
|
|
||||||
ADD_DEPENDENCIES(blender makesdna)
|
ADD_DEPENDENCIES(blender makesdna)
|
||||||
|
|
||||||
SETUP_LIBLINKS(blender)
|
|
||||||
FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
|
FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
|
||||||
|
|
||||||
SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} src blender_python blender_render blender_radiosity blender_IK bf_elbeem)
|
SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} src blender_python blender_render blender_radiosity blender_IK bf_elbeem)
|
||||||
@@ -272,3 +271,4 @@ ELSE(UNIX)
|
|||||||
TARGET_LINK_LIBRARIES(blender ${BLENDER_LINK_LIBS})
|
TARGET_LINK_LIBRARIES(blender ${BLENDER_LINK_LIBS})
|
||||||
ENDIF(UNIX)
|
ENDIF(UNIX)
|
||||||
|
|
||||||
|
SETUP_LIBLINKS(blender)
|
||||||
|
Reference in New Issue
Block a user