19 files: Implement vegastrike#851 (comment)

stephengtuggy · May 5, 2024 · 1338ed9 · 1338ed9
1 parent 9552c18
commit 1338ed9
Show file tree

Hide file tree

Showing 19 changed files with 48 additions and 56 deletions.
diff --git a/engine/objconv/basemaker/base_maker.cpp b/engine/objconv/basemaker/base_maker.cpp
@@ -48,13 +48,9 @@
 #include <sys/stat.h> //for mkdir
 #include <sys/types.h>
 
-#if defined(__APPLE__) && defined(__MACH__)
-#   include <glut.h>
-#   include <glext.h>
-#else
-#   include <glut.h>
-#   include <glext.h>
-#endif
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
+#include <glut.h>
+#include <glext.h>
 
 /*
  * Globals

diff --git a/engine/objconv/basemaker/sprite.h b/engine/objconv/basemaker/sprite.h
@@ -30,13 +30,9 @@
 #include "gfx/hud.h"
 #include "vs_globals.h"
 
-#if defined(__APPLE__) && defined(__MACH__)
-#   include <glut.h>
-#   include <glext.h>
-#else
-#   include <glut.h>
-#   include <glext.h>
-#endif
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
+#include <glut.h>
+#include <glext.h>
 
 #include <iostream>
 //#include <stdlib>

diff --git a/engine/objconv/varray.cpp b/engine/objconv/varray.cpp
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * varray.cpp
+ *
+ * Copyright (C) 2001-2024 Daniel Horn, pyramid3d, Stephen G. Tuggy,
  * and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
@@ -21,10 +23,12 @@
  */
 
 #include <stdlib.h>
-#include <GL/glut.h>
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
+#include <glut.h>
 #include <vector>
 #undef GL_ARB_vertex_buffer_object
-#include <GL/glext.h>
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
+#include <glext.h>
 #include <stdio.h>
 PFNGLBINDBUFFERARBPROC glBindBufferARB_p = 0;
 PFNGLGENBUFFERSARBPROC glGenBuffersARB_p = 0;

diff --git a/engine/src/cg_global.h b/engine/src/cg_global.h
@@ -37,10 +37,11 @@
 
 #if defined (UNIX)
 
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
 #define GLX_GLXEXT_PROTOTYPES 1
-#include <GL/glx.h>
+#include <glx.h>
 #include "gldrv/glx_undefined_extensions.h"
-#include <GL/glxext.h>
+#include <glxext.h>
 
 #endif //defined (UNIX)
 

diff --git a/engine/src/cmd/ai/flykeyboard.h b/engine/src/cmd/ai/flykeyboard.h
@@ -25,11 +25,8 @@
 #define VEGA_STRIKE_ENGINE_CMD_AI_FLY_KEYBOARD_H
 
 #include "in.h"
-#if defined(__APPLE__) && defined(__MACH__)
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
 #include <glut.h>
-#else
-#include <glut.h>
-#endif
 #include "flybywire.h"
 
 class FlyByKeyboard : public FlyByWire {

diff --git a/engine/src/gfx/screenshot.cpp b/engine/src/gfx/screenshot.cpp
@@ -29,11 +29,8 @@
 #include "vs_globals.h"
 #include "xml_support.h"
 #include "vsimage.h"
-#ifndef __APPLE__
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
 #include <glut.h>
-#else
-#include <glut.h>
-#endif
 
 using namespace VSFileSystem;
 

diff --git a/engine/src/gfx/star.cpp b/engine/src/gfx/star.cpp
@@ -36,6 +36,7 @@
 #include "universe.h"
 #include "vs_logging.h"
 
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
 #if defined(__APPLE__) && defined(__MACH__)
 #   include <gl.h>
 #elif defined (_WIN32) || defined (__CYGWIN__)

diff --git a/engine/src/gfx/vsimage.cpp b/engine/src/gfx/vsimage.cpp
@@ -25,13 +25,9 @@
 
 #include "vsimage.h"
 
-#if defined(__APPLE__) && defined(__MACH__)
-#   include <GLUT/glut.h>
-#   include <OpenGL/glext.h>
-#else
-#   include <GL/glut.h>
-#   include <GL/glext.h>
-#endif
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
+#include <glut.h>
+#include <glext.h>
 
 #include "cmd/unit_generic.h"
 

diff --git a/engine/src/gldrv/gl_globals.h b/engine/src/gldrv/gl_globals.h
@@ -95,6 +95,7 @@ struct GFXStats
 //#define GL_GLEXT_PROTOTYPES
 #endif
 
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
 #if defined (_WIN32) || defined (__CYGWIN__)
 #ifndef NOMINMAX
 #define NOMINMAX
@@ -103,6 +104,7 @@ struct GFXStats
 #include <gl.h>
 #endif
 
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
 #if defined(__APPLE__) && defined(__MACH__)
 #include <glut.h>
 //#if defined( GL_INIT_CPP) || defined( GL_MISC_CPP) || defined( GL_STATE_CPP)

diff --git a/engine/src/gldrv/gl_include.h b/engine/src/gldrv/gl_include.h
@@ -25,10 +25,7 @@
 #ifndef VEGA_STRIKE_ENGINE_GLDRV_GL_INCLUDE_H
 #define VEGA_STRIKE_ENGINE_GLDRV_GL_INCLUDE_H
 
-#if defined(__APPLE__) && defined(__MACH__)
-#   include <glut.h>
-#else
-#   include <glut.h>
-#endif
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
+#include <glut.h>
 
 #endif //VEGA_STRIKE_ENGINE_GLDRV_GL_INCLUDE_H
diff --git a/engine/src/gldrv/gl_init.cpp b/engine/src/gldrv/gl_init.cpp
@@ -54,6 +54,7 @@
 #include <windows.h>
 #endif
 #define GL_GLEXT_PROTOTYPES 1
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
 #if defined(__APPLE__) && defined(__MACH__)
 #   include <gl.h>
 #   include <glext.h>

diff --git a/engine/src/gldrv/gl_init.h b/engine/src/gldrv/gl_init.h
@@ -55,19 +55,16 @@ extern "C"
  * count on that...  */
 
 #if defined (IRIX)
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
 #include <gl.h>
 #include <glut.h>
 typedef void (*PFNGLLOCKARRAYSEXTPROC)( GLint first, GLsizei count );
 typedef void (*PFNGLUNLOCKARRAYSEXTPROC)( void );
 
 #elif !defined (_WIN32)
-#if defined(__APPLE__) && defined(__MACH__)
-#   include <glut.h>
-#   include <glext.h>
-#else
-#   include <glut.h>
-#   include <glext.h>
-#endif
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
+#include <glut.h>
+#include <glext.h>
 
 #if !defined (GL_GLEXT_VERSION) || GL_GLEXT_VERSION < 6
 #   error "*** You need a more recent copy of glext.h.  You can get one at http: //oss.sgi.com/projects/ogl-sample/ABI/glext.h ; it goes in /usr/include/GL. ***"

diff --git a/engine/src/gldrv/gl_matrix_hack.cpp b/engine/src/gldrv/gl_matrix_hack.cpp
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, Alan Shieh, pyramid3d,
+ * gl_matrix_hack.cpp
+ *
+ * Copyright (C) 2001-2024 Daniel Horn, Alan Shieh, pyramid3d,
  * Stephen G. Tuggy, and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
@@ -13,7 +15,7 @@
  *
  * Vega Strike is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -43,7 +45,8 @@
 #include "vsfilesystem.h"
 #include "vs_logging.h"
 
-//#include <GL/glu.h>
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
+//#include <glu.h>
 
 inline void Zero(float matrix[]) {
     matrix[0] = 0;

diff --git a/engine/src/gldrv/gl_pick.cpp b/engine/src/gldrv/gl_pick.cpp
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * gl_pick.cpp
+ *
+ * Copyright (C) 2001-2024 Daniel Horn, pyramid3d, Stephen G. Tuggy,
  * and other Vega Strike contributors.
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
@@ -23,7 +25,8 @@
 /* GL selection buffer code
  */
 
-//#include <GL/gl.h>
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
+//#include <gl.h>
 #include "gl_globals.h"
 #include "gfxlib.h"
 #include "gl_matrix.h"

diff --git a/engine/src/gldrv/winsys.cpp b/engine/src/gldrv/winsys.cpp
@@ -25,6 +25,7 @@
 
 #include <SDL2/SDL.h>
 
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
 #if defined(__APPLE__) && defined(__MACH__)
 #   include <gl.h>
 #elif defined (_WIN32) || defined (__CYGWIN__)

diff --git a/engine/src/gldrv/winsys.h b/engine/src/gldrv/winsys.h
@@ -35,11 +35,8 @@
 #if defined( SDL_WINDOWING ) && defined (HAVE_SDL)
 #   include "SDL2/SDL.h"
 #elif defined( HAVE_GLUT )
-#if defined(__APPLE__) && defined(__MACH__)
-    #include <glut.h>
-#else
-    #include <glut.h>
-#endif
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
+#   include <glut.h>
 #else
 #   error "Neither SDL nor GLUT are present."
 #endif

diff --git a/engine/src/gui/button.h b/engine/src/gui/button.h
@@ -30,6 +30,7 @@
  * The only external functions it requires that aren't provided by system libs are in glut_support.h
  */
 
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
 #if defined(__APPLE__) && defined(__MACH__)
     #include <gl.h>
     #include <glut.h>

diff --git a/engine/src/gui/text_area.h b/engine/src/gui/text_area.h
@@ -37,6 +37,7 @@
 //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
 
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
 #if defined(__APPLE__) && defined(__MACH__)
     #include <gl.h>
     #include <glut.h>

diff --git a/engine/src/vegastrike.h b/engine/src/vegastrike.h
@@ -68,6 +68,7 @@ extern float AUDIO_ATOM;
 //#include "command.h"
 #endif //defined (WIN32) || defined (__CYGWIN__)
 
+// See https://github.com/vegastrike/Vega-Strike-Engine-Source/pull/851#discussion_r1589254766
 #ifndef NO_GFX
 #   if defined(__APPLE__) && defined(__MACH__)
 #       include <gl.h>