fix for github actions osx builds

capnramses · Mar 14, 2024 · 5fc8d57 · 5fc8d57
1 parent b8134fa
commit 5fc8d57
Show file tree

Hide file tree

Showing 34 changed files with 34 additions and 34 deletions.
diff --git a/04_mats_and_vecs/Makefile.osx b/04_mats_and_vecs/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = matsvecs
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/05_virtual_camera/Makefile.osx b/05_virtual_camera/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = vcam
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/06_vcam_with_quaternion/Makefile.osx b/06_vcam_with_quaternion/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = quats
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/08_phong/Makefile.osx b/08_phong/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = phong
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/09_texture_mapping/Makefile.osx b/09_texture_mapping/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = texmap
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/10_screen_capture/Makefile.osx b/10_screen_capture/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = scrcap
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/11_video_capture/Makefile.osx b/11_video_capture/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = vidcap
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/12_debugging_shaders/Makefile.osx b/12_debugging_shaders/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = debugshdrs
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/13_mesh_import/Makefile.osx b/13_mesh_import/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = meshimp
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw -lassimp
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/14_multi_tex/Makefile.osx b/14_multi_tex/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = multitex
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/15_phongtextures/Makefile.osx b/15_phongtextures/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = phongtex
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw -lassimp
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/16_frag_reject/Makefile.osx b/16_frag_reject/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = fragrej
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/17_alpha_blending/Makefile.osx b/17_alpha_blending/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = alphablend
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/18_spotlights/Makefile.osx b/18_spotlights/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = spotlights
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/19_fog/Makefile.osx b/19_fog/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = fog
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw -lassimp
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/20_normal_mapping/Makefile.osx b/20_normal_mapping/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = nmap
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw -lassimp
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/21_cube_mapping/Makefile.osx b/21_cube_mapping/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = cubemap
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw -lassimp
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/22_geom_shaders/Makefile.osx b/22_geom_shaders/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = geomsh
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/23_tessellation_shaders/Makefile.osx b/23_tessellation_shaders/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = tess
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/24_gui_panels/Makefile.osx b/24_gui_panels/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = overlays
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/25_sprite_sheets/Makefile.osx b/25_sprite_sheets/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = sprites
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/26_bitmap_fonts/Makefile.osx b/26_bitmap_fonts/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = fonts
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/27_font_atlas/Makefile.osx b/27_font_atlas/Makefile.osx
@@ -1,5 +1,5 @@
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/28_uniform_buffer_object/Makefile.osx b/28_uniform_buffer_object/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = cubemap
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw -lassimp
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/29_particle_systems/Makefile.osx b/29_particle_systems/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = particles
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/30_skinning_part_one/Makefile.osx b/30_skinning_part_one/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = skin
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw -lassimp
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/31_skinning_part_two/Makefile.osx b/31_skinning_part_two/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = skin
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw -lassimp
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/32_skinning_part_three/Makefile.osx b/32_skinning_part_three/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = skin
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw -lassimp
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/34_framebuffer_switch/Makefile.osx b/34_framebuffer_switch/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = fbuffer
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/35_image_kernel/Makefile.osx b/35_image_kernel/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = kernel
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/36_colour_picking/Makefile.osx b/36_colour_picking/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = pick
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/37_deferred_shading/Makefile.osx b/37_deferred_shading/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = deferred
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/38_texture_shadows/Makefile.osx b/38_texture_shadows/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = shads
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit

diff --git a/39_texture_mapping_srgb/Makefile.osx b/39_texture_mapping_srgb/Makefile.osx
@@ -1,6 +1,6 @@
 BIN = texmap
 CC = clang++
-FLAGS = -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage
+FLAGS = -DAPPLE -Wall -pedantic
 INC = -I/sw/include -I/usr/local/include
 LIBS = -lGLEW -lglfw
 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit