diff options
Diffstat (limited to 'graphics/blender/files/patch-source_Makefile')
| -rw-r--r-- | graphics/blender/files/patch-source_Makefile | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/graphics/blender/files/patch-source_Makefile b/graphics/blender/files/patch-source_Makefile index 0cdd4b3ba6a0..67b8fc8dda29 100644 --- a/graphics/blender/files/patch-source_Makefile +++ b/graphics/blender/files/patch-source_Makefile @@ -1,6 +1,6 @@ ---- source/Makefile.orig 2008-10-22 18:36:53.000000000 +0200 -+++ source/Makefile 2009-03-21 10:27:55.000000000 +0100 -@@ -106,7 +106,7 @@ +--- source/Makefile.orig 2009-06-01 12:22:26.000000000 +0200 ++++ source/Makefile 2009-06-01 12:35:03.000000000 +0200 +@@ -105,7 +105,7 @@ COMLIB += $(OCGDIR)/blender/avi/$(DEBUG_DIR)libavi.a COMLIB += $(NAN_JPEG)/lib/libjpeg.a COMLIB += $(OCGDIR)/blender/gpu/$(DEBUG_DIR)libgpu.a @@ -9,28 +9,45 @@ ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a -@@ -190,11 +190,11 @@ +@@ -160,7 +160,7 @@ + COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a + COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a + COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a +-COMLIB += $(NAN_PNG)/lib/libpng.a ++COMLIB += $(NAN_PNG)/lib/libpng.so + COMLIB += $(OCGDIR)/blender/yafray/$(DEBUG_DIR)libyafrayexport.a + COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a + +@@ -173,7 +173,8 @@ + endif + + ifeq ($(WITH_OPENJPEG), true) +- COMLIB += $(OCGDIR)/extern/openjpeg/$(DEBUG_DIR)libopenjpeg.a ++ #COMLIB += $(OCGDIR)/extern/openjpeg/$(DEBUG_DIR)libopenjpeg.a ++ COMLIB += $(NAN_OPENJPEG)/lib/libopenjpeg.so + endif + + COMLIB += $(OCGDIR)/blender/imbuf/cineon/$(DEBUG_DIR)libcineon.a +@@ -197,11 +198,11 @@ COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib endif else - COMLIB += $(NAN_FTGL)/lib/libftgl.a + COMLIB += $(NAN_FTGL)/lib/libftgl.so ifeq ($(OS), irix) - COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a + COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a else - COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a + COMLIB += $(NAN_FREETYPE)/lib/libfreetype.so endif endif endif -@@ -353,8 +353,8 @@ +@@ -362,7 +363,7 @@ NAN_SND_LIBS += $(DUMMYSOUND) NAN_SND_LIBS += $(OPENALSOUND) NAN_SND_LIBS += $(SDLSOUND) - NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a -- ALUT = $(wildcard $(NAN_OPENAL)/lib/libalut.a) + NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.so -+ ALUT = $(wildcard $(NAN_OPENAL)/lib/libalut.so) - NAN_SND_LIBS += $(ALUT) NAN_SND_LIBS += $(SOUNDSYSTEM) else + ifeq ($(OS),windows) |