kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

was curious if makefile still worked. they didnt, found 2 problems

Browse Source 
- use our own openjpeg.
- libXmu isnt found/needed on ubuntu 10.04, removing, can add back if it breaks for someone else.
This commit is contained in:
Campbell Barton 2010-05-23 17:45:08 +00:00
parent 70905d06f1
commit 3251d9d523
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/nan_definitions.mk
View File

@ -412,12 +412,6 @@ ifndef CONFIG_GUESS
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...

2
source/nan_link.mk
View File

@ -108,7 +108,7 @@ ifeq ($(OS),linux)
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