Updated a bunch of files

stephengtuggy · Apr 23, 2024 · 1e7ce8b · 1e7ce8b
1 parent c73ae6c
commit 1e7ce8b
Show file tree

Hide file tree

Showing 42 changed files with 324 additions and 240 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+!defined__APPLE__ && defined__MACH__v!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__r!defined__APPLE__ && defined__MACH__s!defined__APPLE__ && defined__MACH__i!defined__APPLE__ && defined__MACH__o!defined__APPLE__ && defined__MACH__n!defined__APPLE__ && defined__MACH__:!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__2!defined__APPLE__ && defined__MACH__
+!defined__APPLE__ && defined__MACH__u!defined__APPLE__ && defined__MACH__p!defined__APPLE__ && defined__MACH__d!defined__APPLE__ && defined__MACH__a!defined__APPLE__ && defined__MACH__t!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__s!defined__APPLE__ && defined__MACH__:!defined__APPLE__ && defined__MACH__
+!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__-!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__p!defined__APPLE__ && defined__MACH__a!defined__APPLE__ && defined__MACH__c!defined__APPLE__ && defined__MACH__k!defined__APPLE__ && defined__MACH__a!defined__APPLE__ && defined__MACH__g!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__-!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__c!defined__APPLE__ && defined__MACH__o!defined__APPLE__ && defined__MACH__s!defined__APPLE__ && defined__MACH__y!defined__APPLE__ && defined__MACH__s!defined__APPLE__ && defined__MACH__t!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__m!defined__APPLE__ && defined__MACH__:!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__"!defined__APPLE__ && defined__MACH__g!defined__APPLE__ && defined__MACH__i!defined__APPLE__ && defined__MACH__t!defined__APPLE__ && defined__MACH__h!defined__APPLE__ && defined__MACH__u!defined__APPLE__ && defined__MACH__b!defined__APPLE__ && defined__MACH__-!defined__APPLE__ && defined__MACH__a!defined__APPLE__ && defined__MACH__c!defined__APPLE__ && defined__MACH__t!defined__APPLE__ && defined__MACH__i!defined__APPLE__ && defined__MACH__o!defined__APPLE__ && defined__MACH__n!defined__APPLE__ && defined__MACH__s!defined__APPLE__ && defined__MACH__"!defined__APPLE__ && defined__MACH__
+!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__d!defined__APPLE__ && defined__MACH__i!defined__APPLE__ && defined__MACH__r!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__c!defined__APPLE__ && defined__MACH__t!defined__APPLE__ && defined__MACH__o!defined__APPLE__ && defined__MACH__r!defined__APPLE__ && defined__MACH__y!defined__APPLE__ && defined__MACH__:!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__"!defined__APPLE__ && defined__MACH__/!defined__APPLE__ && defined__MACH__"!defined__APPLE__ && defined__MACH__
+!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__s!defined__APPLE__ && defined__MACH__c!defined__APPLE__ && defined__MACH__h!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__d!defined__APPLE__ && defined__MACH__u!defined__APPLE__ && defined__MACH__l!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__:!defined__APPLE__ && defined__MACH__
+!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__#!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__C!defined__APPLE__ && defined__MACH__h!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__c!defined__APPLE__ && defined__MACH__k!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__f!defined__APPLE__ && defined__MACH__o!defined__APPLE__ && defined__MACH__r!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__u!defined__APPLE__ && defined__MACH__p!defined__APPLE__ && defined__MACH__d!defined__APPLE__ && defined__MACH__a!defined__APPLE__ && defined__MACH__t!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__s!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__t!defined__APPLE__ && defined__MACH__o!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__G!defined__APPLE__ && defined__MACH__i!defined__APPLE__ && defined__MACH__t!defined__APPLE__ && defined__MACH__H!defined__APPLE__ && defined__MACH__u!defined__APPLE__ && defined__MACH__b!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__A!defined__APPLE__ && defined__MACH__c!defined__APPLE__ && defined__MACH__t!defined__APPLE__ && defined__MACH__i!defined__APPLE__ && defined__MACH__o!defined__APPLE__ && defined__MACH__n!defined__APPLE__ && defined__MACH__s!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__v!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__r!defined__APPLE__ && defined__MACH__y!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__w!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__k!defined__APPLE__ && defined__MACH__
+!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__i!defined__APPLE__ && defined__MACH__n!defined__APPLE__ && defined__MACH__t!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__r!defined__APPLE__ && defined__MACH__v!defined__APPLE__ && defined__MACH__a!defined__APPLE__ && defined__MACH__l!defined__APPLE__ && defined__MACH__:!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__"!defined__APPLE__ && defined__MACH__w!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__k!defined__APPLE__ && defined__MACH__l!defined__APPLE__ && defined__MACH__y!defined__APPLE__ && defined__MACH__"!defined__APPLE__ && defined__MACH__
+!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__a!defined__APPLE__ && defined__MACH__l!defined__APPLE__ && defined__MACH__l!defined__APPLE__ && defined__MACH__o!defined__APPLE__ && defined__MACH__w!defined__APPLE__ && defined__MACH__:!defined__APPLE__ && defined__MACH__
+!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__#!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__A!defined__APPLE__ && defined__MACH__l!defined__APPLE__ && defined__MACH__l!defined__APPLE__ && defined__MACH__o!defined__APPLE__ && defined__MACH__w!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__b!defined__APPLE__ && defined__MACH__o!defined__APPLE__ && defined__MACH__t!defined__APPLE__ && defined__MACH__h!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__d!defined__APPLE__ && defined__MACH__i!defined__APPLE__ && defined__MACH__r!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__c!defined__APPLE__ && defined__MACH__t!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__a!defined__APPLE__ && defined__MACH__n!defined__APPLE__ && defined__MACH__d!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__i!defined__APPLE__ && defined__MACH__n!defined__APPLE__ && defined__MACH__d!defined__APPLE__ && defined__MACH__i!defined__APPLE__ && defined__MACH__r!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__c!defined__APPLE__ && defined__MACH__t!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__u!defined__APPLE__ && defined__MACH__p!defined__APPLE__ && defined__MACH__d!defined__APPLE__ && defined__MACH__a!defined__APPLE__ && defined__MACH__t!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__s!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__f!defined__APPLE__ && defined__MACH__o!defined__APPLE__ && defined__MACH__r!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__a!defined__APPLE__ && defined__MACH__l!defined__APPLE__ && defined__MACH__l!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__p!defined__APPLE__ && defined__MACH__a!defined__APPLE__ && defined__MACH__c!defined__APPLE__ && defined__MACH__k!defined__APPLE__ && defined__MACH__a!defined__APPLE__ && defined__MACH__g!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__s!defined__APPLE__ && defined__MACH__
+!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__-!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__d!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__p!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__n!defined__APPLE__ && defined__MACH__d!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__n!defined__APPLE__ && defined__MACH__c!defined__APPLE__ && defined__MACH__y!defined__APPLE__ && defined__MACH__-!defined__APPLE__ && defined__MACH__t!defined__APPLE__ && defined__MACH__y!defined__APPLE__ && defined__MACH__p!defined__APPLE__ && defined__MACH__e!defined__APPLE__ && defined__MACH__:!defined__APPLE__ && defined__MACH__ !defined__APPLE__ && defined__MACH__"!defined__APPLE__ && defined__MACH__a!defined__APPLE__ && defined__MACH__l!defined__APPLE__ && defined__MACH__l!defined__APPLE__ && defined__MACH__"!defined__APPLE__ && defined__MACH__
+!defined__APPLE__ && defined__MACH__
diff --git a/.github/workflows/Windows-Release.yml b/.github/workflows/Windows-Release.yml
@@ -111,7 +111,7 @@ jobs:
           GTEST_COLOR: 1
         run: .\script\test.ps1 -Generator ${{ matrix.cmake-generator }} -EnablePIE ${{ matrix.enable-pie }} -BuildType ${{ matrix.build-type }}
 
-      - name: Upload artifacts 
+      - name: Upload artifacts
         uses: skx/github-action-publish-binaries@44887b225ceca96efd8a912d39c09ad70312af31 # master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/engine/launcher/general.cpp b/engine/launcher/general.cpp
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, David Ranger, pyramid3d,
+ * general.cpp
+ *
+ * Copyright (C) 2001-2024 Daniel Horn, David Ranger, 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
@@ -24,7 +26,7 @@
  * This allows it to be used with other programs with minimal changes */
 
 #include "general.h"
-#if defined(__APPLE__) || defined(MACOSX)
+#if defined(__APPLE__) && defined(__MACH__)
 #include <sys/param.h> // For MAXPATHLEN
 #endif
 #ifdef __MINGW32__
@@ -492,7 +494,7 @@ int isdir(const char *file) {
 glob_t *FindPath(char *path, int type) {
     glob_t *FILES = new glob_t;
     string mypath(path);
-#if defined(__APPLE__) || defined(MACOSX)
+#if defined(__APPLE__) && defined(__MACH__)
     char thispath[MAXPATHLEN];
 #else
     char thispath[800000];
@@ -504,7 +506,7 @@ glob_t *FindPath(char *path, int type) {
     dirent *entry;
     unsigned int cur;
     char *newpath = 0;
-#if defined(__APPLE__) || defined(MACOSX)
+#if defined(__APPLE__) && defined(__MACH__)
     getcwd(thispath, MAXPATHLEN);
 #else
     getcwd(thispath, 790000);

diff --git a/engine/objconv/asteroidgen.cpp b/engine/objconv/asteroidgen.cpp
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * asteroidgen.cpp
+ *
+ * Copyright (C) 2001-2024 Daniel Horn, 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
@@ -30,7 +32,7 @@
 #define M_PI 3.14159265358979323846264338328
 #endif
 #include <float.h>
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__MACH__)
 #define sqrtf sqrt
 #define cosf cos
 #define sinf sin

diff --git a/engine/objconv/basemaker/base_maker.cpp b/engine/objconv/basemaker/base_maker.cpp
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * base_maker.cpp
+ *
+ * Copyright (C) 2001-2024 Daniel Horn, 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
@@ -46,7 +48,7 @@
 #include <sys/stat.h> //for mkdir
 #include <sys/types.h>
 
-#if defined (__APPLE__) || defined (MACOSX)
+#if defined(__APPLE__) && defined(__MACH__)
     #include <GLUT/glut.h>
     #include <OpenGL/glext.h>
 #else

diff --git a/engine/objconv/basemaker/base_maker_texture.cpp b/engine/objconv/basemaker/base_maker_texture.cpp
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * base_maker_texture.cpp
+ *
+ * Copyright (C) 2001-2024 Daniel Horn, 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
@@ -325,7 +327,7 @@ void Texture::loadTexture(FILE *file, TextureTransform tt) {
         handle = (unsigned int) -1;
         return;
     }
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__MACH__)
     glGenTextures( 1, (GLuint*) &handle );
 #else
     glGenTextures(1, &handle);

diff --git a/engine/objconv/basemaker/sprite.h b/engine/objconv/basemaker/sprite.h
@@ -1,6 +1,8 @@
 /*
- * Copyright (C) 2001-2023 Daniel Horn, pyramid3d, Stephen G. Tuggy, Benjamen R. Meyer,
- * and other Vega Strike contributors.
+ * sprite.h
+ *
+ * Copyright (C) 2001-2024 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * Benjamen R. Meyer, 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
@@ -28,7 +30,7 @@
 #include "gfx/hud.h"
 #include "vs_globals.h"
 
-#if defined (__APPLE__) || defined (MACOSX)
+#if defined(__APPLE__) && defined(__MACH__)
     #include <GLUT/glut.h>
     #include <OpenGL/glext.h>
 #else

diff --git a/engine/objconv/trisort.cpp b/engine/objconv/trisort.cpp
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2001-2022 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * trisort.cpp
+ *
+ * Copyright (C) 2001-2024 Daniel Horn, 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
@@ -29,7 +31,7 @@
 #include <math.h>
 #include "trisort.h"
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__MACH__)
 #define sqrtf sqrt
 #endif
 

diff --git a/engine/src/aldrv/al_globals.cpp b/engine/src/aldrv/al_globals.cpp
@@ -1,10 +1,8 @@
-/**
+/*
  * al_globals.cpp
  *
- * Copyright (C) Daniel Horn
- * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike
- * contributors
- * Copyright (C) 2022 Stephen G. Tuggy
+ * Copyright (C) 2001-2024 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * and other Vega Strike contributors
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
  *
@@ -17,11 +15,11 @@
  *
  * 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
- * along with Vega Strike.  If not, see <https://www.gnu.org/licenses/>.
+ * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
  */
 
 

diff --git a/engine/src/aldrv/al_globals.h b/engine/src/aldrv/al_globals.h
@@ -1,10 +1,8 @@
-/**
+/*
  * al_globals.h
  *
- * Copyright (C) Daniel Horn
- * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike
- * contributors
- * Copyright (C) 2023 Stephen G. Tuggy, Benjamen R. Meyer
+ * Copyright (C) 2001-2024 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * Benjamen R. Meyer, and other Vega Strike contributors
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
  *
@@ -17,11 +15,11 @@
  *
  * 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
- * along with Vega Strike.  If not, see <https://www.gnu.org/licenses/>.
+ * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
  */
 #ifndef VEGA_STRIKE_ENGINE_AL_GLOBALS_H
 #define VEGA_STRIKE_ENGINE_AL_GLOBALS_H
@@ -33,7 +31,7 @@
 #include <vector>
 
 #ifdef HAVE_AL
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__MACH__)
 #include <al.h>
 #else
 #include <AL/al.h>

diff --git a/engine/src/aldrv/al_init.cpp b/engine/src/aldrv/al_init.cpp
@@ -1,9 +1,8 @@
 /*
  * al_init.cpp
  *
- * Copyright (C) Daniel Horn
- * Copyright (C) 2020 pyramid3d, Stephen G. Tuggy, and other Vega Strike contributors
- * Copyright (C) 2021-2022 Stephen G. Tuggy
+ * Copyright (C) 2001-2024 Daniel Horn, pyramid3d, Stephen G. Tuggy,
+ * Benjamen R. Meyer, and other Vega Strike contributors
  *
  * https://github.com/vegastrike/Vega-Strike-Engine-Source
  *
@@ -16,16 +15,16 @@
  *
  * 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
- * along with Vega Strike.  If not, see <https://www.gnu.org/licenses/>.
+ * along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.
  */
 
 
 #ifdef HAVE_AL
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__MACH__)
 #include <al.h>
 #include <alc.h>
 #define KeyMap AppleKeyMap