Commit: 57c9d69e6bcfba01090282161c04252c4780b0fa
Author: Campbell Barton
Date: Sun Nov 23 15:13:58 2014 +0100
Branches: master
https://developer.blender.org/rB57c9d69e6bcfba01090282161c04252c4780b0fa
Cleanup: warnings
===================================================================
M source/creator/CMakeLists.txt
M source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
===================================================================
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 0e596fb..394219b 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 228adbb..765f056 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)
:
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
