diff options
| author | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2010-08-17 05:50:47 +0400 |
|---|---|---|
| committer | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2010-08-17 05:50:47 +0400 |
| commit | d03c94d8d95513fb1593a61391ec152cbc4bc39f (patch) | |
| tree | f3b6f54d518993d7e30aae3696499d07dcfbe25d /source/Makefile | |
| parent | 29ea841d1e9e8f105dd926c04e75206a6c0f03c7 (diff) | |
Group all AUD libs, duplicate one to avoid linker error.
Diffstat (limited to 'source/Makefile')
| -rw-r--r-- | source/Makefile | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/source/Makefile b/source/Makefile index cd8d826705e..1055c2a94e9 100644 --- a/source/Makefile +++ b/source/Makefile @@ -111,38 +111,35 @@ 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_AUDASPACE)/lib/$(DEBUG_DIR)libaud_python.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 |