diff options
author | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
commit | bb7339a7aec37bdb2ee8a21599e6c65b37ef1277 (patch) | |
tree | 6fb8da94c6e43098c606f768e722484b04b8645c /source/Makefile | |
parent | 37f2c8a64c3277f100ab084ef1bb3846bc7b2c62 (diff) | |
parent | 8a320974f1b3e6004db3b3ad64f97742f878cbee (diff) |
merge with trunk at r31523
Diffstat (limited to 'source/Makefile')
-rw-r--r-- | source/Makefile | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/source/Makefile b/source/Makefile index 12e47ba5863..1055c2a94e9 100644 --- a/source/Makefile +++ b/source/Makefile @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. # All rights reserved. @@ -109,38 +109,37 @@ COMLIB += $(NAN_JPEG)/lib/libjpeg.a COMLIB += $(OCGDIR)/blender/gpu/$(DEBUG_DIR)libgpu.a COMLIB += $(NAN_GLEW)/lib/$(DEBUG_DIR)libglew.a COMLIB += $(OCGDIR)/blender/blenfont/$(DEBUG_DIR)libblenfont.a +COMLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a +COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a +COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_python.a COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_src.a COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fx.a COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sdl.a -COMLIB += $(NAN_SAMPLERATE)/lib/$(DEBUG_DIR)libsamplerate.a -COMLIB += $(NAN_LZO)/lib/$(DEBUG_DIR)libminilzo.a -COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a -COMLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a -COMLIB += $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.a -COMLIB += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a -COMLIB += $(NAN_DECIMATION)/lib/$(DEBUG_DIR)libdecimation.a -COMLIB += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a - ifeq ($(WITH_FFMPEG),true) COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_ffmpeg.a endif - ifeq ($(WITH_OPENAL),true) COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_openal.a endif - ifeq ($(WITH_JACK),true) COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_jack.a endif - ifeq ($(WITH_SNDFILE),true) COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_sndfile.a endif - ifeq ($(WITH_FFTW3),true) COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fftw.a endif +COMLIB += $(NAN_SAMPLERATE)/lib/$(DEBUG_DIR)libsamplerate.a +COMLIB += $(NAN_LZO)/lib/$(DEBUG_DIR)libminilzo.a +COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a +COMLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a +COMLIB += $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.a +COMLIB += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a +COMLIB += $(NAN_DECIMATION)/lib/$(DEBUG_DIR)libdecimation.a +COMLIB += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a + ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a @@ -204,7 +203,9 @@ ifeq ($(WITH_OPENJPEG), true) endif endif -COMLIB += $(OCGDIR)/blender/imbuf/cineon/$(DEBUG_DIR)libcineon.a +ifeq ($(WITH_CINEON), true) + COMLIB += $(OCGDIR)/blender/imbuf/cineon/$(DEBUG_DIR)libcineon.a +endif ifeq ($(WITH_DDS), true) COMLIB += $(OCGDIR)/blender/imbuf/dds/$(DEBUG_DIR)libdds.a @@ -418,7 +419,7 @@ ifeq ($(WITH_JACK),true) endif ifeq ($(WITH_SNDFILE),true) - ifeq ($(OS),$(findstring $(OS), "linux")) + ifeq ($(OS),$(findstring $(OS), "linux darwin")) NAN_SND_LIBS += $(NAN_SNDFILELIBS) endif endif |