From a78927a095a1605ef5c1a67e0f464e1616a4cb9f Mon Sep 17 00:00:00 2001 From: Anton Gerdelan Date: Tue, 20 Aug 2024 09:01:30 +0100 Subject: [PATCH 1/7] pruned 02 makefile --- 02_shaders/Makefile.osx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02_shaders/Makefile.osx b/02_shaders/Makefile.osx index e114515..120939f 100644 --- a/02_shaders/Makefile.osx +++ b/02_shaders/Makefile.osx @@ -1,6 +1,6 @@ BIN = shaders CC = clang -FLAGS = -std=c99 -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage +FLAGS = -std=c99 -DAPPLE -Wall -pedantic INC = -I/sw/include -I/usr/local/include LIBS = -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit From ed0aa6b72878ba87f906f5c5bf0b152060e77ed7 Mon Sep 17 00:00:00 2001 From: Anton Gerdelan Date: Tue, 20 Aug 2024 09:07:11 +0100 Subject: [PATCH 2/7] fix - return bool within main() --- 05_virtual_camera/main.cpp | 2 +- 41_shader_hot_reload/Makefile.osx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/05_virtual_camera/main.cpp b/05_virtual_camera/main.cpp index fdd8917..132e74b 100644 --- a/05_virtual_camera/main.cpp +++ b/05_virtual_camera/main.cpp @@ -100,7 +100,7 @@ int main() { if ( GL_TRUE != params ) { fprintf( stderr, "ERROR: could not link shader programme GL index %i\n", shader_programme ); print_programme_info_log( shader_programme ); - return false; + return 1; } /*--------------------------create camera matrices----------------------------*/ diff --git a/41_shader_hot_reload/Makefile.osx b/41_shader_hot_reload/Makefile.osx index ac9cf02..994ae3c 100644 --- a/41_shader_hot_reload/Makefile.osx +++ b/41_shader_hot_reload/Makefile.osx @@ -1,6 +1,6 @@ BIN = hotreload 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 From 1fd15b6a426a42f984e79a1c8a32906ea208aced Mon Sep 17 00:00:00 2001 From: Anton Gerdelan Date: Tue, 20 Aug 2024 09:07:36 +0100 Subject: [PATCH 3/7] removed arch --- 00_hello_triangle_gl2.1/Makefile.osx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/00_hello_triangle_gl2.1/Makefile.osx b/00_hello_triangle_gl2.1/Makefile.osx index 096787e..9bbf5ae 100644 --- a/00_hello_triangle_gl2.1/Makefile.osx +++ b/00_hello_triangle_gl2.1/Makefile.osx @@ -1,6 +1,6 @@ BIN = hellot CC = clang -FLAGS = -std=c99 -DAPPLE -Wall -pedantic -mmacosx-version-min=10.5 -arch x86_64 -fmessage-length=0 -UGLFW_CDECL -fprofile-arcs -ftest-coverage +FLAGS = -std=c99 -DAPPLE -Wall -pedantic INC = -I/sw/include -I/usr/local/include LIBS = -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit From feb89f7eaa9482985c4d4af98be501d2b0f65941 Mon Sep 17 00:00:00 2001 From: Anton Gerdelan Date: Tue, 20 Aug 2024 13:14:59 +0100 Subject: [PATCH 4/7] attempt to add brew m1 paths --- 00_hello_triangle/Makefile.osx | 4 ++-- 00_hello_triangle_gl2.1/Makefile.osx | 4 ++-- 01_extended_init/Makefile.osx | 4 ++-- 02_shaders/Makefile.osx | 4 ++-- 03_vertex_buffer_objects/Makefile.osx | 4 ++-- 04_mats_and_vecs/Makefile.osx | 4 ++-- 05_virtual_camera/Makefile.osx | 4 ++-- 06_vcam_with_quaternion/Makefile.osx | 4 ++-- 07_ray_picking/Makefile.osx | 4 ++-- 08_phong/Makefile.osx | 4 ++-- 09_texture_mapping/Makefile.osx | 4 ++-- 10_screen_capture/Makefile.osx | 4 ++-- 11_video_capture/Makefile.osx | 4 ++-- 12_debugging_shaders/Makefile.osx | 4 ++-- 13_mesh_import/Makefile.osx | 4 ++-- 14_multi_tex/Makefile.osx | 4 ++-- 15_phongtextures/Makefile.osx | 4 ++-- 16_frag_reject/Makefile.osx | 4 ++-- 17_alpha_blending/Makefile.osx | 4 ++-- 18_spotlights/Makefile.osx | 4 ++-- 19_fog/Makefile.osx | 4 ++-- 20_normal_mapping/Makefile.osx | 4 ++-- 21_cube_mapping/Makefile.osx | 4 ++-- 22_geom_shaders/Makefile.osx | 4 ++-- 23_tessellation_shaders/Makefile.osx | 4 ++-- 24_gui_panels/Makefile.osx | 4 ++-- 25_sprite_sheets/Makefile.osx | 4 ++-- 26_bitmap_fonts/Makefile.osx | 4 ++-- 27_font_atlas/Makefile.osx | 4 ++-- 28_uniform_buffer_object/Makefile.osx | 4 ++-- 29_particle_systems/Makefile.osx | 4 ++-- 30_skinning_part_one/Makefile.osx | 4 ++-- 31_skinning_part_two/Makefile.osx | 4 ++-- 32_skinning_part_three/Makefile.osx | 4 ++-- 34_framebuffer_switch/Makefile.osx | 4 ++-- 35_image_kernel/Makefile.osx | 4 ++-- 36_colour_picking/Makefile.osx | 4 ++-- 37_deferred_shading/Makefile.osx | 4 ++-- 38_texture_shadows/Makefile.osx | 4 ++-- 39_texture_mapping_srgb/Makefile.osx | 4 ++-- 41_shader_hot_reload/Makefile.osx | 4 ++-- 41 files changed, 82 insertions(+), 82 deletions(-) diff --git a/00_hello_triangle/Makefile.osx b/00_hello_triangle/Makefile.osx index cfb9504..cdd16ac 100644 --- a/00_hello_triangle/Makefile.osx +++ b/00_hello_triangle/Makefile.osx @@ -1,8 +1,8 @@ BIN = hellot CC = clang FLAGS = -std=c99 -DAPPLE -Wall -pedantic -Wextra -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.c diff --git a/00_hello_triangle_gl2.1/Makefile.osx b/00_hello_triangle_gl2.1/Makefile.osx index 9bbf5ae..3311520 100644 --- a/00_hello_triangle_gl2.1/Makefile.osx +++ b/00_hello_triangle_gl2.1/Makefile.osx @@ -1,8 +1,8 @@ BIN = hellot CC = clang FLAGS = -std=c99 -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.c diff --git a/01_extended_init/Makefile.osx b/01_extended_init/Makefile.osx index b493f51..d600e6d 100644 --- a/01_extended_init/Makefile.osx +++ b/01_extended_init/Makefile.osx @@ -1,8 +1,8 @@ BIN = extinit CC = clang FLAGS = -std=c99 -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.c diff --git a/02_shaders/Makefile.osx b/02_shaders/Makefile.osx index 120939f..788a481 100644 --- a/02_shaders/Makefile.osx +++ b/02_shaders/Makefile.osx @@ -1,8 +1,8 @@ BIN = shaders CC = clang FLAGS = -std=c99 -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.c gl_utils.c diff --git a/03_vertex_buffer_objects/Makefile.osx b/03_vertex_buffer_objects/Makefile.osx index d1361ab..5d6e9e2 100644 --- a/03_vertex_buffer_objects/Makefile.osx +++ b/03_vertex_buffer_objects/Makefile.osx @@ -1,8 +1,8 @@ BIN = vbuffs CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp gl_utils.cpp diff --git a/04_mats_and_vecs/Makefile.osx b/04_mats_and_vecs/Makefile.osx index 2e13e5b..9328a86 100644 --- a/04_mats_and_vecs/Makefile.osx +++ b/04_mats_and_vecs/Makefile.osx @@ -1,8 +1,8 @@ BIN = matsvecs CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp gl_utils.cpp diff --git a/05_virtual_camera/Makefile.osx b/05_virtual_camera/Makefile.osx index 59345a5..72cfb25 100644 --- a/05_virtual_camera/Makefile.osx +++ b/05_virtual_camera/Makefile.osx @@ -1,8 +1,8 @@ BIN = vcam CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp gl_utils.cpp maths_funcs.cpp diff --git a/06_vcam_with_quaternion/Makefile.osx b/06_vcam_with_quaternion/Makefile.osx index 86b5fac..73a3d06 100644 --- a/06_vcam_with_quaternion/Makefile.osx +++ b/06_vcam_with_quaternion/Makefile.osx @@ -1,8 +1,8 @@ BIN = quats CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp gl_utils.cpp maths_funcs.cpp obj_parser.cpp diff --git a/07_ray_picking/Makefile.osx b/07_ray_picking/Makefile.osx index 83d4d5e..9feed1d 100644 --- a/07_ray_picking/Makefile.osx +++ b/07_ray_picking/Makefile.osx @@ -1,8 +1,8 @@ BIN = raypick CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp gl_utils.cpp maths_funcs.cpp obj_parser.cpp diff --git a/08_phong/Makefile.osx b/08_phong/Makefile.osx index 711f734..92764d4 100644 --- a/08_phong/Makefile.osx +++ b/08_phong/Makefile.osx @@ -1,8 +1,8 @@ BIN = phong CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/09_texture_mapping/Makefile.osx b/09_texture_mapping/Makefile.osx index b1ec5bb..495e13a 100644 --- a/09_texture_mapping/Makefile.osx +++ b/09_texture_mapping/Makefile.osx @@ -1,8 +1,8 @@ BIN = texmap CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/10_screen_capture/Makefile.osx b/10_screen_capture/Makefile.osx index 2f433a1..36c965d 100644 --- a/10_screen_capture/Makefile.osx +++ b/10_screen_capture/Makefile.osx @@ -1,8 +1,8 @@ BIN = scrcap CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/11_video_capture/Makefile.osx b/11_video_capture/Makefile.osx index 25fee1e..f3308b0 100644 --- a/11_video_capture/Makefile.osx +++ b/11_video_capture/Makefile.osx @@ -1,8 +1,8 @@ BIN = vidcap CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/12_debugging_shaders/Makefile.osx b/12_debugging_shaders/Makefile.osx index 019558c..db67b0e 100644 --- a/12_debugging_shaders/Makefile.osx +++ b/12_debugging_shaders/Makefile.osx @@ -1,8 +1,8 @@ BIN = debugshdrs CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp obj_parser.cpp diff --git a/13_mesh_import/Makefile.osx b/13_mesh_import/Makefile.osx index 95b2405..8beef05 100644 --- a/13_mesh_import/Makefile.osx +++ b/13_mesh_import/Makefile.osx @@ -1,8 +1,8 @@ BIN = meshimp CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -std=c++11 -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw -lassimp +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw -lassimp FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/14_multi_tex/Makefile.osx b/14_multi_tex/Makefile.osx index bdbcb44..3f188ef 100644 --- a/14_multi_tex/Makefile.osx +++ b/14_multi_tex/Makefile.osx @@ -1,8 +1,8 @@ BIN = multitex CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/15_phongtextures/Makefile.osx b/15_phongtextures/Makefile.osx index 92776ba..d139145 100644 --- a/15_phongtextures/Makefile.osx +++ b/15_phongtextures/Makefile.osx @@ -1,8 +1,8 @@ BIN = phongtex CC = clang++ -FLAGS = -DAPPLE -Wall -pedantic -std=c++11 +FLAGS = -DAPPLE -Wall -pedantic -std=c++11 -I/opt/homebrew/include INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw -lassimp +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw -lassimp FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/16_frag_reject/Makefile.osx b/16_frag_reject/Makefile.osx index 232610b..bc5a520 100644 --- a/16_frag_reject/Makefile.osx +++ b/16_frag_reject/Makefile.osx @@ -1,8 +1,8 @@ BIN = fragrej CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/17_alpha_blending/Makefile.osx b/17_alpha_blending/Makefile.osx index 9a1e624..1a092fa 100644 --- a/17_alpha_blending/Makefile.osx +++ b/17_alpha_blending/Makefile.osx @@ -1,8 +1,8 @@ BIN = alphablend CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/18_spotlights/Makefile.osx b/18_spotlights/Makefile.osx index 17fa884..5c8a53e 100644 --- a/18_spotlights/Makefile.osx +++ b/18_spotlights/Makefile.osx @@ -1,8 +1,8 @@ BIN = spotlights CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/19_fog/Makefile.osx b/19_fog/Makefile.osx index 982274a..d3ca35b 100644 --- a/19_fog/Makefile.osx +++ b/19_fog/Makefile.osx @@ -1,8 +1,8 @@ BIN = fog CC = clang++ -FLAGS = -DAPPLE -Wall -pedantic -std=c++11 +FLAGS = -DAPPLE -Wall -pedantic -std=c++11 -I/opt/homebrew/include INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw -lassimp +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw -lassimp FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/20_normal_mapping/Makefile.osx b/20_normal_mapping/Makefile.osx index 34e53e2..07b3138 100644 --- a/20_normal_mapping/Makefile.osx +++ b/20_normal_mapping/Makefile.osx @@ -1,8 +1,8 @@ BIN = nmap CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw -lassimp -std=c++11 +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw -lassimp -std=c++11 FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/21_cube_mapping/Makefile.osx b/21_cube_mapping/Makefile.osx index 788e4b4..895f8ea 100644 --- a/21_cube_mapping/Makefile.osx +++ b/21_cube_mapping/Makefile.osx @@ -1,8 +1,8 @@ BIN = cubemap CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -std=c++11 -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw -lassimp +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw -lassimp FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp obj_parser.cpp diff --git a/22_geom_shaders/Makefile.osx b/22_geom_shaders/Makefile.osx index 241cf87..29d6dc0 100644 --- a/22_geom_shaders/Makefile.osx +++ b/22_geom_shaders/Makefile.osx @@ -1,8 +1,8 @@ BIN = geomsh CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp gl_utils.cpp diff --git a/23_tessellation_shaders/Makefile.osx b/23_tessellation_shaders/Makefile.osx index 0048d36..c1c2dfa 100644 --- a/23_tessellation_shaders/Makefile.osx +++ b/23_tessellation_shaders/Makefile.osx @@ -1,8 +1,8 @@ BIN = tess CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp gl_utils.cpp diff --git a/24_gui_panels/Makefile.osx b/24_gui_panels/Makefile.osx index 116043e..37a0398 100644 --- a/24_gui_panels/Makefile.osx +++ b/24_gui_panels/Makefile.osx @@ -1,8 +1,8 @@ BIN = overlays CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp diff --git a/25_sprite_sheets/Makefile.osx b/25_sprite_sheets/Makefile.osx index 200908b..40ddc3a 100644 --- a/25_sprite_sheets/Makefile.osx +++ b/25_sprite_sheets/Makefile.osx @@ -1,8 +1,8 @@ BIN = sprites CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp diff --git a/26_bitmap_fonts/Makefile.osx b/26_bitmap_fonts/Makefile.osx index b0ed7d6..b766040 100644 --- a/26_bitmap_fonts/Makefile.osx +++ b/26_bitmap_fonts/Makefile.osx @@ -1,8 +1,8 @@ BIN = fonts CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp diff --git a/27_font_atlas/Makefile.osx b/27_font_atlas/Makefile.osx index 68a6b51..939f2d4 100644 --- a/27_font_atlas/Makefile.osx +++ b/27_font_atlas/Makefile.osx @@ -1,7 +1,7 @@ CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -I/usr/local/include/freetype2/ -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/usr/local/include/freetype2/ -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp diff --git a/28_uniform_buffer_object/Makefile.osx b/28_uniform_buffer_object/Makefile.osx index 788e4b4..895f8ea 100644 --- a/28_uniform_buffer_object/Makefile.osx +++ b/28_uniform_buffer_object/Makefile.osx @@ -1,8 +1,8 @@ BIN = cubemap CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -std=c++11 -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw -lassimp +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw -lassimp FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp obj_parser.cpp diff --git a/29_particle_systems/Makefile.osx b/29_particle_systems/Makefile.osx index ad74ee1..aedb9f8 100644 --- a/29_particle_systems/Makefile.osx +++ b/29_particle_systems/Makefile.osx @@ -1,8 +1,8 @@ BIN = particles CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/30_skinning_part_one/Makefile.osx b/30_skinning_part_one/Makefile.osx index e7d84b1..cd7fbc2 100644 --- a/30_skinning_part_one/Makefile.osx +++ b/30_skinning_part_one/Makefile.osx @@ -1,8 +1,8 @@ BIN = skin CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -std=c++11 -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw -lassimp +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw -lassimp FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/31_skinning_part_two/Makefile.osx b/31_skinning_part_two/Makefile.osx index e7d84b1..cd7fbc2 100644 --- a/31_skinning_part_two/Makefile.osx +++ b/31_skinning_part_two/Makefile.osx @@ -1,8 +1,8 @@ BIN = skin CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -std=c++11 -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw -lassimp +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw -lassimp FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/32_skinning_part_three/Makefile.osx b/32_skinning_part_three/Makefile.osx index e7d84b1..cd7fbc2 100644 --- a/32_skinning_part_three/Makefile.osx +++ b/32_skinning_part_three/Makefile.osx @@ -1,8 +1,8 @@ BIN = skin CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -std=c++11 -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw -lassimp +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw -lassimp FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/34_framebuffer_switch/Makefile.osx b/34_framebuffer_switch/Makefile.osx index fa60477..7397806 100644 --- a/34_framebuffer_switch/Makefile.osx +++ b/34_framebuffer_switch/Makefile.osx @@ -1,8 +1,8 @@ BIN = fbuffer CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp obj_parser.cpp diff --git a/35_image_kernel/Makefile.osx b/35_image_kernel/Makefile.osx index f498f5c..1c94bcc 100644 --- a/35_image_kernel/Makefile.osx +++ b/35_image_kernel/Makefile.osx @@ -1,8 +1,8 @@ BIN = kernel CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp obj_parser.cpp diff --git a/36_colour_picking/Makefile.osx b/36_colour_picking/Makefile.osx index 33291f0..a8144bf 100644 --- a/36_colour_picking/Makefile.osx +++ b/36_colour_picking/Makefile.osx @@ -1,8 +1,8 @@ BIN = pick CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp obj_parser.cpp diff --git a/37_deferred_shading/Makefile.osx b/37_deferred_shading/Makefile.osx index c0a0064..1b96a90 100644 --- a/37_deferred_shading/Makefile.osx +++ b/37_deferred_shading/Makefile.osx @@ -1,8 +1,8 @@ BIN = deferred CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp obj_parser.cpp diff --git a/38_texture_shadows/Makefile.osx b/38_texture_shadows/Makefile.osx index 62c2b2a..396c5bc 100644 --- a/38_texture_shadows/Makefile.osx +++ b/38_texture_shadows/Makefile.osx @@ -1,8 +1,8 @@ BIN = shads CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp gl_utils.cpp obj_parser.cpp maths_funcs.cpp diff --git a/39_texture_mapping_srgb/Makefile.osx b/39_texture_mapping_srgb/Makefile.osx index 7ed447c..26a8b9b 100644 --- a/39_texture_mapping_srgb/Makefile.osx +++ b/39_texture_mapping_srgb/Makefile.osx @@ -1,8 +1,8 @@ BIN = texmap CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp diff --git a/41_shader_hot_reload/Makefile.osx b/41_shader_hot_reload/Makefile.osx index 994ae3c..c22d4d4 100644 --- a/41_shader_hot_reload/Makefile.osx +++ b/41_shader_hot_reload/Makefile.osx @@ -1,8 +1,8 @@ BIN = hotreload CC = clang FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw +INC = -I/sw/include -I/usr/local/include -I/opt/homebrew/include +LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.c From cabf671e3199396780655f386215b2ed41c3e0ea Mon Sep 17 00:00:00 2001 From: Anton Gerdelan Date: Tue, 20 Aug 2024 13:20:13 +0100 Subject: [PATCH 5/7] makefiles with INC for macOS --- 01_extended_init/Makefile.osx | 2 +- 02_shaders/Makefile.osx | 2 +- 03_vertex_buffer_objects/Makefile.osx | 2 +- 04_mats_and_vecs/Makefile.osx | 2 +- 05_virtual_camera/Makefile.osx | 2 +- 06_vcam_with_quaternion/Makefile.osx | 2 +- 07_ray_picking/Makefile.osx | 2 +- 08_phong/Makefile.osx | 2 +- 09_texture_mapping/Makefile.osx | 2 +- 10_screen_capture/Makefile.osx | 2 +- 11_video_capture/Makefile.osx | 2 +- 12_debugging_shaders/Makefile.osx | 2 +- 14_multi_tex/Makefile.osx | 2 +- 16_frag_reject/Makefile.osx | 2 +- 17_alpha_blending/Makefile.osx | 2 +- 18_spotlights/Makefile.osx | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/01_extended_init/Makefile.osx b/01_extended_init/Makefile.osx index d600e6d..2ee1576 100644 --- a/01_extended_init/Makefile.osx +++ b/01_extended_init/Makefile.osx @@ -7,5 +7,5 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.c all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} diff --git a/02_shaders/Makefile.osx b/02_shaders/Makefile.osx index 788a481..4645b49 100644 --- a/02_shaders/Makefile.osx +++ b/02_shaders/Makefile.osx @@ -7,5 +7,5 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.c gl_utils.c all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} diff --git a/03_vertex_buffer_objects/Makefile.osx b/03_vertex_buffer_objects/Makefile.osx index 5d6e9e2..b5f545b 100644 --- a/03_vertex_buffer_objects/Makefile.osx +++ b/03_vertex_buffer_objects/Makefile.osx @@ -7,4 +7,4 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp gl_utils.cpp all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} diff --git a/04_mats_and_vecs/Makefile.osx b/04_mats_and_vecs/Makefile.osx index 9328a86..10264aa 100644 --- a/04_mats_and_vecs/Makefile.osx +++ b/04_mats_and_vecs/Makefile.osx @@ -7,5 +7,5 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp gl_utils.cpp all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} diff --git a/05_virtual_camera/Makefile.osx b/05_virtual_camera/Makefile.osx index 72cfb25..a9131f2 100644 --- a/05_virtual_camera/Makefile.osx +++ b/05_virtual_camera/Makefile.osx @@ -7,5 +7,5 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp gl_utils.cpp maths_funcs.cpp all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} diff --git a/06_vcam_with_quaternion/Makefile.osx b/06_vcam_with_quaternion/Makefile.osx index 73a3d06..5e935f1 100644 --- a/06_vcam_with_quaternion/Makefile.osx +++ b/06_vcam_with_quaternion/Makefile.osx @@ -7,5 +7,5 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp gl_utils.cpp maths_funcs.cpp obj_parser.cpp all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} diff --git a/07_ray_picking/Makefile.osx b/07_ray_picking/Makefile.osx index 9feed1d..9f804a5 100644 --- a/07_ray_picking/Makefile.osx +++ b/07_ray_picking/Makefile.osx @@ -7,5 +7,5 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp gl_utils.cpp maths_funcs.cpp obj_parser.cpp all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} diff --git a/08_phong/Makefile.osx b/08_phong/Makefile.osx index 92764d4..8d48174 100644 --- a/08_phong/Makefile.osx +++ b/08_phong/Makefile.osx @@ -7,5 +7,5 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} diff --git a/09_texture_mapping/Makefile.osx b/09_texture_mapping/Makefile.osx index 495e13a..2956e24 100644 --- a/09_texture_mapping/Makefile.osx +++ b/09_texture_mapping/Makefile.osx @@ -7,5 +7,5 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} diff --git a/10_screen_capture/Makefile.osx b/10_screen_capture/Makefile.osx index 36c965d..3e10a8c 100644 --- a/10_screen_capture/Makefile.osx +++ b/10_screen_capture/Makefile.osx @@ -7,5 +7,5 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} diff --git a/11_video_capture/Makefile.osx b/11_video_capture/Makefile.osx index f3308b0..f3ee784 100644 --- a/11_video_capture/Makefile.osx +++ b/11_video_capture/Makefile.osx @@ -7,5 +7,5 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} diff --git a/12_debugging_shaders/Makefile.osx b/12_debugging_shaders/Makefile.osx index db67b0e..885a286 100644 --- a/12_debugging_shaders/Makefile.osx +++ b/12_debugging_shaders/Makefile.osx @@ -7,5 +7,5 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp obj_parser.cpp all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} diff --git a/14_multi_tex/Makefile.osx b/14_multi_tex/Makefile.osx index 3f188ef..502fe54 100644 --- a/14_multi_tex/Makefile.osx +++ b/14_multi_tex/Makefile.osx @@ -7,5 +7,5 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} diff --git a/16_frag_reject/Makefile.osx b/16_frag_reject/Makefile.osx index bc5a520..a9b971e 100644 --- a/16_frag_reject/Makefile.osx +++ b/16_frag_reject/Makefile.osx @@ -7,5 +7,5 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} diff --git a/17_alpha_blending/Makefile.osx b/17_alpha_blending/Makefile.osx index 1a092fa..f213cf9 100644 --- a/17_alpha_blending/Makefile.osx +++ b/17_alpha_blending/Makefile.osx @@ -7,5 +7,5 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} diff --git a/18_spotlights/Makefile.osx b/18_spotlights/Makefile.osx index 5c8a53e..b155a6d 100644 --- a/18_spotlights/Makefile.osx +++ b/18_spotlights/Makefile.osx @@ -7,5 +7,5 @@ FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp gl_utils.cpp all: - ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${LIBS} + ${CC} ${FLAGS} ${FRAMEWORKS} -o ${BIN} ${SRC} ${INC} ${LIBS} From f457cb8626b96bed0212fc6c1b7f87b56236285a Mon Sep 17 00:00:00 2001 From: Anton Gerdelan Date: Tue, 20 Aug 2024 13:22:12 +0100 Subject: [PATCH 6/7] misisng path makefile27 --- 27_font_atlas/Makefile.osx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/27_font_atlas/Makefile.osx b/27_font_atlas/Makefile.osx index 939f2d4..cc2bafb 100644 --- a/27_font_atlas/Makefile.osx +++ b/27_font_atlas/Makefile.osx @@ -8,7 +8,7 @@ SRC = main.cpp maths_funcs.cpp all: generator viewer generator: - ${CC} ${FLAGS} -o generate generator_main.cpp ${INC} -lfreetype + ${CC} ${FLAGS} -o generate generator_main.cpp ${INC} -L /opt/homebrew/lib -lfreetype viewer: ${CC} ${FLAGS} ${FRAMEWORKS} -o view viewer_main.cpp maths_funcs.cpp ${INC} ${LIBS} From 89e249302961374908736dd03b20bb78408ef1a6 Mon Sep 17 00:00:00 2001 From: Anton Gerdelan Date: Tue, 20 Aug 2024 13:23:29 +0100 Subject: [PATCH 7/7] misisng path makefile27 --- 27_font_atlas/Makefile.osx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/27_font_atlas/Makefile.osx b/27_font_atlas/Makefile.osx index cc2bafb..fe968c3 100644 --- a/27_font_atlas/Makefile.osx +++ b/27_font_atlas/Makefile.osx @@ -1,6 +1,6 @@ CC = clang++ FLAGS = -DAPPLE -Wall -pedantic -INC = -I/sw/include -I/usr/local/include -I/usr/local/include/freetype2/ -I/opt/homebrew/include +INC = -I/sw/include -I/usr/local/include -I/usr/local/include/freetype2/ -I/opt/homebrew/include -I/opt/homebrew/include/freetype2/ LIBS = -L /opt/homebrew/lib -lGLEW -lglfw FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit SRC = main.cpp maths_funcs.cpp