From 565b1089bd6a4c97957c0c3df1a1ed2b829d2183 Mon Sep 17 00:00:00 2001 From: LelixSuper Date: Sun, 3 Apr 2016 15:58:44 +0200 Subject: Remove duplicate code --- examples/Makefile | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'examples/Makefile') diff --git a/examples/Makefile b/examples/Makefile index e62488ae..cb59654f 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -119,28 +119,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) endif endif -# define library paths containing required libs -ifeq ($(PLATFORM),PLATFORM_RPI) - LFLAGS = -L. -L../../src -L/opt/vc/lib -endif -ifeq ($(PLATFORM),PLATFORM_DESKTOP) - # add standard directories for GNU/Linux - ifeq ($(PLATFORM_OS),LINUX) - LFLAGS = -L. -L../../src - else - LFLAGS = -L. -L../../src -LC:/raylib/raylib/src - # external libraries to link with - # GLFW3 - LFLAGS += -L../../external/glfw3/lib/$(LIBPATH) - ifneq ($(PLATFORM_OS),OSX) - # OpenAL Soft - LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH) - # GLEW - LFLAGS += -L../../external/glew/lib/$(LIBPATH) - endif - endif -endif - # define any libraries to link into executable # if you want to link libraries (libname.so or libname.a), use the -lname ifeq ($(PLATFORM),PLATFORM_DESKTOP) -- cgit v1.2.3 From f2f4079411472e835263a7a59ed58dba380ecca6 Mon Sep 17 00:00:00 2001 From: LelixSuper Date: Sun, 3 Apr 2016 16:05:23 +0200 Subject: Remove recipes of GLEW from Makefile (not used any more) --- examples/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'examples/Makefile') diff --git a/examples/Makefile b/examples/Makefile index cb59654f..74335fe8 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -90,8 +90,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # external libraries headers # GLFW3 INCLUDES += -I../../external/glfw3/include - # GLEW - Not required any more, replaced by GLAD - #INCLUDES += -I../external/glew/include # OpenAL Soft INCLUDES += -I../../external/openal_soft/include endif @@ -113,8 +111,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifneq ($(PLATFORM_OS),OSX) # OpenAL Soft LFLAGS += -L../../external/openal_soft/lib/$(LIBPATH) - # GLEW: Not used, replaced by GLAD - #LFLAGS += -L../../external/glew/lib/$(LIBPATH) endif endif endif @@ -125,14 +121,14 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),LINUX) # libraries for Debian GNU/Linux desktop compiling # requires the following packages: - # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev + # libglfw3-dev libopenal-dev libegl1-mesa-dev LIBS = -lraylib -lglfw3 -lGL -lopenal -lm -pthread -ldl -lX11 \ -lXrandr -lXinerama -lXi -lXxf86vm -lXcursor else ifeq ($(PLATFORM_OS),OSX) # libraries for OS X 10.9 desktop compiling # requires the following packages: - # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev + # libglfw3-dev libopenal-dev libegl1-mesa-dev LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa else # libraries for Windows desktop compiling -- cgit v1.2.3 From b62bbb78ed1ddf1b0cd7af150c715d440e78265e Mon Sep 17 00:00:00 2001 From: Chris Hemingway Date: Fri, 13 May 2016 23:01:48 +0100 Subject: Fix building examples on OSX --- examples/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'examples/Makefile') diff --git a/examples/Makefile b/examples/Makefile index 74335fe8..534adee8 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -85,6 +85,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # add standard directories for GNU/Linux ifeq ($(PLATFORM_OS),LINUX) INCLUDES = -I. -I../src -I/usr/local/include/raylib/ + else ifeq ($(PLATFORM_OS),OSX) + INCLUDES = -I. -I../src else INCLUDES = -I. -I../../src -IC:/raylib/raylib/src # external libraries headers @@ -103,6 +105,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # add standard directories for GNU/Linux ifeq ($(PLATFORM_OS),LINUX) LFLAGS = -L. -L../../src + else ifeq ($(PLATFORM_OS),OSX) + LFLAGS = -L. -L../src else LFLAGS = -L. -L../../src -LC:/raylib/raylib/src # external libraries to link with @@ -129,7 +133,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) # libraries for OS X 10.9 desktop compiling # requires the following packages: # libglfw3-dev libopenal-dev libegl1-mesa-dev - LIBS = -lraylib -lglfw -framework OpenGL -framework OpenAl -framework Cocoa + LIBS = -lraylib -lglfw3 -framework OpenGL -framework OpenAl -framework Cocoa else # libraries for Windows desktop compiling # NOTE: GLFW3 and OpenAL Soft libraries should be installed -- cgit v1.2.3