Fix on XP

diff --git a/src/OpenGL ES 2.0/libEGL/Surface.cpp b/src/OpenGL ES 2.0/libEGL/Surface.cpp
index d31ed14..24bd01c 100644 (file)
--- a/src/OpenGL ES 2.0/libEGL/Surface.cpp
+++ b/src/OpenGL ES 2.0/libEGL/Surface.cpp
@@ -28,6 +28,22 @@
 namespace egl
 {
 
+namespace
+{
+const int versionWindowsVista = MAKEWORD(0x00, 0x06);
+const int versionWindows7 = MAKEWORD(0x01, 0x06);
+
+// Return the version of the operating system in a format suitable for ordering
+// comparison.
+int getComparableOSVersion()
+{
+    DWORD version = GetVersion();
+    int majorVersion = LOBYTE(LOWORD(version));
+    int minorVersion = HIBYTE(LOWORD(version));
+    return MAKEWORD(minorVersion, majorVersion);
+}
+}
+
 Surface::Surface(Display *display, const Config *config, HWND window) 
     : mDisplay(display), mConfig(config), mWindow(window)
 {
@@ -85,7 +101,7 @@ bool Surface::initialize()
     // Modify present parameters for this window, if we are composited,
     // to minimize the amount of queuing done by DWM between our calls to
     // present and the actual screen.
-    if(mWindow && (LOWORD(GetVersion()) >= 0x60))
+    if (mWindow && (getComparableOSVersion() >= versionWindowsVista))
        {
         BOOL isComposited;
         HRESULT result = DwmIsCompositionEnabled(&isComposited);

diff --git a/src/OpenGL ES 2.0/libGLESv2/libGLESv2.vcxproj b/src/OpenGL ES 2.0/libGLESv2/libGLESv2.vcxproj
index 5391f71..0bec623 100644 (file)
--- a/src/OpenGL ES 2.0/libGLESv2/libGLESv2.vcxproj
+++ b/src/OpenGL ES 2.0/libGLESv2/libGLESv2.vcxproj
@@ -88,6 +88,7 @@
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
       <TargetMachine>MachineX86</TargetMachine>\r
+      <AdditionalLibraryDirectories>C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\Lib\x86</AdditionalLibraryDirectories>\r
     </Link>\r
     <PostBuildEvent>\r
       <Command>mkdir "$(ProjectDir)..\..\lib\$(Configuration)\"\r
@@ -126,6 +127,7 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
       <TargetMachine>MachineX86</TargetMachine>\r
+      <AdditionalLibraryDirectories>C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\Lib\x86</AdditionalLibraryDirectories>\r
     </Link>\r
     <PostBuildEvent>\r
       <Command>mkdir "$(ProjectDir)..\..\lib\$(Configuration)\"\r