[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55346] trunk/blender: - ghost-sdl builds again.
Campbell Barton
ideasman42 at gmail.com
Sat Mar 16 21:49:46 CET 2013
Revision: 55346
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55346
Author: campbellbarton
Date: 2013-03-16 20:49:46 +0000 (Sat, 16 Mar 2013)
Log Message:
-----------
- ghost-sdl builds again.
- without python builds without warnings.
- replace MAXFLOAT -> FLT_MAX in some areas, MAXFLOAT overflows (lager then float range).
- add cmake option WITH_GCC_MUDFLAP to enable libmudflap use.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/intern/ghost/intern/GHOST_SystemSDL.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemSDL.h
trunk/blender/intern/ghost/intern/GHOST_WindowSDL.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowSDL.h
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/bmesh/bmesh_class.h
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2013-03-16 18:52:09 UTC (rev 55345)
+++ trunk/blender/CMakeLists.txt 2013-03-16 20:49:46 UTC (rev 55346)
@@ -278,6 +278,10 @@
option(WITH_BOOST "Enable features depending no boost" ON)
+if(CMAKE_COMPILER_IS_GNUCC)
+ option(WITH_GCC_MUDFLAP "Enable mudflap" OFF)
+ mark_as_advanced(WITH_GCC_MUDFLAP)
+endif()
if(APPLE)
cmake_minimum_required(VERSION 2.8.8)
@@ -2036,7 +2040,7 @@
if(WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY)
# set but invalid
- # -- disabled until we make numpy bundled with blender - campbell
+ # -- disabled until we make numpy bundled with blender - campbell
if((NOT ${PYTHON_NUMPY_PATH} STREQUAL "") AND (NOT ${PYTHON_NUMPY_PATH} MATCHES NOTFOUND))
# if(NOT EXISTS "${PYTHON_NUMPY_PATH}/numpy")
# message(WARNING "PYTHON_NUMPY_PATH is invalid, numpy not found in '${PYTHON_NUMPY_PATH}' "
@@ -2080,6 +2084,13 @@
endif()
endif()
+if(WITH_GCC_MUDFLAP)
+ set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -fmudflapth -funwind-tables")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lpthread -lmudflapth -rdynamic")
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_MUDFLAP -Wno-error=mudflap)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_ERROR_MUDFLAP -Wno-error=mudflap)
+endif()
+
# Include warnings first, so its possible to disable them with user defined flags
# eg: -Wno-uninitialized
set(CMAKE_C_FLAGS "${C_WARNINGS} ${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS}")
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemSDL.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemSDL.cpp 2013-03-16 18:52:09 UTC (rev 55345)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemSDL.cpp 2013-03-16 20:49:46 UTC (rev 55346)
@@ -27,6 +27,7 @@
#include <assert.h>
#include "GHOST_SystemSDL.h"
+#include "GHOST_WindowSDL.h"
#include "GHOST_WindowManager.h"
@@ -66,14 +67,19 @@
GHOST_TUns32 height,
GHOST_TWindowState state,
GHOST_TDrawingContextType type,
- bool stereoVisual,
+ const bool stereoVisual,
+ const bool exclusive,
const GHOST_TUns16 numOfAASamples,
const GHOST_TEmbedderWindowID parentWindow
)
{
GHOST_WindowSDL *window = NULL;
- window = new GHOST_WindowSDL(this, title, left, top, width, height, state, parentWindow, type, stereoVisual, numOfAASamples);
+ window = new GHOST_WindowSDL(this, title,
+ left, top, width, height,
+ state, parentWindow, type,
+ stereoVisual, exclusive,
+ numOfAASamples);
if (window) {
if (GHOST_kWindowStateFullScreen == state) {
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemSDL.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemSDL.h 2013-03-16 18:52:09 UTC (rev 55345)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemSDL.h 2013-03-16 20:49:46 UTC (rev 55346)
@@ -108,9 +108,10 @@
GHOST_TUns32 height,
GHOST_TWindowState state,
GHOST_TDrawingContextType type,
- bool stereoVisual,
- const GHOST_TUns16 numOfAASamples,
- const GHOST_TEmbedderWindowID parentWindow
+ const bool stereoVisual,
+ const bool exclusive = false,
+ const GHOST_TUns16 numOfAASamples = 0,
+ const GHOST_TEmbedderWindowID parentWindow = 0
);
/* SDL specific */
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowSDL.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowSDL.cpp 2013-03-16 18:52:09 UTC (rev 55345)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowSDL.cpp 2013-03-16 20:49:46 UTC (rev 55346)
@@ -41,10 +41,11 @@
const GHOST_TEmbedderWindowID parentWindow,
GHOST_TDrawingContextType type,
const bool stereoVisual,
+ const bool exclusive,
const GHOST_TUns16 numOfAASamples
)
:
- GHOST_Window(width, height, state, type, stereoVisual, numOfAASamples),
+ GHOST_Window(width, height, state, type, stereoVisual, exclusive, numOfAASamples),
m_system(system),
m_invalid_window(false),
m_sdl_custom_cursor(NULL)
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowSDL.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowSDL.h 2013-03-16 18:52:09 UTC (rev 55345)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowSDL.h 2013-03-16 20:49:46 UTC (rev 55346)
@@ -41,6 +41,7 @@
#endif
class STR_String;
+class GHOST_SystemSDL;
class GHOST_WindowSDL : public GHOST_Window
{
@@ -64,9 +65,10 @@
GHOST_TUns32 width, GHOST_TUns32 height,
GHOST_TWindowState state,
const GHOST_TEmbedderWindowID parentWindow,
- GHOST_TDrawingContextType type,
- const bool stereoVisual,
- const GHOST_TUns16 numOfAASamples
+ GHOST_TDrawingContextType type = GHOST_kDrawingContextTypeNone,
+ const bool stereoVisual = false,
+ const bool exclusive = false,
+ const GHOST_TUns16 numOfAASamples = 0
);
~GHOST_WindowSDL();
@@ -166,6 +168,11 @@
return GHOST_kSuccess;
}
+ // TODO
+ GHOST_TSuccess beginFullScreen() const { return GHOST_kFailure; }
+
+ GHOST_TSuccess endFullScreen() const { return GHOST_kFailure; }
+
};
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2013-03-16 18:52:09 UTC (rev 55345)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2013-03-16 20:49:46 UTC (rev 55346)
@@ -195,7 +195,7 @@
}
#ifndef WITH_PYTHON
-void bpy_bm_generic_invalidate(void *UNUSED(self))
+void bpy_bm_generic_invalidate(struct BPy_BMGeneric *UNUSED(self))
{
/* dummy */
}
@@ -203,8 +203,6 @@
static void layerFree_bmesh_elem_py_ptr(void *data, int count, int size)
{
- extern void bpy_bm_generic_invalidate(void *self);
-
int i;
for (i = 0; i < count; ++i) {
Modified: trunk/blender/source/blender/bmesh/bmesh_class.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_class.h 2013-03-16 18:52:09 UTC (rev 55345)
+++ trunk/blender/source/blender/bmesh/bmesh_class.h 2013-03-16 20:49:46 UTC (rev 55346)
@@ -252,6 +252,9 @@
* not have functions clobber them */
};
+struct BPy_BMGeneric;
+extern void bpy_bm_generic_invalidate(struct BPy_BMGeneric *self);
+
/* defines */
#define BM_ELEM_CD_GET_VOID_P(ele, offset) \
(assert(offset != -1), (void *)((char *)(ele)->head.data + (offset)))
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2013-03-16 18:52:09 UTC (rev 55345)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2013-03-16 20:49:46 UTC (rev 55346)
@@ -247,8 +247,6 @@
if (bm->py_handle) {
/* keep this out of 'BM_mesh_data_free' because we want python
* to be able to clear the mesh and maintain access. */
- extern void bpy_bm_generic_invalidate(void *self);
-
bpy_bm_generic_invalidate(bm->py_handle);
bm->py_handle = NULL;
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_select.c 2013-03-16 18:52:09 UTC (rev 55345)
+++ trunk/blender/source/blender/editors/mesh/editmesh_select.c 2013-03-16 20:49:46 UTC (rev 55346)
@@ -1171,7 +1171,7 @@
/* Select the face of eed which is the nearest of mouse. */
BMFace *f, *efa = NULL;
BMIter iterf;
- float best_dist = MAXFLOAT;
+ float best_dist = FLT_MAX;
/* We can't be sure this has already been set... */
ED_view3d_init_mats_rv3d(vc.obedit, vc.rv3d);
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2013-03-16 18:52:09 UTC (rev 55345)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2013-03-16 20:49:46 UTC (rev 55346)
@@ -1293,7 +1293,7 @@
}
}
else {
- td->dist = MAXFLOAT;
+ td->dist = FLT_MAX;
td->flag |= TD_NOTCONNECTED;
}
}
@@ -2131,7 +2131,7 @@
}
else {
tob->flag |= TD_NOTCONNECTED;
- tob->dist = MAXFLOAT;
+ tob->dist = FLT_MAX;
}
}
@@ -2367,7 +2367,7 @@
td->dist = 0.0;
}
else {
- td->dist = MAXFLOAT;
+ td->dist = FLT_MAX;
}
unit_m3(td->mtx);
unit_m3(td->smtx);
@@ -3504,7 +3504,7 @@
td->dist = 0.0f;
}
else
- td->dist = MAXFLOAT;
+ td->dist = FLT_MAX;
if (ishandle)
td->flag |= TD_NOTIMESNAP;
More information about the Bf-blender-cvs
mailing list