Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph

include/osgViewer/api/Win32/GraphicsHandleWin32

@@ -14,7 +14,7 @@
 #ifndef OSGVIEWER_GRAPHICSHANDLEWIN32
 #define OSGVIEWER_GRAPHICSHANDLEWIN32 1
 
-#include "Win32GWUtils"
+#include <osgViewer/api/Win32/Win32GWUtils>
 #include <osgViewer/Export>
 
 namespace osgViewer

src/osgViewer/CMakeLists.txt

@@ -79,20 +79,19 @@ IF(WIN32 AND NOT ANDROID)
         ${HEADER_PATH}/api/Win32/GraphicsHandleWin32
         ${HEADER_PATH}/api/Win32/GraphicsWindowWin32
         ${HEADER_PATH}/api/Win32/PixelBufferWin32
+        ${HEADER_PATH}/api/Win32/Win32GWUtils
     )
     IF(OSG_USE_EGL)
         SET(LIB_COMMON_FILES ${LIB_COMMON_FILES}
             GraphicsWindowWin32.cpp
             PixelBufferWin32EGL.cpp
 			Win32GWUtils.cpp
-			Win32GWUtils
         )
     ELSE()
         SET(LIB_COMMON_FILES ${LIB_COMMON_FILES}
             GraphicsWindowWin32.cpp
             PixelBufferWin32.cpp
 			Win32GWUtils.cpp
-			Win32GWUtils
         )
     ENDIF()
 ELSE()

src/osgViewer/GraphicsWindowWin32.cpp

@@ -28,8 +28,8 @@
 #include <vector>
 #include <map>
 
-#include "Win32GWUtils"
+#include <osgViewer/api/Win32/Win32GWUtils>
-#include "windowsx.h"
+#include <windowsx.h>
 
 #define MOUSEEVENTF_FROMTOUCH           0xFF515700
 

src/osgViewer/PixelBufferWin32.cpp

@@ -15,7 +15,7 @@
  */
 
 #if !defined(OSG_USE_EGL)
-#include "Win32GWUtils"
+#include <osgViewer/api/Win32/Win32GWUtils>
 #include <osgViewer/api/Win32/PixelBufferWin32>
 #include <osgViewer/api/Win32/GraphicsWindowWin32>
 #include <osg/TextureRectangle>

src/osgViewer/Win32GWUtils.cpp

@@ -1,6 +1,6 @@
 #include <osg/GLExtensions>
 
-#include "Win32GWUtils"
+#include <osgViewer/api/Win32/Win32GWUtils>
 #include <vector>
 #include <sstream>