From d739895e4a8602034d7a65a3be0c90163dabb817 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Thu, 8 Jan 2015 21:10:06 +0100 Subject: Reorganized external folders by platform Improved makefiles! --- examples/makefile | 45 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 11 deletions(-) (limited to 'examples/makefile') diff --git a/examples/makefile b/examples/makefile index 9763b233..500ba715 100644 --- a/examples/makefile +++ b/examples/makefile @@ -26,18 +26,21 @@ # WARNING: To compile examples to HTML5, they must be redesigned to use emscripten.h and emscripten_set_main_loop() PLATFORM ?= PLATFORM_DESKTOP -# determine SUBPLATFORM in case PLATFORM_DESKTOP selected +# determine PLATFORM_OS in case PLATFORM_DESKTOP selected ifeq ($(PLATFORM),PLATFORM_DESKTOP) # No uname.exe on MinGW!, but OS=Windows_NT on Windows! ifeq ($(UNAME),Msys) -> Windows ifeq ($(OS),Windows_NT) - SUBPLATFORM=WINDOWS + PLATFORM_OS=WINDOWS + LIBPATH=win32 else UNAMEOS:=$(shell uname) ifeq ($(UNAMEOS),Linux) - SUBPLATFORM=LINUX + PLATFORM_OS=LINUX + LIBPATH=linux else ifeq ($(UNAMEOS),Darwin) - SUBPLATFORM=OSX + PLATFORM_OS=OSX + LIBPATH=osx endif endif endif @@ -47,10 +50,15 @@ endif ifeq ($(PLATFORM),PLATFORM_WEB) # define emscripten compiler CC = emcc +else +ifeq ($(PLATFORM_OS),OSX) + # define llvm compiler for mac + CC = clang else # define default gcc compiler CC = gcc endif +endif # define compiler flags: # -O2 defines optimization level @@ -74,25 +82,39 @@ ifeq ($(PLATFORM),PLATFORM_RPI) INCLUDES = -I. -I../src -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads else INCLUDES = -I. -I../src +# external libraries headers +# GLFW3 + INCLUDES += -I../external/glfw3/include +# GLEW + INCLUDES += -I../external/glew/include +# OpenAL Soft + INCLUDES += -I../external/openal_soft/include endif # define library paths containing required libs ifeq ($(PLATFORM),PLATFORM_RPI) LFLAGS = -L. -L../src -L/opt/vc/lib else - LFLAGS = -L. -L../src -L../external/glfw3/lib/ -I../external/openal_soft/lib/ + LFLAGS = -L. -L../src +# external libraries to link with +# GLFW3 + LFLAGS += -L../external/glfw3/lib/$(LIBPATH) +# GLEW + LFLAGS += -L../external/openal_soft/lib/$(LIBPATH) +# OpenAL Soft + LFLAGS += -L../external/glew/lib/$(LIBPATH) 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) - ifeq ($(SUBPLATFORM),LINUX) + ifeq ($(PLATFORM_OS),LINUX) # libraries for Debian GNU/Linux desktop compiling # requires the following packages: # libglfw3-dev libopenal-dev libglew-dev libegl1-mesa-dev LIBS = -lraylib -lglfw -lGLEW -lGL -lopenal endif - ifeq ($(SUBPLATFORM),OSX) + 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 @@ -101,7 +123,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) else # libraries for Windows desktop compiling # NOTE: GLFW3 and OpenAL Soft libraries should be installed - LIBS = -lraylib -lglfw3 -lglew32 -lopengl32 -lopenal32 -lgdi32 + LIBS = -lraylib -lglfw3 -lglew32 -lopengl32 -lopenal32 -lgdi32 endif endif ifeq ($(PLATFORM),PLATFORM_RPI) @@ -114,7 +136,7 @@ ifeq ($(PLATFORM),PLATFORM_WEB) endif # define additional parameters and flags for windows -ifeq ($(PLATFORM),PLATFORM_DESKTOP) +ifeq ($(PLATFORM_OS),WINDOWS) # resources file contains windows exe icon # -Wl,--subsystem,windows hides the console window WINFLAGS = ../src/resources -Wl,--subsystem,windows @@ -290,10 +312,11 @@ audio_music_stream: audio_music_stream.c # clean everything clean: ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ifeq ($(SUBPLATFORM),OSX) + ifeq ($(PLATFORM_OS),OSX) + find . -type f -perm +ugo+x -delete rm -f *.o else - ifeq ($(SUBPLATFORM),LINUX) + ifeq ($(PLATFORM_OS),LINUX) find . -type f -executable -delete rm -f *.o else -- cgit v1.2.3 From 31934ac374d0e7ca90037794ed3057c6e84e4c8a Mon Sep 17 00:00:00 2001 From: David Gallardo Date: Thu, 8 Jan 2015 22:09:29 +0100 Subject: Improved support for mac. Reference to libglfw dylib fixed --- examples/makefile | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'examples/makefile') diff --git a/examples/makefile b/examples/makefile index 500ba715..b4d7bfa3 100644 --- a/examples/makefile +++ b/examples/makefile @@ -99,10 +99,12 @@ else # external libraries to link with # GLFW3 LFLAGS += -L../external/glfw3/lib/$(LIBPATH) -# GLEW - LFLAGS += -L../external/openal_soft/lib/$(LIBPATH) -# OpenAL Soft - LFLAGS += -L../external/glew/lib/$(LIBPATH) + ifneq ($(PLATFORM_OS),OSX) + # OpenAL Soft + LFLAGS += -L../external/openal_soft/lib/$(LIBPATH) + # GLEW + LFLAGS += -L../external/glew/lib/$(LIBPATH) + endif endif # define any libraries to link into executable @@ -177,6 +179,8 @@ EXAMPLES = \ models_cubicmap \ audio_sound_loading \ audio_music_stream \ + fix_dylib \ + #core_input_gamepad \ @@ -309,11 +313,17 @@ audio_sound_loading: audio_sound_loading.c audio_music_stream: audio_music_stream.c $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) +# fix dylib install path name for each executable (MAC) +fix_dylib: +ifeq ($(PLATFORM_OS),OSX) + find . -type f -perm +ugo+x -print0 | xargs -t -0 -R 1 -I file install_name_tool -change libglfw.3.0.dylib ../external/glfw3/lib/osx/libglfw.3.0.dylib file +endif + # clean everything clean: ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),OSX) - find . -type f -perm +ugo+x -delete + find . -type f -perm +ugo+x -delete rm -f *.o else ifeq ($(PLATFORM_OS),LINUX) -- cgit v1.2.3