merge from trunk r37405

21 files changed, 397 insertions, 58 deletions

diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
index a2468d0071e..b7a0b06d491 100644
--- a/intern/audaspace/CMakeLists.txt
+++ b/intern/audaspace/CMakeLists.txt
@@ -23,12 +23,15 @@
 set(INC
 	.
 	intern
-	FX SRC
-	${PTHREADS_INC}
-	${LIBSAMPLERATE_INC}
+	FX
+	SRC
 	../ffmpeg
 )
 
+set(INC_SYS
+	${PTHREADS_INC}
+)
+
 set(SRC
 	FX/AUD_AccumulatorFactory.cpp
 	FX/AUD_BaseIIRFilterReader.cpp
@@ -156,8 +159,9 @@ set(SRC
 
 if(WITH_CODEC_FFMPEG)
 	add_definitions(-DWITH_FFMPEG)
-	list(APPEND INC ffmpeg ${FFMPEG_INC})
-	set(FFMPEGSRC
+	list(APPEND INC ffmpeg)
+	list(APPEND INC_SYS ${FFMPEG_INC})
+	list(APPEND SRC
 		ffmpeg/AUD_FFMPEGFactory.cpp
 		ffmpeg/AUD_FFMPEGReader.cpp
 
@@ -168,8 +172,9 @@ endif()
 
 if(WITH_SDL)
 	add_definitions(-DWITH_SDL)
-	list(APPEND INC SDL ${SDL_INCLUDE_DIR})
-	set(SDLSRC
+	list(APPEND INC SDL)
+	list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
+	list(APPEND SRC
 		SDL/AUD_SDLDevice.cpp
 
 		SDL/AUD_SDLDevice.h
@@ -178,18 +183,20 @@ endif()
 
 if(WITH_OPENAL)
 	add_definitions(-DWITH_OPENAL)
-	list(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR})
-	set(OPENALSRC
+	list(APPEND INC OpenAL)
+	list(APPEND INC_SYS ${OPENAL_INCLUDE_DIR})
+	list(APPEND SRC
 		OpenAL/AUD_OpenALDevice.cpp
 
 		OpenAL/AUD_OpenALDevice.h
-	)	
+	)
 endif()
 
 if(WITH_JACK)
 	add_definitions(-DWITH_JACK)
-	list(APPEND INC jack ${JACK_INC})
-	set(JACKSRC
+	list(APPEND INC jack)
+	list(APPEND INC_SYS ${JACK_INC})
+	list(APPEND SRC
 		jack/AUD_JackDevice.cpp
 
 		jack/AUD_JackDevice.h
@@ -198,8 +205,9 @@ endif()
 
 if(WITH_CODEC_SNDFILE)
 	add_definitions(-DWITH_SNDFILE)
-	list(APPEND INC sndfile ${SNDFILE_INC})
-	set(SNDFILESRC
+	list(APPEND INC sndfile)
+	list(APPEND INC_SYS ${SNDFILE_INC})
+	list(APPEND SRC
 		sndfile/AUD_SndFileFactory.cpp
 		sndfile/AUD_SndFileReader.cpp
 
@@ -210,7 +218,8 @@ endif()
 
 if(WITH_SAMPLERATE)
 	add_definitions(-DWITH_SAMPLERATE)
-	set(SRCFILESRC
+	list(APPEND INC_SYS ${LIBSAMPLERATE_INC})
+	list(APPEND SRC
 		SRC/AUD_SRCResampleFactory.cpp
 		SRC/AUD_SRCResampleReader.cpp
 
@@ -221,8 +230,9 @@ endif()
 
 if(WITH_FFTW3 AND FALSE)
 	add_definitions(-DWITH_FFTW3)
-	list(APPEND INC fftw ${FFTW3_INC})
-	set(FFTW3SRC
+	list(APPEND INC fftw)
+	list(APPEND INC_SYS ${FFTW3_INC})
+	list(APPEND SRC
 		fftw/AUD_BandPassFactory.cpp
 		fftw/AUD_BandPassReader.cpp
 
@@ -232,8 +242,9 @@ if(WITH_FFTW3 AND FALSE)
 endif()
 
 if(WITH_PYTHON)
-	list(APPEND INC Python ${PYTHON_INCLUDE_DIRS})
-	set(PYTHONSRC
+	list(APPEND INC Python)
+	list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+	list(APPEND SRC
 		Python/AUD_PyAPI.cpp
 
 		Python/AUD_PyAPI.h
@@ -241,16 +252,4 @@ if(WITH_PYTHON)
 	add_definitions(-DWITH_PYTHON)
 endif()
 
-set(SRC
-	${SRC}
-	${FFMPEGSRC}
-	${SNDFILESRC}
-	${SRCFILESRC}
-	${FFTW3SRC}
-	${SDLSRC}
-	${OPENALSRC}
-	${JACKSRC}
-	${PYTHONSRC}
-)
-
-blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}")
+blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/boolop/CMakeLists.txt b/intern/boolop/CMakeLists.txt
index 7e36f255268..7a95d556172 100644
--- a/intern/boolop/CMakeLists.txt
+++ b/intern/boolop/CMakeLists.txt
@@ -36,6 +36,10 @@ set(INC
 	../../source/blender/makesdna
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/BOP_BBox.cpp
 	intern/BOP_BSPNode.cpp
@@ -75,4 +79,4 @@ set(SRC
 	intern/BOP_Vertex.h
 )
 
-blender_add_lib(bf_intern_bop "${SRC}" "${INC}")
+blender_add_lib(bf_intern_bop "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt
index 9f281586867..792f6aa1327 100644
--- a/intern/bsp/CMakeLists.txt
+++ b/intern/bsp/CMakeLists.txt
@@ -32,6 +32,10 @@ set(INC
 	../memutil
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/BSP_CSGMesh.cpp
 	intern/BSP_MeshPrimitives.cpp
@@ -44,4 +48,4 @@ set(SRC
 	intern/BSP_MeshPrimitives.h
 )
 
-blender_add_lib(bf_intern_bsp "${SRC}" "${INC}")
+blender_add_lib(bf_intern_bsp "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/container/CMakeLists.txt b/intern/container/CMakeLists.txt
index 7e83acf68ce..42c8de6a08e 100644
--- a/intern/container/CMakeLists.txt
+++ b/intern/container/CMakeLists.txt
@@ -29,6 +29,10 @@ set(INC
 	../guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/CTR_List.cpp
 
@@ -40,4 +44,4 @@ set(SRC
 	CTR_UHeap.h
 )
 
-blender_add_lib(bf_intern_ctr "${SRC}" "${INC}")
+blender_add_lib(bf_intern_ctr "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/decimation/CMakeLists.txt b/intern/decimation/CMakeLists.txt
index 6f9137b7189..53ba92e416b 100644
--- a/intern/decimation/CMakeLists.txt
+++ b/intern/decimation/CMakeLists.txt
@@ -32,6 +32,10 @@ set(INC
 	../moto/include
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/LOD_EdgeCollapser.cpp
 	intern/LOD_ExternNormalEditor.cpp
@@ -57,4 +61,4 @@ set(SRC
 	intern/LOD_QuadricEditor.h
 )
 
-blender_add_lib(bf_intern_decimate "${SRC}" "${INC}")
+blender_add_lib(bf_intern_decimate "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt
index dd23e854a25..7a842a29b98 100644
--- a/intern/elbeem/CMakeLists.txt
+++ b/intern/elbeem/CMakeLists.txt
@@ -26,6 +26,9 @@
 
 set(INC
 	extern
+)
+
+set(INC_SYS
 	${PNG_INCLUDE_DIR}
 	${ZLIB_INCLUDE_DIRS}
 )
@@ -88,11 +91,11 @@ set(SRC
 
 add_definitions(-DNOGUI -DELBEEM_BLENDER=1)
 if(WINDOWS)
-		add_definitions(-DUSE_MSVC6FIXES)
+	add_definitions(-DUSE_MSVC6FIXES)
 endif()
 
 if(WITH_OPENMP)
-		add_definitions(-DPARALLEL=1)
+	add_definitions(-DPARALLEL=1)
 endif()
 
-blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}")
+blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index d42be400dff..922f6918392 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -29,6 +29,9 @@ set(INC
 	../string
 	../../source/blender/imbuf
 	../../source/blender/makesdna
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -86,7 +89,42 @@ set(SRC
 	intern/GHOST_WindowManager.h
 )
 
-if(APPLE)
+if(WITH_HEADLESS)
+	list(APPEND SRC
+		intern/GHOST_DisplayManagerNULL.h
+		intern/GHOST_SystemNULL.h
+		intern/GHOST_WindowNULL.h
+	)
+	add_definitions(-DWITH_HEADLESS)
+
+	# ack, this is still system dependant
+	if(APPLE)
+		if(WITH_COCOA)
+			list(APPEND SRC
+				intern/GHOST_SystemPathsCocoa.mm
+				intern/GHOST_SystemPathsCocoa.h
+			)
+		else()
+			list(APPEND SRC
+				intern/GHOST_SystemPathsCarbon.cpp
+				intern/GHOST_SystemPathsCarbon.h
+			)
+		endif()
+	elseif(UNIX)
+		list(APPEND SRC
+			intern/GHOST_SystemPathsX11.cpp
+			intern/GHOST_SystemPathsX11.h
+		)
+	elseif(WIN32)
+
+		list(APPEND SRC
+			intern/GHOST_SystemPathsWin32.cpp
+
+			intern/GHOST_SystemPathsWin32.h
+		)
+	endif()
+
+elseif(APPLE)
 	if(WITH_COCOA)
 		list(APPEND SRC
 			intern/GHOST_DisplayManagerCocoa.mm
@@ -123,7 +161,7 @@ elseif(UNIX)
 		add_definitions(-DWITH_X11_XINPUT)
 	endif()
 
-	list(APPEND INC ${X11_X11_INCLUDE_PATH})
+	list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH})
 
 	list(APPEND SRC
 		intern/GHOST_DisplayManagerX11.cpp
@@ -143,7 +181,7 @@ elseif(UNIX)
 
 	if(X11_XF86keysym_INCLUDE_PATH)
 		add_definitions(-DWITH_XF86KEYSYM)
-		list(APPEND INC ${X11_XF86keysym_INCLUDE_PATH})
+		list(APPEND INC_SYS ${X11_XF86keysym_INCLUDE_PATH})
 	endif()
 
 elseif(WIN32)
@@ -151,7 +189,7 @@ elseif(WIN32)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
 	endif()
 
-	list(APPEND INC ${WINTAB_INC})
+	list(APPEND INC_SYS ${WINTAB_INC})
 
 	list(APPEND SRC
 		intern/GHOST_DisplayManagerWin32.cpp
@@ -169,5 +207,5 @@ elseif(WIN32)
 	)
 endif()
 
-blender_add_lib(bf_intern_ghost "${SRC}" "${INC}")
+blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}")
 
diff --git a/intern/ghost/intern/GHOST_DisplayManagerNULL.h b/intern/ghost/intern/GHOST_DisplayManagerNULL.h
new file mode 100755
index 00000000000..e0bd224b216
--- /dev/null
+++ b/intern/ghost/intern/GHOST_DisplayManagerNULL.h
@@ -0,0 +1,51 @@
+/*
+ * $Id: GHOST_DisplayManagerNULL.h 37194 2011-06-05 00:10:20Z gsrb3d $
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file ghost/intern/GHOST_DisplayManagerNULL.h
+ *  \ingroup GHOST
+ * Declaration of GHOST_DisplayManagerNULL class.
+ */
+
+#ifndef _GHOST_DISPLAY_MANAGER_NULL_H_
+#define _GHOST_DISPLAY_MANAGER_NULL_H_
+
+#include "GHOST_DisplayManager.h"
+#include "GHOST_SystemNULL.h"
+
+class GHOST_SystemNULL;
+
+class GHOST_DisplayManagerNULL : public GHOST_DisplayManager
+{
+public:
+	GHOST_DisplayManagerNULL( GHOST_SystemNULL *system ) : GHOST_DisplayManager(), m_system(system) { /* nop */ }
+	GHOST_TSuccess getNumDisplays( GHOST_TUns8& numDisplays ) const { return GHOST_kFailure; }
+	GHOST_TSuccess getNumDisplaySettings( GHOST_TUns8 display, GHOST_TInt32& numSettings ) const{  return GHOST_kFailure; }
+	GHOST_TSuccess getDisplaySetting( GHOST_TUns8 display, GHOST_TInt32 index, GHOST_DisplaySetting& setting ) const { return GHOST_kFailure; }
+	GHOST_TSuccess getCurrentDisplaySetting( GHOST_TUns8 display, GHOST_DisplaySetting& setting ) const { return getDisplaySetting(display,GHOST_TInt32(0),setting); }
+	GHOST_TSuccess setCurrentDisplaySetting( GHOST_TUns8 display, const GHOST_DisplaySetting& setting ){ return GHOST_kSuccess; }
+
+private :
+	GHOST_SystemNULL * m_system;
+};
+
+#endif /* _GHOST_DISPLAY_MANAGER_NULL_H_ */
diff --git a/intern/ghost/intern/GHOST_ISystem.cpp b/intern/ghost/intern/GHOST_ISystem.cpp
index 040164e2c40..7f170d2e876 100644
--- a/intern/ghost/intern/GHOST_ISystem.cpp
+++ b/intern/ghost/intern/GHOST_ISystem.cpp
@@ -41,7 +41,9 @@
 
 #include "GHOST_ISystem.h"
 
-#ifdef WIN32
+#ifdef WITH_HEADLESS
+#	include "GHOST_SystemNULL.h"
+#elif defined(WIN32)
 #	include "GHOST_SystemWin32.h"
 #else
 #	ifdef __APPLE__
@@ -63,7 +65,9 @@ GHOST_TSuccess GHOST_ISystem::createSystem()
 {
 	GHOST_TSuccess success;
 	if (!m_system) {
-#ifdef WIN32
+#ifdef WITH_HEADLESS
+		m_system = new GHOST_SystemNULL();
+#elif defined(WIN32)
 		m_system = new GHOST_SystemWin32 ();
 #else
 #	ifdef __APPLE__
diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp
index 95626ec26ea..7721b1708f9 100644
--- a/intern/ghost/intern/GHOST_NDOFManager.cpp
+++ b/intern/ghost/intern/GHOST_NDOFManager.cpp
@@ -81,7 +81,9 @@ GHOST_NDOFManager::deviceOpen(GHOST_IWindow* window,
 #if 0
        	printf("%i client \n", Pid);
 #endif
-		#if defined(_WIN32) || defined(__APPLE__)
+		#if defined(WITH_HEADLESS)
+			/* do nothing */
+		#elif defined(_WIN32) || defined(__APPLE__)
 			m_DeviceHandle = ndofDeviceOpen((void *)&currentNdofValues);    
 		#else
 			GHOST_SystemX11 *sys;
diff --git a/intern/ghost/intern/GHOST_SystemNULL.h b/intern/ghost/intern/GHOST_SystemNULL.h
new file mode 100755
index 00000000000..de2cd97b192
--- /dev/null
+++ b/intern/ghost/intern/GHOST_SystemNULL.h
@@ -0,0 +1,93 @@
+/*
+ * $Id: GHOST_SystemNULL.h 37194 2011-06-05 00:10:20Z gsrb3d $
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file ghost/intern/GHOST_SystemNULL.h
+ *  \ingroup GHOST
+ * Declaration of GHOST_SystemNULL class.
+ */
+
+#ifndef _GHOST_SYSTEM_NULL_H_
+#define _GHOST_SYSTEM_NULL_H_
+
+#include "GHOST_System.h"
+#include "../GHOST_Types.h"
+#include "GHOST_DisplayManagerNULL.h"
+#include "GHOST_WindowNULL.h"
+
+class GHOST_WindowNULL;
+
+class GHOST_SystemNULL : public GHOST_System {
+public:
+
+	GHOST_SystemNULL( ) : GHOST_System() { /* nop */ }
+	~GHOST_SystemNULL() { /* nop */ }
+	bool processEvents(bool waitForEvent) { return false; }
+	int toggleConsole(int action) { return 0; }
+	GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys& keys) const { return GHOST_kSuccess; }
+	GHOST_TSuccess getButtons(GHOST_Buttons& buttons) const { return GHOST_kSuccess; }
+	GHOST_TUns8 *getClipboard(bool selection) const { return NULL; }
+	void putClipboard(GHOST_TInt8 *buffer, bool selection) const { /* nop */ }
+	GHOST_TUns64 getMilliSeconds( ) const { return 0; }
+	GHOST_TUns8 getNumDisplays( ) const { return GHOST_TUns8(1); }
+	GHOST_TSuccess getCursorPosition( GHOST_TInt32& x, GHOST_TInt32& y ) const { return GHOST_kFailure; }
+	GHOST_TSuccess setCursorPosition( GHOST_TInt32 x, GHOST_TInt32 y ) { return GHOST_kFailure; }
+	void getMainDisplayDimensions( GHOST_TUns32& width, GHOST_TUns32& height ) const { /* nop */ }
+
+	GHOST_TSuccess init() {
+		GHOST_TSuccess success = GHOST_System::init();
+
+		if (success) {
+			m_displayManager = new GHOST_DisplayManagerNULL(this);
+
+			if (m_displayManager) {
+				return GHOST_kSuccess;
+			}
+		}
+
+		return GHOST_kFailure;
+	}
+
+	GHOST_IWindow* createWindow(
+	    const STR_String& title,
+	    GHOST_TInt32 left,
+	    GHOST_TInt32 top,
+	    GHOST_TUns32 width,
+	    GHOST_TUns32 height,
+	    GHOST_TWindowState state,
+	    GHOST_TDrawingContextType type,
+	    bool stereoVisual,
+	    const GHOST_TUns16 numOfAASamples,
+	    const GHOST_TEmbedderWindowID parentWindow
+	    ) {
+		return new GHOST_WindowNULL (this, title, left, top, width, height, state, parentWindow, type, stereoVisual, 1);
+	}
+};
+
+#endif
+
+
+
+
+
+
+
diff --git a/intern/ghost/intern/GHOST_WindowNULL.h b/intern/ghost/intern/GHOST_WindowNULL.h
new file mode 100755
index 00000000000..ff3967baa93
--- /dev/null
+++ b/intern/ghost/intern/GHOST_WindowNULL.h
@@ -0,0 +1,96 @@
+/*
+ * $Id: GHOST_WindowNULL.h 37194 2011-06-05 00:10:20Z gsrb3d $
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file ghost/intern/GHOST_WindowNULL.h
+ *  \ingroup GHOST
+ * Declaration of GHOST_WindowNULL class.
+ */
+
+#ifndef _GHOST_WINDOWNULL_H_
+#define _GHOST_WINDOWNULL_H_
+
+#include "GHOST_Window.h"
+
+#include <map>
+
+class STR_String;
+class GHOST_SystemNULL;
+
+class GHOST_WindowNULL : public GHOST_Window
+{
+public:
+	const GHOST_TabletData* GetTabletData() { return NULL; }
+
+	GHOST_WindowNULL(
+		GHOST_SystemNULL *system,
+		const STR_String& title,
+		GHOST_TInt32 left,
+		GHOST_TInt32 top,
+		GHOST_TUns32 width,
+		GHOST_TUns32 height,
+		GHOST_TWindowState state,
+		const GHOST_TEmbedderWindowID parentWindow,
+		GHOST_TDrawingContextType type,
+		const bool stereoVisual,
+		const GHOST_TUns16 numOfAASamples
+		) :
+		GHOST_Window(title,left,top,width,height,state,type,stereoVisual,numOfAASamples),
+		m_system (system)
+	{
+		setTitle(title);
+	}
+
+protected:
+	GHOST_TSuccess installDrawingContext( GHOST_TDrawingContextType type ){ return GHOST_kSuccess; }
+	GHOST_TSuccess removeDrawingContext( ){ return GHOST_kSuccess; }
+	GHOST_TSuccess setWindowCursorGrab( GHOST_TGrabCursorMode mode ){ return GHOST_kSuccess; }
+	GHOST_TSuccess setWindowCursorShape( GHOST_TStandardCursor shape ){ return GHOST_kSuccess; }
+	GHOST_TSuccess setWindowCustomCursorShape( GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], int hotX, int hotY ) { return GHOST_kSuccess; }
+	GHOST_TSuccess setWindowCustomCursorShape( GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, int sizex, int sizey, int hotX, int hotY, int fg_color, int bg_color ){ return GHOST_kSuccess; }
+
+	bool getValid( ) const { return true; }
+	void setTitle( const STR_String& title ){ /* nothing */ }
+	void getTitle( STR_String& title ) const { title= "untitled"; }
+	void getWindowBounds( GHOST_Rect& bounds ) const { getClientBounds(bounds); }
+	void getClientBounds( GHOST_Rect& bounds ) const { /* nothing */ }
+	GHOST_TSuccess setClientWidth( GHOST_TUns32 width ){ return GHOST_kFailure; }
+	GHOST_TSuccess setClientHeight( GHOST_TUns32 height ){ return GHOST_kFailure;  }
+	GHOST_TSuccess setClientSize( GHOST_TUns32 width, GHOST_TUns32 height ){ return GHOST_kFailure;  }
+	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( ){ return GHOST_kFailure; }
+	GHOST_TSuccess activateDrawingContext( ){ return GHOST_kFailure; }
+	~GHOST_WindowNULL( ){ /* nothing */ }
+	GHOST_TSuccess setWindowCursorVisibility( bool visible ){ return GHOST_kSuccess; }
+	GHOST_TSuccess setState(GHOST_TWindowState state)  { return GHOST_kSuccess; }
+	GHOST_TWindowState getState() const	{ return GHOST_kWindowStateNormal; }
+	GHOST_TSuccess invalidate()  { return GHOST_kSuccess; }
+	GHOST_TSuccess setOrder(GHOST_TWindowOrder order) { return GHOST_kSuccess; }
+
+
+private :
+	GHOST_SystemNULL * m_system;
+};
+
+
+#endif // _GHOST_WINDOWNULL_H_
diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt
index 4a534d94eb8..b3fe29af570 100644
--- a/intern/guardedalloc/CMakeLists.txt
+++ b/intern/guardedalloc/CMakeLists.txt
@@ -24,7 +24,13 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-set(INC .)
+set(INC
+	.
+)
+
+set(INC_SYS
+
+)
 
 set(SRC
 	./intern/mallocn.c
@@ -41,12 +47,12 @@ if(WIN32 AND NOT UNIX)
 	)
 endif()
 
-blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}")
+blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}")
 
 # Override C++ alloc, optional.
 if(WITH_CXX_GUARDEDALLOC)
 	set(SRC
 		cpp/mallocn.cpp
 	)
-	blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}")
+	blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}" "${INC_SYS}")
 endif()
diff --git a/intern/iksolver/CMakeLists.txt b/intern/iksolver/CMakeLists.txt
index 46be310b7ec..5a7c0978599 100644
--- a/intern/iksolver/CMakeLists.txt
+++ b/intern/iksolver/CMakeLists.txt
@@ -30,6 +30,10 @@ set(INC
 	../moto/include
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/IK_QJacobian.cpp
 	intern/IK_QJacobianSolver.cpp
@@ -70,4 +74,4 @@ set(SRC
 	intern/TNT/version.h
 )
 
-blender_add_lib(bf_intern_ik "${SRC}" "${INC}")
+blender_add_lib(bf_intern_ik "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt
index a0489c48144..26b61f5c6ce 100644
--- a/intern/itasc/CMakeLists.txt
+++ b/intern/itasc/CMakeLists.txt
@@ -28,6 +28,10 @@ set(INC
 	../../extern/Eigen2
 )
 
+set(INC_SYS
+	
+)
+
 set(SRC
 	Armature.cpp
 	Cache.cpp
@@ -222,4 +226,4 @@ set(SRC
 	../../extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h
 )
 
-blender_add_lib(bf_intern_itasc "${SRC}" "${INC}")
+blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/memutil/CMakeLists.txt b/intern/memutil/CMakeLists.txt
index aecd3d5b6c9..54e43cb7236 100644
--- a/intern/memutil/CMakeLists.txt
+++ b/intern/memutil/CMakeLists.txt
@@ -29,6 +29,10 @@ set(INC
 	..
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/MEM_CacheLimiterC-Api.cpp
 	intern/MEM_RefCountedC-Api.cpp
@@ -43,4 +47,4 @@ set(SRC
 	MEM_SmartPtr.h
 )
 
-blender_add_lib(bf_intern_memutil "${SRC}" "${INC}")
+blender_add_lib(bf_intern_memutil "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/mikktspace/CMakeLists.txt b/intern/mikktspace/CMakeLists.txt
index f84a499206c..b6552b18e37 100644
--- a/intern/mikktspace/CMakeLists.txt
+++ b/intern/mikktspace/CMakeLists.txt
@@ -28,11 +28,15 @@ set(INC
 	.
 )
 
+set(INC_SYS
+	
+)
+
 set(SRC
 	mikktspace.c
 
 	mikktspace.h
 )
 
-blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}")
+blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}" "${INC_SYS}")
 
diff --git a/intern/moto/CMakeLists.txt b/intern/moto/CMakeLists.txt
index b9fd8986268..1e73f960907 100644
--- a/intern/moto/CMakeLists.txt
+++ b/intern/moto/CMakeLists.txt
@@ -28,6 +28,10 @@ set(INC
 	include
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/MT_Assert.cpp
 	intern/MT_CmMatrix4x4.cpp
@@ -67,4 +71,4 @@ set(SRC
 	include/NM_Scalar.h
 )
 
-blender_add_lib(bf_intern_moto "${SRC}" "${INC}")
+blender_add_lib(bf_intern_moto "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/opennl/CMakeLists.txt b/intern/opennl/CMakeLists.txt
index 699d2dec795..55b0bc5855f 100644
--- a/intern/opennl/CMakeLists.txt
+++ b/intern/opennl/CMakeLists.txt
@@ -36,6 +36,10 @@ set(INC
 	superlu
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/opennl.c
 	superlu/colamd.c
@@ -79,4 +83,4 @@ set(SRC
 	superlu/util.h
 )
 
-blender_add_lib(bf_intern_opennl "${SRC}" "${INC}")
+blender_add_lib(bf_intern_opennl "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt
index 486ef92f638..c787f54b284 100644
--- a/intern/smoke/CMakeLists.txt
+++ b/intern/smoke/CMakeLists.txt
@@ -28,6 +28,9 @@ set(INC
 	intern
 	../memutil
 	../../extern/bullet2/src
+)
+
+set(INC_SYS
 	${PNG_INCLUDE_DIR}
 	${ZLIB_INCLUDE_DIRS}
 )
@@ -89,5 +92,5 @@ if(WITH_FFTW3)
 	list(APPEND INC ${FFTW3_INC})
 endif()
 
-blender_add_lib(bf_intern_smoke "${SRC}" "${INC}")
+blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}")
 
diff --git a/intern/string/CMakeLists.txt b/intern/string/CMakeLists.txt
index 60796185e70..28bd198d29f 100644
--- a/intern/string/CMakeLists.txt
+++ b/intern/string/CMakeLists.txt
@@ -28,6 +28,10 @@ set(INC
 	.
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/STR_String.cpp
 
@@ -35,4 +39,4 @@ set(SRC
 	STR_String.h
 )
 
-blender_add_lib(bf_intern_string "${SRC}" "${INC}")
+blender_add_lib(bf_intern_string "${SRC}" "${INC}" "${INC_SYS}")