diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8643d06f0..c4e76ab91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,6 +126,9 @@ ELSE()
     SET(OSG_WINDOWING_SYSTEM "X11" CACHE STRING "Windowing system type for graphics window creation; options: X11 or None.")
 ENDIF()
 
+IF(OSG_WINDOWING_SYSTEM STREQUAL "None")
+    SET(OSG_WINDOWING_SYSTEM_NONE ON INTERNAL "No windowing system")
+ENDIF()
 
 SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
 
diff --git a/include/osgViewer/GraphicsWindow b/include/osgViewer/GraphicsWindow
index c2eb6aacb..bc57f27d7 100644
--- a/include/osgViewer/GraphicsWindow
+++ b/include/osgViewer/GraphicsWindow
@@ -283,7 +283,9 @@ struct GraphicsWindowFunctionProxy
     extern "C" void graphicswindow_##ext(void); \
     static osgViewer::GraphicsWindowFunctionProxy graphicswindowproxy_##ext(graphicswindow_##ext);
 
-#if defined(_WIN32)
+#if defined(OSG_WINDOWING_SYSTEM_NONE)
+    #define USE_GRAPHICS_WINDOW()
+#elif defined(_WIN32)
     #define USE_GRAPHICSWINDOW()  USE_GRAPICSWINDOW_IMPLEMENTATION(Win32)
 #elif defined(__APPLE__)
   #if defined(OSG_WINDOWING_SYSTEM_CARBON)
diff --git a/src/osg/Config.in b/src/osg/Config.in
index 342069a08..cfb5f8a77 100644
--- a/src/osg/Config.in
+++ b/src/osg/Config.in
@@ -37,5 +37,6 @@
 #cmakedefine OSG_USE_DEPRECATED_API
 #cmakedefine OSG_ENVVAR_SUPPORTED
 #cmakedefine OSG_WINDOWING_SYSTEM_CARBON
+#cmakedefine OSG_WINDOWING_SYSTEM_NONE
 
 #endif