diff --git a/03_vertex_buffer_objects/main.cpp b/03_vertex_buffer_objects/main.cpp index 760e582..9c4b19d 100644 --- a/03_vertex_buffer_objects/main.cpp +++ b/03_vertex_buffer_objects/main.cpp @@ -108,7 +108,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; } glEnable( GL_CULL_FACE ); // cull face diff --git a/13_mesh_import/Makefile.osx b/13_mesh_import/Makefile.osx index 8c16548..21c0655 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 +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 8fcb01f..29bbd59 100644 --- a/15_phongtextures/Makefile.osx +++ b/15_phongtextures/Makefile.osx @@ -1,6 +1,6 @@ BIN = phongtex CC = clang++ -FLAGS = -DAPPLE -Wall -pedantic +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 ad2dba8..fdab7fa 100644 --- a/19_fog/Makefile.osx +++ b/19_fog/Makefile.osx @@ -1,6 +1,6 @@ BIN = fog CC = clang++ -FLAGS = -DAPPLE -Wall -pedantic +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 1ecf063..40023c5 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 +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 92b3dbb..37c8995 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 +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 92b3dbb..37c8995 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 +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 dc22311..f576512 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 +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 dc22311..f576512 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 +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 dc22311..f576512 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 +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