Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove binary (BulletMayaPlugin.mll) and fix name BulletMayaPlugin (to match previous NSI Installer script)

Browse Source
This commit is contained in:
erwin.coumans
2010-01-31 19:38:29 +00:00
parent d734225345
commit 2050afaa3c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Extras/MayaPlugin/BulletMayaPlugin.mll
View File

Binary file not shown.

12
Extras/MayaPlugin/CMakeLists.txt
View File

@@ -43,26 +43,26 @@ SET(TARGET_SRC
constraint/dsixdofConstraintCmd.cpp constraint/nailConstraintNode.cpp constraint/sliderConstraintNode.cpp
)
ADD_LIBRARY(BulletMayaDynamica SHARED ${TARGET_H} ${TARGET_SRC})
ADD_LIBRARY(BulletMayaPlugin SHARED ${TARGET_H} ${TARGET_SRC})
IF (WIN32)
SET(MAYA_LIBS OpenMaya Foundation OpenMayaAnim OpenMayaFX OpenMayaUI)
IF (CMAKE_CL_64)
SET_TARGET_PROPERTIES(BulletMayaDynamica PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS /MACHINE:X64")
SET_TARGET_PROPERTIES(BulletMayaPlugin PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS /MACHINE:X64")
ELSE (CMAKE_CL_64)
SET_TARGET_PROPERTIES(BulletMayaDynamica PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS /MACHINE:X86")
SET_TARGET_PROPERTIES(BulletMayaPlugin PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS /MACHINE:X86")
ENDIF (CMAKE_CL_64)
SET_TARGET_PROPERTIES(BulletMayaDynamica PROPERTIES SUFFIX ".mll")
SET_TARGET_PROPERTIES(BulletMayaPlugin PROPERTIES SUFFIX ".mll")
LINK_DIRECTORIES(${MAYA_LIB_DIR})
TARGET_LINK_LIBRARIES(BulletMayaDynamica BulletDynamics BulletCollision LinearMath ${MAYA_LIBS} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
TARGET_LINK_LIBRARIES(BulletMayaPlugin BulletDynamics BulletCollision LinearMath ${MAYA_LIBS} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
SET(CMAKE_SHARED_LINKER_FLAGS "/export:initializePlugin /export:uninitializePlugin")
ELSE (WIN32)
SET(MAYA_LIBS OpenMayalib Foundation OpenMayaAnim OpenMayaFX OpenMayaUI)
LINK_DIRECTORIES(${MAYA_LIB_DIR})
TARGET_LINK_LIBRARIES(BulletMayaDynamica BulletDynamics BulletCollision LinearMath ${MAYA_LIBS} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
TARGET_LINK_LIBRARIES(BulletMayaPlugin BulletDynamics BulletCollision LinearMath ${MAYA_LIBS} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
ENDIF(WIN32)
#OPTION(BUILD_STANDALONE "Build a standalone exporter program")