Revision: 38334
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38334
Author: campbellbarton
Date: 2011-07-12 13:47:41 +0000 (Tue, 12 Jul 2011)
Log Message:
-----------
correction to last commit, dont link Xlib when sdl/ghost is used + some minor
edits.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/intern/ghost/intern/GHOST_DisplayManagerSDL.h
trunk/blender/intern/ghost/intern/GHOST_SystemSDL.h
trunk/blender/intern/ghost/intern/GHOST_WindowSDL.h
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-07-12 13:35:25 UTC (rev 38333)
+++ trunk/blender/CMakeLists.txt 2011-07-12 13:47:41 UTC (rev 38334)
@@ -109,7 +109,7 @@
option(WITH_AUDASPACE "Build with blenders audio library" ON)
mark_as_advanced(WITH_AUDASPACE)
-option(WITH_SDL_GHOST "Enable SDL for sound and joystick support" OFF)
+option(WITH_SDL_GHOST "Enable building blender against SDL for windowing
rather then the native APIs" OFF)
mark_as_advanced(WITH_SDL_GHOST)
option(WITH_HEADLESS "Build without graphical support (renderfarm, server
mode only)" OFF)
@@ -440,7 +440,7 @@
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using
--as-needed
set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
- if(NOT WITH_HEADLESS)
+ if((NOT WITH_HEADLESS) AND (NOT WITH_SDL_GHOST))
find_package(X11 REQUIRED)
find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h
${X11_INC_SEARCH_PATH})
mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
Modified: trunk/blender/intern/ghost/intern/GHOST_DisplayManagerSDL.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DisplayManagerSDL.h 2011-07-12
13:35:25 UTC (rev 38333)
+++ trunk/blender/intern/ghost/intern/GHOST_DisplayManagerSDL.h 2011-07-12
13:47:41 UTC (rev 38334)
@@ -31,7 +31,9 @@
#include "GHOST_DisplayManager.h"
-#include "SDL.h"
+extern "C" {
+ #include "SDL.h"
+}
class GHOST_SystemSDL;
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemSDL.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemSDL.h 2011-07-12 13:35:25 UTC
(rev 38333)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemSDL.h 2011-07-12 13:47:41 UTC
(rev 38334)
@@ -36,8 +36,9 @@
#include "GHOST_WindowSDL.h"
#include "GHOST_Event.h"
-#include "SDL.h"
-#include "SDL_mouse.h"
+extern "C" {
+ #include "SDL.h"
+}
class GHOST_WindowSDL;
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowSDL.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowSDL.h 2011-07-12 13:35:25 UTC
(rev 38333)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowSDL.h 2011-07-12 13:47:41 UTC
(rev 38334)
@@ -33,7 +33,9 @@
#include "GHOST_SystemSDL.h"
#include <map>
-#include "SDL.h"
+extern "C" {
+ #include "SDL.h"
+}
class STR_String;
@@ -109,8 +111,10 @@
GHOST_TSuccess setClientHeight(GHOST_TUns32 height);
GHOST_TSuccess setClientSize(GHOST_TUns32 width, GHOST_TUns32 height);
+ /* TODO */
void screenToClient( GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32&
outX, GHOST_TInt32& outY ) const { outX = inX; outY = inY; }
void clientToScreen( GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32&
outX, GHOST_TInt32& outY ) const { outX = inX; outY = inY; }
+
GHOST_TSuccess swapBuffers();
GHOST_TSuccess activateDrawingContext();
GHOST_TSuccess setState(GHOST_TWindowState state);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
