removed static versions of osx codec import libs.

renamed osx codec dylib import lib directory to be lib.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@706 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2012-09-04 07:39:43 +00:00
parent 6affd7013f
commit a0b0609b2d
17 changed files with 3 additions and 5 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,4 +1,4 @@
# GNU Makefile for QuakeSpasm for Darwin, May 30, 2012
# GNU Makefile for QuakeSpasm for Mac OS X, Sep. 03, 2012.
# Usage: "make -f Makefile.darwin"
# You need the SDL library fully installed.
# "make DEBUG=1" to build a debug client.
@ -118,8 +118,6 @@ cpp_vorbisdec=-DVORBIS_USE_TREMOR
lib_vorbisdec=-lvorbisidec -logg
endif
#codeclibdir=$(MACH_TYPE)
codeclibdir=fat
CODECLIBS :=
ifeq ($(USE_CODEC_WAVE),1)
CFLAGS+= -DUSE_CODEC_WAVE
@ -127,13 +125,13 @@ endif
ifeq ($(USE_CODEC_VORBIS),1)
CFLAGS+= -DUSE_CODEC_VORBIS $(cpp_vorbisdec)
CODEC_INC = -I../MacOSX/codecs/include
CODEC_LINK= -L../MacOSX/codecs/$(codeclibdir)
CODEC_LINK= -L../MacOSX/codecs/lib
CODECLIBS+= $(lib_vorbisdec)
endif
ifeq ($(USE_CODEC_MP3),1)
CFLAGS+= -DUSE_CODEC_MP3
CODEC_INC = -I../MacOSX/codecs/include
CODEC_LINK= -L../MacOSX/codecs/$(codeclibdir)
CODEC_LINK= -L../MacOSX/codecs/lib
CODECLIBS+= $(lib_mp3dec)
endif
CFLAGS+= $(CODEC_INC)