diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-11-23 17:13:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-23 17:13:58 +0300 |
| commit | 57c9d69e6bcfba01090282161c04252c4780b0fa (patch) | |
| tree | d12a4804a811e31f307af4d1d56b34bc8664f6d1 /source | |
| parent | b9d9df9810c6b66584b36186876e9da08709c84a (diff) | |
Cleanup: warnings
Diffstat (limited to 'source')
| -rw-r--r-- | source/creator/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 0e596fb0c5f..394219b160c 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -652,9 +652,9 @@ elseif(WIN32) add_custom_target(python_numpy COMMAND ${CMAKE_COMMAND} -E tar xzfv "${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.8.tar.gz" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages) + add_dependencies(blender python_numpy) endif() - add_dependencies(blender python_numpy) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib DESTINATION ${BLENDER_VERSION}/python ) diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp index 228adbb942e..765f0561007 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp +++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp @@ -41,7 +41,9 @@ #include "BLI_path_util.h" -#define SDL_CHECK(x) ((x) != (void*)0) +#ifdef WITH_SDL +# define SDL_CHECK(x) ((x) != (void *)0) +#endif SCA_Joystick::SCA_Joystick(short int index) : |