Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > 2266126927cb5f5657880b7ea2027595 > files > 17

blender-2.47-2.1mdv2009.0.src.rpm

--- blender/tools/Blender.py.lib64	2006-11-24 07:08:05.000000000 +0100
+++ blender/tools/Blender.py	2006-12-17 21:46:40.000000000 +0100
@@ -109,6 +109,7 @@
         #here libs for static linking
     ]
     libincs = [
+        '/usr/lib64',
         '/usr/lib',
         lenv['BF_PYTHON_LIBPATH'],
         lenv['BF_OPENGL_LIBPATH'],
--- blender/extern/solid/examples/Makefile.am.lib64	2004-07-17 04:44:23.000000000 +0200
+++ blender/extern/solid/examples/Makefile.am	2006-12-17 21:46:40.000000000 +0100
@@ -7,7 +7,7 @@
 physics_SOURCES = physics.cpp
 mnm_SOURCES = mnm.cpp
 
-GLLIBS = -lglut -lGLU -lGL -L/usr/X11R6/lib -lXmu -lXi -lX11
+GLLIBS = -lglut -lGLU -lGL -L/usr/X11R6/lib64 -lXmu -lXi -lX11
 
 sample_LDADD = ../src/libsolid.la $(QHULL_LIBS)
 gldemo_LDADD = ../src/libsolid.la $(QHULL_LIBS) $(GLLIBS)
--- blender/intern/bsp/test/Makefile.lib64	2005-10-28 22:18:56.000000000 +0200
+++ blender/intern/bsp/test/Makefile	2006-12-17 21:46:40.000000000 +0100
@@ -51,7 +51,7 @@
 SLIBS += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a
 
 ifeq ($(OS),$(findstring $(OS), "beos darwin linux freebsd openbsd"))
-    LLIBS = -L/usr/X11R6/lib -lglut -pthread -lXi -lXmu
+    LLIBS = -L/usr/X11R6/lib64 -lglut -pthread -lXi -lXmu
 endif
 
 all debug:: $(LIBS) $(DIR)/$(DEBUG_DIR)BSPGhostTest
--- blender/intern/iksolver/test/Makefile.lib64	2002-12-16 12:18:31.000000000 +0100
+++ blender/intern/iksolver/test/Makefile	2006-12-17 21:46:40.000000000 +0100
@@ -50,7 +50,7 @@
 SLIBS += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a
 
 ifeq ($(OS),$(findstring $(OS), "beos darwin linux freebsd openbsd"))
-    LLIBS = -L/usr/X11R6/lib -lglut -pthread
+    LLIBS = -L/usr/X11R6/lib64 -lglut -pthread
 endif
 
 ifeq ($(OS),$(findstring $(OS), "solaris"))
--- blender/source/nan_link.mk	2008-03-23 13:59:26.000000000 +0100
+++ blender/source/nan_link.mk	2008-03-23 21:51:52.000000000 +0100
@@ -86,18 +86,18 @@
 ifeq ($(OS),linux)
   ifeq ($(CPU),alpha)
     COMMENT = "MESA 3.1"
-    LLIBS = -lGL -lGLU -L/usr/X11R6/lib/ -lXmu -lXext -lX11
+    LLIBS = -lGL -lGLU -L/usr/X11R6/lib64/ -lXmu -lXext -lX11
     LLIBS += -lc -lm -ldl -lutil
     LOPTS = -export-dynamic
   endif
   ifeq ($(CPU),$(findstring $(CPU), "i386 x86_64 ia64 parisc64 powerpc sparc64"))
     COMMENT = "MESA 3.1"
-    LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi
+    LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib64 -lXmu -lXext -lX11 -lXi
     LLIBS += -lutil -lc -lm -ldl -lpthread 
-#    LLIBS += -L$(NAN_ODE)/lib -lode
+#    LLIBS += -L$(NAN_ODE)/lib64 -lode
     LOPTS = -export-dynamic
     DADD = -lGL -lGLU
-    SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a
+    SADD = $(NAN_MESA)/lib64/libGL.a $(NAN_MESA)/lib64/libGLU.a
     DYNLDFLAGS = -shared $(LDFLAGS)
   endif
     LLIBS += -lz
--- blender/source/gameengine/Physics/Sumo/Fuzzics/sample/Makefile.lib64	2004-03-22 23:02:09.000000000 +0100
+++ blender/source/gameengine/Physics/Sumo/Fuzzics/sample/Makefile	2006-12-17 21:46:40.000000000 +0100
@@ -14,7 +14,7 @@
 	@$(RM) $(DIR)/particle $(DIR)/particle0
 	@$(RM) $(DIR)/debug/particle $(DIR)/debug/particle0
 
-LDFLAGS  = -L$(DIR) -L/usr/X11R6/lib
+LDFLAGS  = -L$(DIR) -L/usr/X11R6/lib64
 OGL_LDLIBS = -lglut -lGLU -lGL -pthread
 LDLIBS   = -lfuzzics -lsolid $(NAN_MOTO)/lib/libmoto.a $(OGL_LDLIBS)