Update bootstrapping, CI files for macOS

vegastrike · Jan 10, 2025 · c13e0c1 · c13e0c1
1 parent f0042c5
commit c13e0c1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml
@@ -21,23 +21,26 @@ jobs:
       fail-fast: false
       matrix:
         os:
+          # x86-64
           - macos-13
-          # - macos-14
+          # M1 processor
+          #- macos-14
         python-version:
-          # - 3.12.8
+          #- 3.12.8
           - 3.13.1
         compiler:
           - AppleClang
-          - clang
-          - gcc
+          #- clang
+          #- gcc
         homebrew-gl:
           - true
-          # - false
+          #- false
         homebrew-al:
           - true
-          # - false
+          #- false
         ENABLE_PIE:
           - 'ON'
+          #- 'OFF'
 
     steps:
 

diff --git a/.github/workflows/macos-release.yml b/.github/workflows/macos-release.yml
@@ -22,23 +22,26 @@ jobs:
       fail-fast: false
       matrix:
         os:
+          # x86-64
           - macos-13
-          # - macos-14
+          # M1 processor
+          #- macos-14
         python-version:
-          # - 3.12.8
+          #- 3.12.8
           - 3.13.1
         compiler:
           - AppleClang
-          # - clang
-          # - gcc
+          #- clang
+          #- gcc
         homebrew-gl:
           - true
-          # - false
+          #- false
         homebrew-al:
           - true
-          # - false
+          #- false
         ENABLE_PIE:
           - 'ON'
+          #- 'OFF'
 
     steps:
 

diff --git a/script/bootstrap-on-macOS-using-MacPorts.sh b/script/bootstrap-on-macOS-using-MacPorts.sh
@@ -6,7 +6,7 @@
 #
 # sudo ./script/bootstrap-on-macOS-using-MacPorts.sh
 #
-# Copyright (C) 2024 Stephen G. Tuggy, David Wales,
+# Copyright (C) 2024-2025 Stephen G. Tuggy, David Wales,
 # and other Vega Strike contributors
 #
 # This file is part of Vega Strike.
@@ -26,8 +26,12 @@
 
 set -e
 
-port install python312 [email protected].0_10+cmake_scripts+no_single+no_static+python312 glib2 gtk3 gtkglext libsdl2 libGLU freeglut xorg-server openal-soft cmake expat libjpeg-turbo libpng libvorbis ninja
+port install python312 [email protected].0_12+cmake_scripts+no_single+no_static+python312 glib2 +quartz libepoxy +quartz gtk3 +quartz libsdl2 libGLU freeglut openal-soft cmake expat libjpeg-turbo libpng libvorbis ninja
 
 export CMAKE_PREFIX_PATH="/opt/local/"
 
 echo "CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH"
+
+# Keep these lines! Otherwise you will likely get PFNGL... not found errors.
+ln -s "$CMAKE_PREFIX_PATH/include/GL" "$CMAKE_PREFIX_PATH/include/OpenGL"
+ln -s "$CMAKE_PREFIX_PATH/include/GL" "$CMAKE_PREFIX_PATH/include/GLUT"
diff --git a/script/bootstrap-on-macos.sh b/script/bootstrap-on-macos.sh
@@ -53,6 +53,10 @@ do
     export CMAKE_PREFIX_PATH="$PACKAGE_INSTALLED_PREFIX:$CMAKE_PREFIX_PATH"
 done
 
+# Keep these lines! Otherwise you will likely get PFNGL... not found errors.
+ln -s "$(brew --prefix)/include/GL" "$(brew --prefix)/include/OpenGL"
+ln -s "$(brew --prefix)/include/GL" "$(brew --prefix)/include/GLUT"
+
 OPENALDIR="$(brew --prefix openal-soft)"
 export OPENALDIR