From 8049cf1f6333e2d1c3a0614d870f472a7b94826d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20St=C3=B6neberg?=
 <firewave@users.noreply.github.com>
Date: Tue, 1 Jan 2013 20:59:25 +0000
Subject: [PATCH] fixed portmidi library name / removed overwrite of ARCH when
 compiling libflac (nw)

---
 src/lib/lib.mak | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 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
-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
+else
+ARCHFLAGS = -DWORDS_BIGENDIAN=0
+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 $<...