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! --- external/glew/lib/libglew32.a | Bin 720918 -> 0 bytes external/glew/lib/libglew32dll.a | Bin 1886236 -> 0 bytes external/glew/lib/win32/libglew32.a | Bin 0 -> 720918 bytes external/glew/lib/win32/libglew32dll.a | Bin 0 -> 1886236 bytes external/glfw3/lib/libglfw.3.0.dylib | Bin 127856 -> 0 bytes external/glfw3/lib/libglfw.3.dylib | 1 - external/glfw3/lib/libglfw.dylib | 1 - external/glfw3/lib/libglfw3.a | Bin 83006 -> 0 bytes external/glfw3/lib/libglfw3dll.a | Bin 48318 -> 0 bytes external/glfw3/lib/osx/libglfw.3.0.dylib | Bin 0 -> 127856 bytes external/glfw3/lib/osx/libglfw.3.dylib | 1 + external/glfw3/lib/osx/libglfw.dylib | 1 + external/glfw3/lib/win32/libglfw3.a | Bin 0 -> 83006 bytes external/glfw3/lib/win32/libglfw3dll.a | Bin 0 -> 48318 bytes external/openal_soft/lib/libopenal32.a | Bin 95688 -> 0 bytes external/openal_soft/lib/win32/libopenal32.a | Bin 0 -> 95688 bytes 16 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 external/glew/lib/libglew32.a delete mode 100644 external/glew/lib/libglew32dll.a create mode 100644 external/glew/lib/win32/libglew32.a create mode 100644 external/glew/lib/win32/libglew32dll.a delete mode 100755 external/glfw3/lib/libglfw.3.0.dylib delete mode 120000 external/glfw3/lib/libglfw.3.dylib delete mode 120000 external/glfw3/lib/libglfw.dylib delete mode 100644 external/glfw3/lib/libglfw3.a delete mode 100644 external/glfw3/lib/libglfw3dll.a create mode 100644 external/glfw3/lib/osx/libglfw.3.0.dylib create mode 100644 external/glfw3/lib/osx/libglfw.3.dylib create mode 100644 external/glfw3/lib/osx/libglfw.dylib create mode 100644 external/glfw3/lib/win32/libglfw3.a create mode 100644 external/glfw3/lib/win32/libglfw3dll.a delete mode 100644 external/openal_soft/lib/libopenal32.a create mode 100644 external/openal_soft/lib/win32/libopenal32.a (limited to 'external') diff --git a/external/glew/lib/libglew32.a b/external/glew/lib/libglew32.a deleted file mode 100644 index 363c424b..00000000 Binary files a/external/glew/lib/libglew32.a and /dev/null differ diff --git a/external/glew/lib/libglew32dll.a b/external/glew/lib/libglew32dll.a deleted file mode 100644 index 5d84782c..00000000 Binary files a/external/glew/lib/libglew32dll.a and /dev/null differ diff --git a/external/glew/lib/win32/libglew32.a b/external/glew/lib/win32/libglew32.a new file mode 100644 index 00000000..363c424b Binary files /dev/null and b/external/glew/lib/win32/libglew32.a differ diff --git a/external/glew/lib/win32/libglew32dll.a b/external/glew/lib/win32/libglew32dll.a new file mode 100644 index 00000000..5d84782c Binary files /dev/null and b/external/glew/lib/win32/libglew32dll.a differ diff --git a/external/glfw3/lib/libglfw.3.0.dylib b/external/glfw3/lib/libglfw.3.0.dylib deleted file mode 100755 index 963d716d..00000000 Binary files a/external/glfw3/lib/libglfw.3.0.dylib and /dev/null differ diff --git a/external/glfw3/lib/libglfw.3.dylib b/external/glfw3/lib/libglfw.3.dylib deleted file mode 120000 index cd20112e..00000000 --- a/external/glfw3/lib/libglfw.3.dylib +++ /dev/null @@ -1 +0,0 @@ -libglfw.3.0.dylib \ No newline at end of file diff --git a/external/glfw3/lib/libglfw.dylib b/external/glfw3/lib/libglfw.dylib deleted file mode 120000 index d4bd51e1..00000000 --- a/external/glfw3/lib/libglfw.dylib +++ /dev/null @@ -1 +0,0 @@ -libglfw.3.dylib \ No newline at end of file diff --git a/external/glfw3/lib/libglfw3.a b/external/glfw3/lib/libglfw3.a deleted file mode 100644 index 7138ee9b..00000000 Binary files a/external/glfw3/lib/libglfw3.a and /dev/null differ diff --git a/external/glfw3/lib/libglfw3dll.a b/external/glfw3/lib/libglfw3dll.a deleted file mode 100644 index 415d8563..00000000 Binary files a/external/glfw3/lib/libglfw3dll.a and /dev/null differ diff --git a/external/glfw3/lib/osx/libglfw.3.0.dylib b/external/glfw3/lib/osx/libglfw.3.0.dylib new file mode 100644 index 00000000..963d716d Binary files /dev/null and b/external/glfw3/lib/osx/libglfw.3.0.dylib differ diff --git a/external/glfw3/lib/osx/libglfw.3.dylib b/external/glfw3/lib/osx/libglfw.3.dylib new file mode 100644 index 00000000..cd20112e --- /dev/null +++ b/external/glfw3/lib/osx/libglfw.3.dylib @@ -0,0 +1 @@ +libglfw.3.0.dylib \ No newline at end of file diff --git a/external/glfw3/lib/osx/libglfw.dylib b/external/glfw3/lib/osx/libglfw.dylib new file mode 100644 index 00000000..d4bd51e1 --- /dev/null +++ b/external/glfw3/lib/osx/libglfw.dylib @@ -0,0 +1 @@ +libglfw.3.dylib \ No newline at end of file diff --git a/external/glfw3/lib/win32/libglfw3.a b/external/glfw3/lib/win32/libglfw3.a new file mode 100644 index 00000000..7138ee9b Binary files /dev/null and b/external/glfw3/lib/win32/libglfw3.a differ diff --git a/external/glfw3/lib/win32/libglfw3dll.a b/external/glfw3/lib/win32/libglfw3dll.a new file mode 100644 index 00000000..415d8563 Binary files /dev/null and b/external/glfw3/lib/win32/libglfw3dll.a differ diff --git a/external/openal_soft/lib/libopenal32.a b/external/openal_soft/lib/libopenal32.a deleted file mode 100644 index 5f7352ac..00000000 Binary files a/external/openal_soft/lib/libopenal32.a and /dev/null differ diff --git a/external/openal_soft/lib/win32/libopenal32.a b/external/openal_soft/lib/win32/libopenal32.a new file mode 100644 index 00000000..5f7352ac Binary files /dev/null and b/external/openal_soft/lib/win32/libopenal32.a differ -- 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 +++++++++++++++----- external/glfw3/lib/osx/libglfw.3.0.dylib | Bin 127856 -> 127856 bytes 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'external') 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) diff --git a/external/glfw3/lib/osx/libglfw.3.0.dylib b/external/glfw3/lib/osx/libglfw.3.0.dylib index 963d716d..15674573 100644 Binary files a/external/glfw3/lib/osx/libglfw.3.0.dylib and b/external/glfw3/lib/osx/libglfw.3.0.dylib differ -- cgit v1.2.3