Enabled build with Win8.1 SDK

Replaced OPENGL_SUPPORTED macro with GL_SUPPORTED and GLES_SUPPORTED

8 files changed, 33 insertions, 33 deletions

diff --git a/unityplugin/UnityEmulator/CMakeLists.txt b/unityplugin/UnityEmulator/CMakeLists.txt
index f66db7f..3e1d940 100644
--- a/unityplugin/UnityEmulator/CMakeLists.txt
+++ b/unityplugin/UnityEmulator/CMakeLists.txt
@@ -43,15 +43,15 @@ if(GL_SUPPORTED)
     list(APPEND INCLUDE src/UnityGraphicsGLCore_Impl.h)

 endif()

 

-if(GLES_SUPPORTED)
+if(GLES_SUPPORTED)

     if(PLATFORM_ANDROID)

         list(APPEND SOURCE src/Android/UnityGraphicsGLESAndroid_Impl.cpp)

-        list(APPEND INCLUDE src/Android/UnityGraphicsGLESAndroid_Impl.h)
-    elseif(PLATFORM_IOS)
+        list(APPEND INCLUDE src/Android/UnityGraphicsGLESAndroid_Impl.h)

+    elseif(PLATFORM_IOS)

         list(APPEND SOURCE src/IOS/UnityGraphicsGLES_IOS_Impl.mm)

-        list(APPEND INCLUDE src/IOS/UnityGraphicsGLES_IOS_Impl.h)
-    else()
-        message(FATAL_ERROR Unknown platform)
+        list(APPEND INCLUDE src/IOS/UnityGraphicsGLES_IOS_Impl.h)

+    else()

+        message(FATAL_ERROR Unknown platform)

     endif()

 endif()

 

@@ -105,12 +105,12 @@ elseif(PLATFORM_MACOS)
     )

 

 elseif(PLATFORM_IOS)

-    list(APPEND SOURCE
-        src/IOS/UnityAppIOS.cpp
-        src/UnityAppBase.cpp
-    )
-    list(APPEND INCLUDE
-         include/UnityAppBase.h
+    list(APPEND SOURCE

+        src/IOS/UnityAppIOS.cpp

+        src/UnityAppBase.cpp

+    )

+    list(APPEND INCLUDE

+         include/UnityAppBase.h

     )

 else()

     message(FATAL_ERROR "Unknown platform")

@@ -170,13 +170,13 @@ elseif(PLATFORM_MACOS)
         src/MacOS

     )

 endif()

-
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    # Disable the following clang warning
-    #    '<function name>' hides overloaded virtual function
-    # as hiding is intended
-    target_compile_options(UnityEmulator PRIVATE -Wno-overloaded-virtual)
-endif()
+

+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")

+    # Disable the following clang warning

+    #    '<function name>' hides overloaded virtual function

+    # as hiding is intended

+    target_compile_options(UnityEmulator PRIVATE -Wno-overloaded-virtual)

+endif()

 

 source_group("src" FILES ${SOURCE})

 source_group("include" FILES ${INCLUDE})

diff --git a/unityplugin/UnityEmulator/include/DiligentGraphicsAdapterGL.h b/unityplugin/UnityEmulator/include/DiligentGraphicsAdapterGL.h
index 835015d..a16d5f0 100644
--- a/unityplugin/UnityEmulator/include/DiligentGraphicsAdapterGL.h
+++ b/unityplugin/UnityEmulator/include/DiligentGraphicsAdapterGL.h
@@ -24,7 +24,7 @@
 
 #include "PlatformDefinitions.h"
 
-#if OPENGL_SUPPORTED
+#if GL_SUPPORTED || GLES_SUPPORTED
 
 #include "DiligentGraphicsAdapter.h"
 
@@ -43,4 +43,4 @@ private:
     const UnityGraphicsGLCoreES_Emulator& m_UnityGraphicsGL;
 };
 
-#endif // OPENGL_SUPPORTED
\ No newline at end of file
+#endif // GL_SUPPORTED || GLES_SUPPORTED
\ No newline at end of file
diff --git a/unityplugin/UnityEmulator/include/UnityGraphicsGLCoreES_Emulator.h b/unityplugin/UnityEmulator/include/UnityGraphicsGLCoreES_Emulator.h
index 4b14a73..53f372d 100644
--- a/unityplugin/UnityEmulator/include/UnityGraphicsGLCoreES_Emulator.h
+++ b/unityplugin/UnityEmulator/include/UnityGraphicsGLCoreES_Emulator.h
@@ -2,7 +2,7 @@
 
 #include "PlatformDefinitions.h"
 
-#if OPENGL_SUPPORTED
+#if GL_SUPPORTED || GLES_SUPPORTED
 
 #include <memory>
 #include "UnityGraphicsEmulator.h"
@@ -47,4 +47,4 @@ private:
     static std::unique_ptr<UnityGraphicsGL_Impl> m_GraphicsImpl;
 };
 
-#endif // OPENGL_SUPPORTED
+#endif // GL_SUPPORTED || GLES_SUPPORTED
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
index 3779bca..1d7ac11 100644
--- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
+++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
@@ -1,6 +1,6 @@
 #include "DiligentGraphicsAdapterGL.h"
 
-#if OPENGL_SUPPORTED
+#if GL_SUPPORTED || GLES_SUPPORTED
 
 #include "UnityGraphicsGLCoreES_Emulator.h"
 #include "RenderDeviceFactoryOpenGL.h"
@@ -112,4 +112,4 @@ bool DiligentGraphicsAdapterGL::UsesReverseZ()
     return m_UnityGraphicsGL.UsesReverseZ(); 
 }
 
-#endif // OPENGL_SUPPORTED
+#endif // GL_SUPPORTED || GLES_SUPPORTED
diff --git a/unityplugin/UnityEmulator/src/UnityAppBase.cpp b/unityplugin/UnityEmulator/src/UnityAppBase.cpp
index 14a8cfc..5a037fb 100644
--- a/unityplugin/UnityEmulator/src/UnityAppBase.cpp
+++ b/unityplugin/UnityEmulator/src/UnityAppBase.cpp
@@ -34,7 +34,7 @@
 #   include "DiligentGraphicsAdapterD3D12.h"
 #endif
 
-#if OPENGL_SUPPORTED
+#if GL_SUPPORTED || GLES_SUPPORTED
 #   include "UnityGraphicsGLCoreES_Emulator.h"
 #   include "DiligentGraphicsAdapterGL.h"
 #endif
@@ -147,7 +147,7 @@ void UnityAppBase::InitGraphics(
         break;
 #endif
 
-#if OPENGL_SUPPORTED
+#if GL_SUPPORTED || GLES_SUPPORTED
         case DeviceType::OpenGL:
         case DeviceType::OpenGLES:
         {
diff --git a/unityplugin/UnityEmulator/src/UnityGraphicsGLCoreES_Emulator.cpp b/unityplugin/UnityEmulator/src/UnityGraphicsGLCoreES_Emulator.cpp
index 19744b0..2c8e052 100644
--- a/unityplugin/UnityEmulator/src/UnityGraphicsGLCoreES_Emulator.cpp
+++ b/unityplugin/UnityEmulator/src/UnityGraphicsGLCoreES_Emulator.cpp
@@ -2,7 +2,7 @@
 
 #include "UnityGraphicsGLCoreES_Emulator.h"
 
-#if OPENGL_SUPPORTED
+#if GL_SUPPORTED || GLES_SUPPORTED
 
 #include "DebugUtilities.h"
 #include "Errors.h"
@@ -102,4 +102,4 @@ void UnityGraphicsGLCoreES_Emulator::EndFrame()
 {
 }
 
-#endif // OPENGL_SUPPORTED
+#endif // GL_SUPPORTED || GLES_SUPPORTED
diff --git a/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.cpp b/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.cpp
index 03b84ba..4342ec9 100644
--- a/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.cpp
+++ b/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.cpp
@@ -1,7 +1,7 @@
 
 #include "UnityGraphicsGLCore_Impl.h"
 
-#if OPENGL_SUPPORTED
+#if GL_SUPPORTED
 
 #include <iostream>
 #include "DebugUtilities.h"
@@ -251,4 +251,4 @@ void UnityGraphicsGLCore_Impl::SwapBuffers()
 #endif
 }
 
-#endif // OPENGL_SUPPORTED
+#endif // GL_SUPPORTED
diff --git a/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.h b/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.h
index f6d42ea..97c47b6 100644
--- a/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.h
+++ b/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.h
@@ -2,7 +2,7 @@
 
 #include "PlatformDefinitions.h"
 
-#if OPENGL_SUPPORTED
+#if GL_SUPPORTED
 
 #if PLATFORM_WIN32
 
@@ -110,4 +110,4 @@ private:
     NativeGLContextType m_Context;
 };
 
-#endif //OPENGL_SUPPORTED
+#endif // GL_SUPPORTED