...

vegastrike · Apr 27, 2024 · 55d740d · 55d740d
1 parent 9f7a430
commit 55d740d
Show file tree

Hide file tree

Showing 11 changed files with 1,007 additions and 44 deletions.
diff --git a/engine/CMakePresets.json b/engine/CMakePresets.json
@@ -213,7 +213,7 @@
         "VERBOSE": "ON"
       },
       "cacheVariables": {
-        "CMAKE_FIND_FRAMEWORK": "FIRST"
+        "CMAKE_FIND_FRAMEWORK": "LAST"
       }
     },
     {

diff --git a/engine/objconv/basemaker/base_maker.cpp b/engine/objconv/basemaker/base_maker.cpp
@@ -44,16 +44,18 @@
 #include <direct.h>
 #else
 #include <unistd.h>
+#   define GL_GLEXT_PROTOTYPES 1
 #endif
 #include <sys/stat.h> //for mkdir
 #include <sys/types.h>
 
 #if defined(__APPLE__) && defined(__MACH__)
-    #include <GLUT/glut.h>
-    #include <OpenGL/glext.h>
+#   include <OpenGL/gl.h>
+#   include <GL/glext.h>
+#   include <GLUT/glut.h>
 #else
-    #include <GL/glut.h>
-    #include <GL/glext.h>
+#   include <GL/glut.h>
+#   include <GL/glext.h>
 #endif
 
 /*

diff --git a/engine/objconv/basemaker/sprite.h b/engine/objconv/basemaker/sprite.h
@@ -30,12 +30,17 @@
 #include "gfx/hud.h"
 #include "vs_globals.h"
 
+#if !defined(_WIN32)
+#   define GL_GLEXT_PROTOTYPES 1
+#endif
+
 #if defined(__APPLE__) && defined(__MACH__)
-    #include <GLUT/glut.h>
-    #include <OpenGL/glext.h>
+#   include <OpenGL/gl.h>
+#   include <GL/glext.h>
+#   include <GLUT/glut.h>
 #else
-    #include <GL/glut.h>
-    #include <GL/glext.h>
+#   include <GL/glut.h>
+#   include <GL/glext.h>
 #endif
 
 #include <iostream>

diff --git a/engine/src/OpenGL_downloaded/GL/wgl.h b/engine/src/OpenGL_downloaded/GL/wgl.h
diff --git a/engine/src/gldrv/gl_globals.h b/engine/src/gldrv/gl_globals.h
@@ -91,10 +91,10 @@ struct GFXStats
 #define GL_EXT_color_subtable 1
 #endif
 
-#ifndef _WIN32
-#define GL_GLEXT_PROTOTYPES 1
-
+#if !defined (_WIN32)
+#   define GL_GLEXT_PROTOTYPES 1
 #endif
+
 #if defined (_WIN32) || defined (__CYGWIN__)
 #ifndef NOMINMAX
 #define NOMINMAX
@@ -105,6 +105,8 @@ struct GFXStats
 #if defined(__APPLE__) && defined(__MACH__)
 // Try hard-coding this now -- stephengtuggy 2024-04-26
 #define OSX_AT_LEAST_10_4
+#define GL_GLEXT_FUNCTION_POINTERS 1
+#include <OpenGL/gl.h>
 #include <GL/glext.h>
 #include <GLUT/glut.h>
 

diff --git a/engine/src/gldrv/gl_init.cpp b/engine/src/gldrv/gl_init.cpp
@@ -41,6 +41,7 @@
 #if !defined (_WIN32) && !defined (__CYGWIN__)
 
 #include <stdlib.h>
+#define GL_GLEXT_PROTOTYPES 1
 
 #else
 #ifndef NOMINMAX
@@ -53,14 +54,14 @@
 // #endif
 #include <windows.h>
 #endif
-#define GL_GLEXT_PROTOTYPES 1
 #if defined(__APPLE__) && defined(__MACH__)
-    #include <OpenGL/gl.h>
-    #include <OpenGL/glext.h>
-    #include <dlfcn.h>
+#   define GL_GLEXT_FUNCTION_POINTERS 1
+#   include <OpenGL/gl.h>
+#   include <GL/glext.h>
+#   include <dlfcn.h>
 #else
-    #include <GL/gl.h>
-    #include <GL/glext.h>
+#   include <GL/gl.h>
+#   include <GL/glext.h>
 #endif
 #ifdef GL_EXT_compiled_vertex_array
 # ifndef PFNGLLOCKARRAYSEXTPROC

diff --git a/engine/src/gldrv/gl_init.h b/engine/src/gldrv/gl_init.h
@@ -54,6 +54,10 @@ extern "C"
 /* Shouldn't need to include glext.h if gl.h is recent, but alas we can't
  * count on that...  */
 
+#if !defined(_WIN32)
+#define GL_GLEXT_PROTOTYPES 1
+#endif
+
 #if defined (IRIX)
 #include <GL/gl.h>
 #include <GL/glut.h>
@@ -62,12 +66,13 @@ typedef void (*PFNGLUNLOCKARRAYSEXTPROC)( void );
 
 #elif !defined (_WIN32)
 #if defined(__APPLE__) && defined(__MACH__)
-    #include <GLUT/glut.h>
-    #include <OpenGL/gl.h>
-    #include <OpenGL/glext.h>
+#   define GL_GLEXT_FUNCTION_POINTERS 1
+#   include <OpenGL/gl.h>
+#   include <GL/glext.h>
+#   include <GLUT/glut.h>
 #else
-    #include <GL/glut.h>
-    #include <GL/glext.h>
+#   include <GL/glut.h>
+#   include <GL/glext.h>
 #endif
 
 //#if !defined (GL_GLEXT_VERSION) || GL_GLEXT_VERSION < 6

diff --git a/engine/src/gui/button.h b/engine/src/gui/button.h
@@ -30,8 +30,13 @@
  * The only external functions it requires that aren't provided by system libs are in glut_support.h
  */
 
+#if !defined(_WIN32)
+#define GL_GLEXT_PROTOTYPES 1
+#endif
+
 #if defined(__APPLE__) && defined(__MACH__)
     #include <OpenGL/gl.h>
+    #include <GL/glext.h>
     #include <GLUT/glut.h>
 #else
 #ifdef _WIN32

diff --git a/engine/src/gui/text_area.h b/engine/src/gui/text_area.h
@@ -37,8 +37,13 @@
 //There are places where a float is converted to an int. This define takes extra steps to convert without a warning (float -> char -> int)
 #define NO_WARNINGS
 
+#if !defined(_WIN32)
+#   define GL_GLEXT_PROTOTYPES 1
+#endif
+
 #if defined(__APPLE__) && defined(__MACH__)
     #include <OpenGL/gl.h>
+    #include <GL/glext.h>
     #include <GLUT/glut.h>
 #else
 #ifdef _WIN32

diff --git a/engine/src/precompiled.h b/engine/src/precompiled.h
@@ -43,6 +43,7 @@
 
 #if !defined (_WIN32) && !defined (__CYGWIN__)
     #include <stdlib.h>
+    #define GL_GLEXT_PROTOTYPES 1
 #else //!defined (_WIN32) && !defined (__CYGWIN__)
     #ifndef NOMINMAX
         //tells VCC not to generate min/max macros
@@ -51,13 +52,9 @@
     #include <windows.h>
 #endif //!defined (_WIN32) && !defined (__CYGWIN__)
 
-#define GL_GLEXT_PROTOTYPES 1
-
 #if defined(__APPLE__) && defined(__MACH__)
-    #include <OpenGL/gl.h>
-    #include <OpenGL/glext.h>
-#else //defined (__APPLE__) || defined (MACOSX)
-    #include <GL/gl.h>
-    #include <GL/glext.h>
-#endif //defined (__APPLE__) || defined (MACOSX)
-
+#   include <OpenGL/gl.h>
+#else
+#   include <GL/gl.h>
+#endif
+#include <GL/glext.h>
diff --git a/engine/src/vegastrike.h b/engine/src/vegastrike.h
@@ -52,6 +52,10 @@ extern float AUDIO_ATOM;
 #include <stdarg.h>
 #include "debug_vs.h"
 
+#if !defined(_WIN32)
+#   define GL_GLEXT_PROTOTYPES 1
+#endif
+
 #if defined (WIN32) || defined (__CYGWIN__)
 /* Note that this will define WIN32 for us, if it isn't defined already
  */
@@ -68,18 +72,19 @@ extern float AUDIO_ATOM;
 //#include "command.h"
 #endif //defined (WIN32) || defined (__CYGWIN__)
 
-#ifndef NO_GFX
-    #if defined(__APPLE__) && defined(__MACH__)
-        #include <OpenGL/gl.h>
-//        #include <epoxy/glx.h>
-        #include <GLUT/glut.h>
-    #else //defined (__APPLE__) || defined (MACOSX)
-        #define __glext_h_
-        #include <GL/gl.h>
-        #include <GL/glu.h>
-        #include <GL/glut.h>
-        #undef __glext_h_
-    #endif //defined (__APPLE__) || defined (MACOSX)
+#if !defined (NO_GFX)
+#   if defined(__APPLE__) && defined(__MACH__)
+#       define GL_GLEXT_FUNCTION_POINTERS 1
+#       include <OpenGL/gl.h>
+#       include <GL/glext.h>
+#       include <GLUT/glut.h>
+#   else //defined(__APPLE__) && defined(__MACH__)
+#       define __glext_h_
+#       include <GL/gl.h>
+#       include <GL/glu.h>
+#       include <GL/glut.h>
+#       undef __glext_h_
+#   endif //defined(__APPLE__) && defined(__MACH__)
 #endif //NO_GFX
 
 #define PROG_NAME "vegastrike"