Merge v1-9 into v1-10

OgreMain/CMakeLists.txt

@@ -93,12 +93,10 @@ elseif (WIN32)
       src/WIN32/OgreFileSystemLayer.cpp
       src/WIN32/OgreTimer.cpp
       src/WIN32/resource.h
-      src/WIN32/winres.h
     )  
     set(RESOURCE_FILES
       src/WIN32/resource.h
       src/WIN32/OgreWin32Resources.rc
-      src/WIN32/winres.h
     )
     source_group(Resources FILES ${RESOURCE_FILES})
     set(PLATFORM_HEADER_INSTALL "WIN32")

OgreMain/src/WIN32/OgreWin32Resources.rc

@@ -7,7 +7,12 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "winres.h"
+#include <winresrc.h>
+
+#ifdef IDC_OGRE_ICON
+#undef IDC_OGRE_ICON
+#endif
+#define IDC_OGRE_ICON      (-1)
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -62,7 +67,7 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""winres.h""\r\n"
+    "#include <winresrc.h>\r\n"
     "\0"
 END
 
@@ -87,7 +92,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "&OK",IDOK,205,253,60,14
     PUSHBUTTON      "&Cancel",IDCANCEL,267,253,60,14
-    LTEXT           "Rendering Subsystem:",IDC_STATIC,21,136,73,12
+    LTEXT           "Rendering Subsystem:",IDC_OGRE_ICON,21,136,73,12
     COMBOBOX        IDC_CBO_RENDERSYSTEM,95,134,219,57,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Rendering System Options",IDC_OPTFRAME,5,152,322,101
@@ -96,7 +101,7 @@ BEGIN
     RTEXT           "[Click On An Option]:",IDC_LBL_OPTION,14,237,125,11
     COMBOBOX        IDC_CBO_OPTION,143,235,180,94,CBS_DROPDOWNLIST | 
                     WS_DISABLED | WS_VSCROLL | WS_TABSTOP
-    CONTROL         106,IDC_STATIC,"Static",SS_BITMAP,0,0,327,140
+    CONTROL         106,IDC_OGRE_ICON,"Static",SS_BITMAP,0,0,327,140
 END
 
 IDD_DLG_ERROR DIALOG  0, 0, 243, 178
@@ -106,12 +111,12 @@ FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "&Close",IDOK,81,157,80,14
     LTEXT           "The Ogre engine has encountered an error from which it cannot recover. The last message was:",
-                    IDC_STATIC,7,7,229,19
+                    IDC_OGRE_ICON,7,7,229,19
     LTEXT           "",IDC_ERRMSG,17,29,209,84,SS_SUNKEN
     LTEXT           "If you cannot resolve this issue yourself, please report it through the web site at http://www.ogre3d.org.",
-                    IDC_STATIC,7,118,229,19
+                    IDC_OGRE_ICON,7,118,229,19
     LTEXT           "If you report the error, please include details of your hardware setup, and attach a copy of the 'ogre.log' file which you will find in the local folder.",
-                    IDC_STATIC,7,138,229,17
+                    IDC_OGRE_ICON,7,138,229,17
 END
 
 

RenderSystems/GL/src/StateCacheManager/OgreGLNullStateCacheManagerImp.cpp

@@ -65,9 +65,9 @@ namespace Ogre {
 
         glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
 
-        glBindFramebuffer(GL_FRAMEBUFFER, 0);
+        glBindFramebufferEXT(GL_FRAMEBUFFER, 0);
 
-        glBindRenderbuffer(GL_RENDERBUFFER, 0);
+        glBindRenderbufferEXT(GL_RENDERBUFFER, 0);
 
         glActiveTexture(GL_TEXTURE0);
 
@@ -146,11 +146,11 @@ namespace Ogre {
         // Update GL
         if(target == GL_FRAMEBUFFER)
         {
-            glBindFramebuffer(target, buffer);
+            glBindFramebufferEXT(target, buffer);
         }
         else if(target == GL_RENDERBUFFER)
         {
-            glBindRenderbuffer(target, buffer);
+            glBindRenderbufferEXT(target, buffer);
         }
         else
         {