(OSX PPC) Merge

This commit is contained in:
neville 2016-01-14 13:37:53 +01:00
parent beb3619cca
commit 9211073bf5

View File

@ -282,7 +282,7 @@
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"-DHAVE_GRIFFIN",
"-DHAVE_CHEEVOS",
"-DHAVE_CHEEVOS",
"-DHAVE_STB_FONT",
"-DHAVE_IOHIDMANAGER",
"-DHAVE_RGUI",
@ -352,7 +352,7 @@
"-DNS_BLOCK_ASSERTIONS=1",
"-DNDEBUG",
"-DHAVE_GRIFFIN",
"-DHAVE_CHEEVOS",
"-DHAVE_CHEEVOS",
"-DHAVE_STB_FONT",
"-DHAVE_IOHIDMANAGER",
"-DHAVE_RGUI",