Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5976 from ricardoquesada/chipmunk_fixes 

chipmunk fixes for Linux
This commit is contained in:
Ricardo Quesada 2014-03-25 16:47:21 -07:00
parent 96e8c4777d c82933e3c4
commit f5585d8409
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
external/chipmunk/src/CMakeLists.txt vendored
View File

@ -1,3 +1,5 @@
set(BUILD_STATIC 1)
file(GLOB chipmunk_source_files "*.c" "constraints/*.c") file(GLOB chipmunk_source_files "*.c" "constraints/*.c")
file(GLOB chipmunk_public_header "${chipmunk_SOURCE_DIR}/include/chipmunk/*.h") file(GLOB chipmunk_public_header "${chipmunk_SOURCE_DIR}/include/chipmunk/*.h")
file(GLOB chipmunk_constraint_header "${chipmunk_SOURCE_DIR}/include/chipmunk/constraints/*.h") file(GLOB chipmunk_constraint_header "${chipmunk_SOURCE_DIR}/include/chipmunk/constraints/*.h")
@ -46,3 +48,10 @@ if(BUILD_SHARED OR INSTALL_STATIC)
install(FILES ${chipmunk_public_header} DESTINATION include/chipmunk) install(FILES ${chipmunk_public_header} DESTINATION include/chipmunk)
install(FILES ${chipmunk_constraint_header} DESTINATION include/chipmunk/constraints) install(FILES ${chipmunk_constraint_header} DESTINATION include/chipmunk/constraints)
endif(BUILD_SHARED OR INSTALL_STATIC) endif(BUILD_SHARED OR INSTALL_STATIC)
set_target_properties(chipmunk_static
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
)

1
external/chipmunk/src/cpCollision.c vendored
View File

@ -21,6 +21,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <alloca.h>
#include "chipmunk_private.h" #include "chipmunk_private.h"