[mupen64plus-video-z64] 76/161: Imported Upstream version 1.99.4+29+901fe271524a

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-z64.

commit 6aedaaf28466d3bc5553548abe08b156ab158b3f
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Nov 12 17:33:06 2011 +0100

    Imported Upstream version 1.99.4+29+901fe271524a
---
 projects/unix/Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index 30a3c2f..88fd9a3 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -114,6 +114,9 @@ LDFLAGS += $(SHARED)
 ifeq ($(PIC), 1)
   CFLAGS += -fPIC
   LDFLAGS += -fPIC
+else
+  CFLAGS += -fno-PIC
+  LDFLAGS += -fno-PIC
 endif
 
 ifeq ($(BIG_ENDIAN), 1)
@@ -137,11 +140,11 @@ endif
 ifeq ($(OS), OSX)
   ifeq ($(CPU), X86)
     ifeq ($(ARCH_DETECTED), 64BITS)
-      CFLAGS += -pipe -O3 -arch x86_64 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+      CFLAGS += -pipe -arch x86_64 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
       LDFLAGS += -bundle -framework OpenGL -arch x86_64
       LDLIBS += -ldl
     else
-      CFLAGS += -pipe -O3 -mmmx -msse -fomit-frame-pointer -arch i686 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+      CFLAGS += -pipe -mmmx -msse -fomit-frame-pointer -arch i686 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
       LDFLAGS += -bundle -framework OpenGL -arch i686
       LDLIBS += -ldl
     endif
@@ -279,11 +282,11 @@ TARGET = mupen64plus-video-z64.$(SO_EXTENSION)
 targets:
 	@echo "Mupen64plus-video-z64 N64 Graphics plugin makefile. "
 	@echo "  Targets:"
-	@echo "    all           == Build Mupen64plus-video-rice plugin"
+	@echo "    all           == Build Mupen64plus-video-z64 plugin"
 	@echo "    clean         == remove object files"
 	@echo "    rebuild       == clean and re-build all"
-	@echo "    install       == Install Mupen64Plus-video-rice plugin"
-	@echo "    uninstall     == Uninstall Mupen64Plus-video-rice plugin"
+	@echo "    install       == Install Mupen64Plus-video-z64 plugin"
+	@echo "    uninstall     == Uninstall Mupen64Plus-video-z64 plugin"
 	@echo "  Options:"
 	@echo "    BITS=32       == build 32-bit binaries on 64-bit machine"
 	@echo "    APIDIR=path   == path to find Mupen64Plus Core headers"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-z64.git