From 454010ef8193784a3c2cf7597a8c8e4b072ba48f Mon Sep 17 00:00:00 2001 From: Anton Gerdelan Date: Thu, 14 Mar 2024 20:02:26 +0000 Subject: [PATCH] flag fix osx --- 13_mesh_import/Makefile.osx | 2 +- 15_phongtextures/Makefile.osx | 2 +- 19_fog/Makefile.osx | 2 +- 20_normal_mapping/Makefile.osx | 2 +- 21_cube_mapping/Makefile.osx | 2 +- 28_uniform_buffer_object/Makefile.osx | 2 +- 30_skinning_part_one/Makefile.osx | 2 +- 31_skinning_part_two/Makefile.osx | 2 +- 32_skinning_part_three/Makefile.osx | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/13_mesh_import/Makefile.osx b/13_mesh_import/Makefile.osx index 21c0655..95b2405 100644 --- a/13_mesh_import/Makefile.osx +++ b/13_mesh_import/Makefile.osx @@ -1,6 +1,6 @@ BIN = meshimp CC = clang++ -FLAGS = -DAPPLE -Wall -pedantic -std=C++11 +FLAGS = -DAPPLE -Wall -pedantic -std=c++11 INC = -I/sw/include -I/usr/local/include LIBS = -lGLEW -lglfw -lassimp FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit diff --git a/15_phongtextures/Makefile.osx b/15_phongtextures/Makefile.osx index 29bbd59..92776ba 100644 --- a/15_phongtextures/Makefile.osx +++ b/15_phongtextures/Makefile.osx @@ -1,6 +1,6 @@ BIN = phongtex CC = clang++ -FLAGS = -DAPPLE -Wall -pedantic -std=C++11 +FLAGS = -DAPPLE -Wall -pedantic -std=c++11 INC = -I/sw/include -I/usr/local/include LIBS = -lGLEW -lglfw -lassimp FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit diff --git a/19_fog/Makefile.osx b/19_fog/Makefile.osx index fdab7fa..982274a 100644 --- a/19_fog/Makefile.osx +++ b/19_fog/Makefile.osx @@ -1,6 +1,6 @@ BIN = fog CC = clang++ -FLAGS = -DAPPLE -Wall -pedantic -std=C++11 +FLAGS = -DAPPLE -Wall -pedantic -std=c++11 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 index 40023c5..34e53e2 100644 --- a/20_normal_mapping/Makefile.osx +++ b/20_normal_mapping/Makefile.osx @@ -2,7 +2,7 @@ BIN = nmap CC = clang++ FLAGS = -DAPPLE -Wall -pedantic INC = -I/sw/include -I/usr/local/include -LIBS = -lGLEW -lglfw -lassimp -std=C++11 +LIBS = -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 37c8995..788e4b4 100644 --- a/21_cube_mapping/Makefile.osx +++ b/21_cube_mapping/Makefile.osx @@ -1,6 +1,6 @@ BIN = cubemap CC = clang++ -FLAGS = -DAPPLE -Wall -pedantic -std=C++11 +FLAGS = -DAPPLE -Wall -pedantic -std=c++11 INC = -I/sw/include -I/usr/local/include LIBS = -lGLEW -lglfw -lassimp FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit diff --git a/28_uniform_buffer_object/Makefile.osx b/28_uniform_buffer_object/Makefile.osx index 37c8995..788e4b4 100644 --- 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 -std=C++11 +FLAGS = -DAPPLE -Wall -pedantic -std=c++11 INC = -I/sw/include -I/usr/local/include LIBS = -lGLEW -lglfw -lassimp FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit diff --git a/30_skinning_part_one/Makefile.osx b/30_skinning_part_one/Makefile.osx index f576512..e7d84b1 100644 --- 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 -std=C++11 +FLAGS = -DAPPLE -Wall -pedantic -std=c++11 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 index f576512..e7d84b1 100644 --- 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 -std=C++11 +FLAGS = -DAPPLE -Wall -pedantic -std=c++11 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 index f576512..e7d84b1 100644 --- 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 -std=C++11 +FLAGS = -DAPPLE -Wall -pedantic -std=c++11 INC = -I/sw/include -I/usr/local/include LIBS = -lGLEW -lglfw -lassimp FRAMEWORKS = -framework Cocoa -framework OpenGL -framework IOKit