Revert "GL: Use SDL2 GL headers on all platforms."

This reverts commit 06fc4b3.

ezQuake.vcxproj

@@ -218,31 +218,31 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='dbg-all|Win32'">
-    <IncludePath>$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
     <LinkIncremental>false</LinkIncremental>
     <PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
     <IntDir>.vs\$(Platform)\$(Configuration)\</IntDir>
     <OutDir>$(SolutionDir).vs\$(Platform)\$(Configuration)\Output\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='dbg-classic|Win32'">
-    <IncludePath>$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
     <LinkIncremental>false</LinkIncremental>
     <PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
     <OutDir>$(SolutionDir).vs\$(Platform)\$(Configuration)\Output\</OutDir>
     <IntDir>.vs\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='dbg-modern|Win32'">
-    <IncludePath>$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
     <LinkIncremental>false</LinkIncremental>
     <PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
     <OutDir>$(SolutionDir).vs\$(Platform)\$(Configuration)\Output\</OutDir>
     <IntDir>.vs\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='dbg-vulkan|Win32'">
-    <IncludePath>$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
     <LinkIncremental>false</LinkIncremental>
     <PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
@@ -251,67 +251,67 @@
     <IntDir>.vs\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='dbg-all|x64'">
-    <IncludePath>$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
     <PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
     <IntDir>.vs\$(Platform)\$(Configuration)\</IntDir>
     <OutDir>$(SolutionDir).vs\$(Platform)\$(Configuration)\Output\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='dbg-classic|x64'">
-    <IncludePath>$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
     <PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
     <IntDir>.vs\$(Platform)\$(Configuration)\</IntDir>
     <OutDir>$(SolutionDir).vs\$(Platform)\$(Configuration)\Output\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='dbg-modern|x64'">
-    <IncludePath>$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
     <PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
     <IntDir>.vs\$(Platform)\$(Configuration)\</IntDir>
     <OutDir>$(SolutionDir).vs\$(Platform)\$(Configuration)\Output\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='dbg-vulkan|x64'">
-    <IncludePath>$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
     <PreBuildEventUseInBuild>true</PreBuildEventUseInBuild>
     <IntDir>.vs\$(Platform)\$(Configuration)\</IntDir>
     <OutDir>$(SolutionDir).vs\$(Platform)\$(Configuration)\Output\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='rls-all|x64'">
-    <IncludePath>$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
     <IntDir>.vs\$(Platform)\$(Configuration)\</IntDir>
     <OutDir>$(SolutionDir).vs\$(Platform)\$(Configuration)\Output\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='rls-modern|x64'">
-    <IncludePath>$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
     <IntDir>.vs\$(Platform)\$(Configuration)\</IntDir>
     <OutDir>$(SolutionDir).vs\$(Platform)\$(Configuration)\Output\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='rls-classic|x64'">
-    <IncludePath>$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
     <IntDir>.vs\$(Platform)\$(Configuration)\</IntDir>
     <OutDir>$(SolutionDir).vs\$(Platform)\$(Configuration)\Output\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='rls-all|Win32'">
-    <IncludePath>$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir).vs\$(Platform)\$(Configuration)\Output\</OutDir>
     <IntDir>.vs\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='rls-modern|Win32'">
-    <IncludePath>$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir).vs\$(Platform)\$(Configuration)\Output\</OutDir>
     <IntDir>.vs\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='rls-classic|Win32'">
-    <IncludePath>$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\src\vstudio-libs\include;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\SDL2;$(SolutionDir)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\minizip;$(SolutionDir)\src\qwprot\src;$(IncludePath)</IncludePath>
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir).vs\$(Platform)\$(Configuration)\Output\</OutDir>

src/gl_local.h

@@ -20,13 +20,43 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef __GL_LOCAL_H__
 #define __GL_LOCAL_H__
 
-#include <SDL_opengl.h>
-#include <SDL_opengl_glext.h>
+#ifdef __APPLE__
+
+#include <OpenGL/gl.h>
+#ifdef GL_GLEXT_VERSION
+#undef GL_GLEXT_VERSION
+#endif
+#ifdef GL_DRAW_FRAMEBUFFER_BINDING
+#undef GL_DRAW_FRAMEBUFFER_BINDING
+#endif
+#include "opengl/glext.h"  // Should be <OpenGL/glext.h> but appears broken on newer macOS
+
+#else // __APPLE__
+
+#include <GL/gl.h>
+
+#ifdef __GNUC__
+#include <GL/glext.h>
+#endif // __GNUC__
+
+#ifdef _MSC_VER
+#include <glext.h>
+#endif
+
+#ifndef _WIN32
+#include <GL/glx.h>
+#endif // _WIN32
+#endif // __APPLE__
 
 #include "gl_model.h"
 #include "r_framestats.h"
 #include "r_trace.h"
 #include "r_local.h"
+//#include "gl_texture.h"
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
 
 void R_TimeRefresh_f (void);
 texture_t *R_TextureAnimation(entity_t* ent, texture_t *base);