[mupen64plus-ui-console] 82/172: Imported Upstream version 1.99.4+27+bdcc13172958

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-ui-console.

commit b6ec64f954bc910bc28b0f54d9b3595c4b1d7d9f
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Nov 12 20:26:26 2011 +0100

    Imported Upstream version 1.99.4+27+bdcc13172958
---
 projects/unix/Makefile | 7 +++++--
 src/cheat.c            | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/projects/unix/Makefile b/projects/unix/Makefile
index 2c969b5..c747910 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -89,6 +89,9 @@ LDLIBS += -pthread
 ifeq ($(PIE), 1)
   CFLAGS += -fPIE
   LDFLAGS += -fPIE -pie
+else
+  CFLAGS += -fno-PIE
+  LDFLAGS += -fno-PIE
 endif
 
 # set special flags per-system
@@ -100,10 +103,10 @@ ifeq ($(OS), OSX)
   LDLIBS += -ldl $(shell sdl-config --libs)
   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 += -arch x86_64
     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 += -arch i686
     endif
   endif
diff --git a/src/cheat.c b/src/cheat.c
index 952cdb6..ab26073 100644
--- a/src/cheat.c
+++ b/src/cheat.c
@@ -360,7 +360,7 @@ void CheatStart(eCheatMode CheatMode, char *CheatNumList)
 
     /* generate section name from ROM's CRC and country code */
     char RomSection[24];
-    sprintf(RomSection, "%X-%X-C:%X", sl(l_RomHeader.CRC1), sl(l_RomHeader.CRC2), l_RomHeader.Country_code & 0xff);
+    sprintf(RomSection, "%08X-%08X-C:%X", sl(l_RomHeader.CRC1), sl(l_RomHeader.CRC2), l_RomHeader.Country_code & 0xff);
 
     /* parse through the cheat INI file and load up any cheat codes found for this ROM */
     ReadCheats(RomSection);

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