Merging changes from trunk r58091-58323.
authorMitchell Stokes <mogurijin@gmail.com>
Wed, 17 Jul 2013 01:40:26 +0000 (01:40 +0000)
committerMitchell Stokes <mogurijin@gmail.com>
Wed, 17 Jul 2013 01:40:26 +0000 (01:40 +0000)
1  2 
CMakeLists.txt
source/gameengine/GamePlayer/common/CMakeLists.txt
source/gameengine/Ketsji/CMakeLists.txt

diff --combined CMakeLists.txt
index 0bd9cabfa7babff2f4dbde56f48be16682180b6a,b1a7830434e4198f8e88bcfadcbef79546dcdd2e..d3c65baec345eb66e54213195f50552f69c9e877
@@@ -538,6 -538,9 +538,6 @@@ set(PLATFORM_LINKFLAGS ""
  set(PLATFORM_LINKFLAGS_DEBUG "")
  
  
 -# disabled for now, not supported
 -# option(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
 -
  # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
  # On Unix:
  #   cmake ../blender \
@@@ -1871,6 -1874,16 +1871,6 @@@ if(WITH_IMAGE_REDCODE
        set(REDCODE_INC ${REDCODE})
  endif()
  
 -#-----------------------------------------------------------------------------
 -# Blender WebPlugin
 -
 -if(WITH_WEBPLUGIN)
 -      set(GECKO_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path")
 -      set(WEBPLUGIN_SANDBOX_MODE "apparmor" CACHE STRING "WEB Plugin sandbox mode, can be apparmor, privsep, none")
 -
 -      set(WITH_PLAYER ON)
 -endif()
 -
  
  #-----------------------------------------------------------------------------
  # Configure OpenGL.
@@@ -2040,6 -2053,20 +2040,20 @@@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "C
        ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
        ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS    -Wno-unused-macros)
  
+       ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_VARIABLE_DECLARATIONS -Wno-missing-variable-declarations)
+       ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function)
+       ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_INT_TO_VOID_POINTER_CAST -Wno-int-to-void-pointer-cast)
+       ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_PROTOTYPES -Wno-missing-prototypes)
+       ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DUPLICATE_ENUM -Wno-duplicate-enum)
+       ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNDEF -Wno-undef)
+       ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_NORETURN -Wno-missing-noreturn)
+       ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PRIVATE_FIELD -Wno-unused-private-field)
+       ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_CXX11_NARROWING -Wno-c++11-narrowing)
+       ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_NON_VIRTUAL_DTOR -Wno-non-virtual-dtor)
+       ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
+       ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_REORDER -Wno-reorder)
  elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
  
        ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
index 72f3e60b4a2208e0d5a965afb72fa4ac6ef0ac18,e7d4fc3dbce3418bf7d5ba3cb522fec4b2c2aa46..4f2531cec2a0c3d4e076527d0ab3caa82d0311e5
@@@ -48,27 -48,38 +48,27 @@@ set(IN
        ../../../../intern/container
        ../../../../intern/ghost
        ../../../../intern/guardedalloc
-       ../../../../intern/moto/include
        ../../../../intern/string
  )
  
  set(INC_SYS
+       ../../../../intern/moto/include
        ${GLEW_INCLUDE_PATH}
        ${PYTHON_INCLUDE_DIRS}
        ${PNG_INCLUDE_DIR}
        ${ZLIB_INCLUDE_DIRS}
  )
  
- set(SRC 
+ set(SRC
        GPC_Canvas.cpp
 -      GPC_Engine.cpp
        GPC_KeyboardDevice.cpp
        GPC_MouseDevice.cpp
 -      GPC_RawImage.cpp
 -      GPC_RawLoadDotBlendArray.cpp
 -      GPC_RawLogoArrays.cpp
        GPC_RenderTools.cpp
 -      GPC_System.cpp
 -      bmfont.cpp
  
        GPC_Canvas.h
 -      GPC_Engine.h
        GPC_KeyboardDevice.h
        GPC_MouseDevice.h
 -      GPC_RawImage.h
 -      GPC_RawLoadDotBlendArray.h
 -      GPC_RawLogoArrays.h
        GPC_RenderTools.h
 -      GPC_System.h
  )
  
  add_definitions(-DGLEW_STATIC)
index 068b367022cc86a8155a6229d7cd1628655b9c6f,1f5fa4ff80ea09e108597394f7f4cc8f27a32bdc..7da63dcc6f4de0034486abf4aeee3bfd60d38f81
@@@ -50,16 -50,16 +50,16 @@@ set(IN
        ../../blender/python/mathutils
        ../../../intern/container
        ../../../intern/guardedalloc
-       ../../../intern/moto/include
        ../../../intern/string
  )
  
  set(INC_SYS
+       ../../../intern/moto/include
+       ../../../extern/recastnavigation/Recast/Include
+       ../../../extern/recastnavigation/Detour/Include
        ${PTHREADS_INCLUDE_DIRS}
        ${GLEW_INCLUDE_PATH}
        ${BOOST_INCLUDE_DIR}
-       ../../../extern/recastnavigation/Recast/Include
-       ../../../extern/recastnavigation/Detour/Include
  )
  
  set(SRC
        KX_OrientationInterpolator.h
        KX_ParentActuator.h
        KX_PhysicsEngineEnums.h
 -      KX_PhysicsPropertiesobsolete.h
        KX_PolyProxy.h
        KX_PolygonMaterial.h
        KX_PositionInterpolator.h