[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28937] trunk/blender/source: was curious if makefile still worked.

[Campbell Barton]

Revision: 28937
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28937
Author:   campbellbarton
Date:     2010-05-23 19:45:08 +0200 (Sun, 23 May 2010)

Log Message:
-----------
was curious if makefile still worked. they didnt, found 2 problems
- use our own openjpeg.
- libXmu isnt found/needed on ubuntu 10.04, removing, can add back if it breaks for someone else.

Modified Paths:
--------------
    trunk/blender/source/nan_definitions.mk
    trunk/blender/source/nan_link.mk

Modified: trunk/blender/source/nan_definitions.mk
===================================================================
--- trunk/blender/source/nan_definitions.mk	2010-05-23 17:11:44 UTC (rev 28936)
+++ trunk/blender/source/nan_definitions.mk	2010-05-23 17:45:08 UTC (rev 28937)
@@ -412,12 +412,6 @@
       export BF_FFTW3_LIBS ?= $(shell pkg-config --libs fftw3 )
     endif
 
-    ifeq ($(WITH_OPENJPEG), true)
-      export BF_OPENJPEG ?= /usr
-      export BF_OPENJPEG_INC ?= /usr/include
-      export BF_OPENJPEG_LIBS ?= -lopenjpeg
-    endif
-
     # Uncomment the following line to use Mozilla inplace of netscape
 
     # Location of MOZILLA/Netscape header files...

Modified: trunk/blender/source/nan_link.mk
===================================================================
--- trunk/blender/source/nan_link.mk	2010-05-23 17:11:44 UTC (rev 28936)
+++ trunk/blender/source/nan_link.mk	2010-05-23 17:45:08 UTC (rev 28937)
@@ -108,7 +108,7 @@
   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/lib -lXext -lX11 -lXi
     LLIBS += -lutil -lc -lm -ldl -lpthread
     LLIBS += -L$(NAN_PYTHON)/lib -Wl,-rpath -Wl,$(NAN_PYTHON)/lib -lpython$(NAN_PYTHON_VERSION)
     LOPTS = -export-dynamic