summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
author Oliver Stöneberg <firewave@users.noreply.github.com>2013-01-01 20:59:25 +0000
committer Oliver Stöneberg <firewave@users.noreply.github.com>2013-01-01 20:59:25 +0000
commit8049cf1f6333e2d1c3a0614d870f472a7b94826d (patch)
treefc853c1cd49c79a3b6b28db804419431f81737cc /src/lib
parent747289faf7a089305df0b7cb07a7fc0437c6d574 (diff)
fixed portmidi library name / removed overwrite of ARCH when compiling libflac (nw)
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/lib.mak16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/lib/lib.mak b/src/lib/lib.mak
index 0a660b48d28..e7da9a7738f 100644
--- a/src/lib/lib.mak
+++ b/src/lib/lib.mak
@@ -308,21 +308,13 @@ $(LIBOBJ)/libjpeg/%.o: $(LIBSRC)/libjpeg/%.c | $(OSPREBUILD)
ifeq ($(TARGETOS),macosx)
ifdef BIGENDIAN
-ifeq ($(PTR64),1)
-ARCHFLAGS = -arch ppc64 -DWORDS_BIGENDIAN=1
+ARCHFLAGS = -DWORDS_BIGENDIAN=1
else
-ARCHFLAGS = -arch ppc -DWORDS_BIGENDIAN=1
+ARCHFLAGS = -DWORDS_BIGENDIAN=0
endif
-else # BIGENDIAN
-ifeq ($(PTR64),1)
-ARCHFLAGS = -arch x86_64 -DWORDS_BIGENDIAN=0
else
-ARCHFLAGS = -m32 -arch i386 -DWORDS_BIGENDIAN=0
-endif
-endif # BIGENDIAN
-else # ifeq ($(TARGETOS),macosx)
ARCHFLAGS = -DWORDS_BIGENDIAN=0
-endif # ifeq ($(TARGETOS),macosx)
+endif
FLACOPTS=-DFLAC__NO_ASM -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H=0 -DFLAC__HAS_OGG=0 -Wno-unused-function $(ARCHFLAGS)
@@ -423,7 +415,7 @@ LIBPMOBJS += \
$(LIBOBJ)/portmidi/ptwinmm.o
endif
-$(OBJ)/portmidi.a: $(LIBPMOBJS)
+$(OBJ)/libportmidi.a: $(LIBPMOBJS)
$(LIBOBJ)/portmidi/%.o: $(LIBSRC)/portmidi/%.c | $(OSPREBUILD)
@echo Compiling $<...