sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: warnings

Browse Source
This commit is contained in:
Campbell Barton 2014-11-23 15:13:58 +01:00
parent b9d9df9810
commit 57c9d69e6b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/creator/CMakeLists.txt
View File

@ -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 )

4
source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
View File

@ -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)
: