From 1bd3e32ad75496c5c12775dc261c0e909e10c6cb Mon Sep 17 00:00:00 2001 From: warmenhoven Date: Thu, 26 Jan 2023 17:36:51 -0500 Subject: [PATCH] RetroArch_iOS13_Metal.xcodeproj updates (#14910) * No changes here, just alphabetizing the defines * No need to define cflags for arch=* * Bring debug and release more in line with each other * Make sure to define HAVE_UPDATE_CORE_INFO --- .../RetroArch_iOS13.xcodeproj/project.pbxproj | 325 ++++++++---------- 1 file changed, 134 insertions(+), 191 deletions(-) diff --git a/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj index c22af3238f..ea4e26cacb 100644 --- a/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj @@ -1523,79 +1523,82 @@ ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( "-DDONT_WANT_ARM_OPTIMIZATIONS", - "-DHAVE_NETWORKGAMEPAD", - "-DHAVE_STB_FONT", - "-DHAVE_HID", - "-DHAVE_NETWORKING", - "-DHAVE_IFINFO", - "-DHAVE_NETPLAYDISCOVERY", - "-DHAVE_RUNAHEAD", - "-DHAVE_TRANSLATE", - "-DHAVE_GRIFFIN", - "-DHAVE_STB_VORBIS", - "-DHAVE_MINIUPNPC", - "-DHAVE_BUILTINMINIUPNPC", - "-DHAVE_UPDATE_ASSETS", - "-DHAVE_ONLINE_UPDATER", - "-DHAVE_LANGEXTRA", - "-DHAVE_CHEEVOS", - "-DRC_DISABLE_LUA", - "-DHAVE_IMAGEVIEWER", - "-DHAVE_RGUI", - "-DHAVE_CONFIGFILE", - "-DHAVE_MENU", - "-DHAVE_GFX_WIDGETS", - "-DHAVE_LIBRETRODB", + "-DENABLE_HLSL", + "-DGLSLANG_OSINCLUDE_UNIX", + "-DHAVE_7ZIP", "-DHAVE_AUDIOMIXER", - "-DIOS", - "-DHAVE_OPENGL", - "-DHAVE_OPENGLES", - "-DHAVE_IOS_CUSTOMKEYBOARD", - "-DHAVE_OPENGLES2", + "-DHAVE_BTSTACK", + "-DHAVE_BUILTINGLSLANG", + "-DHAVE_BUILTINMINIUPNPC", "-DHAVE_CC_RESAMPLER", - "-DHAVE_GLSL", - "-DINLINE=inline", - "-D__LIBRETRO__", - "-DRARCH_MOBILE", + "-DHAVE_CHEATS", + "-DHAVE_CHEEVOS", + "-DHAVE_COCOATOUCH", + "-DHAVE_COCOA_METAL", + "-DHAVE_CONFIGFILE", "-DHAVE_COREAUDIO", "-DHAVE_DYNAMIC", - "-DHAVE_OVERLAY", - "-DHAVE_VIDEO_LAYOUT", - "-DHAVE_ZLIB", - "-DHAVE_RPNG", - "-DHAVE_RJPEG", - "-DHAVE_RBMP", - "-DHAVE_RTGA", - "-DHAVE_COCOATOUCH", - "-DHAVE_MAIN", - "-DRARCH_INTERNAL", - "-DHAVE_THREADS", "-DHAVE_FILTERS_BUILTIN", - "-DHAVE_MATERIALUI", - "-DHAVE_XMB", - "-DHAVE_OZONE", - "-DHAVE_SHADERPIPELINE", - "-D_LZMA_UINT32_IS_ULONG", - "-DHAVE_MFI", - "-DHAVE_KEYMAPPER", - "-DHAVE_COCOA_METAL", - "-DHAVE_METAL", - "-DHAVE_SLANG", - "-DHAVE_SPIRV_CROSS", + "-DHAVE_GFX_WIDGETS", + "-DHAVE_GLSL", "-DHAVE_GLSLANG", - "-DWANT_GLSLANG", - "-DGLSLANG_OSINCLUDE_UNIX", - "-DENABLE_HLSL", - "-DHAVE_BUILTINGLSLANG", - "-DHAVE_CHEATS", - "-DHAVE_BTSTACK", + "-DHAVE_GRIFFIN", + "-DHAVE_HID", + "-DHAVE_IFINFO", + "-DHAVE_IMAGEVIEWER", + "-DHAVE_IOS_CUSTOMKEYBOARD", + "-DHAVE_IOS_SWIFT", + "-DHAVE_IOS_TOUCHMOUSE", + "-DHAVE_KEYMAPPER", + "-DHAVE_LANGEXTRA", + "-DHAVE_LIBRETRODB", + "-DHAVE_MAIN", + "-DHAVE_MATERIALUI", + "-DHAVE_MENU", + "-DHAVE_METAL", + "-DHAVE_MFI", + "-DHAVE_MINIUPNPC", + "-DHAVE_NETPLAYDISCOVERY", + "-DHAVE_NETWORKGAMEPAD", + "-DHAVE_NETWORKING", + "-DHAVE_ONLINE_UPDATER", + "-DHAVE_OPENGL", + "-DHAVE_OPENGLES", + "-DHAVE_OPENGLES2", + "-DHAVE_OVERLAY", + "-DHAVE_OZONE", + "-DHAVE_PATCH", + "-DHAVE_RBMP", + "-DHAVE_REWIND", + "-DHAVE_RGUI", + "-DHAVE_RJPEG", + "-DHAVE_RPNG", + "-DHAVE_RTGA", + "-DHAVE_RUNAHEAD", "-DHAVE_RWAV", "-DHAVE_SCREENSHOTS", - "-DHAVE_REWIND", - "-DHAVE_PATCH", - "-DHAVE_IOS_CUSTOMKEYBOARD", - "-DHAVE_IOS_TOUCHMOUSE", - "-DHAVE_IOS_SWIFT", + "-DHAVE_SHADERPIPELINE", + "-DHAVE_SLANG", + "-DHAVE_SPIRV_CROSS", + "-DHAVE_STB_FONT", + "-DHAVE_STB_VORBIS", + "-DHAVE_THREADS", + "-DHAVE_TRANSLATE", + "-DHAVE_UPDATE_ASSETS", + "-DHAVE_UPDATE_CORE_INFO", + "-DHAVE_VIDEO_LAYOUT", + "-DHAVE_VULKAN", + "-DHAVE_XMB", + "-DHAVE_ZLIB", + "-DINLINE=inline", + "-DIOS", + "-DRARCH_INTERNAL", + "-DRARCH_MOBILE", + "-DRC_DISABLE_LUA", + "-DWANT_GLSLANG", + "-D_7ZIP_ST", + "-D_LZMA_UINT32_IS_ULONG", + "-D__LIBRETRO__", ); PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchiOS11; PRODUCT_NAME = RetroArch; @@ -1653,144 +1656,85 @@ MARKETING_VERSION = 1.14.0; MTL_FAST_MATH = YES; OTHER_CFLAGS = ( - "-DNS_BLOCK_ASSERTIONS=1", - "-DNDEBUG", - "-DDONT_WANT_ARM_ASM_OPTIMIZATIONS", - "-DHAVE_NETWORKGAMEPAD", - "-DHAVE_STB_FONT", - "-DHAVE_HID", - "-DHAVE_NETWORKING", - "-DHAVE_IFINFO", - "-DHAVE_NETPLAYDISCOVERY", - "-DHAVE_RUNAHEAD", - "-DHAVE_TRANSLATE", - "-DHAVE_GRIFFIN", - "-DHAVE_STB_VORBIS", - "-DHAVE_MINIUPNPC", - "-DHAVE_BUILTINMINIUPNPC", - "-DHAVE_UPDATE_ASSETS", - "-DHAVE_ONLINE_UPDATER", - "-DHAVE_LANGEXTRA", - "-DHAVE_CHEEVOS", - "-DRC_DISABLE_LUA", - "-DHAVE_IMAGEVIEWER", - "-DHAVE_RGUI", - "-DHAVE_CONFIGFILE", - "-DHAVE_MENU", - "-DHAVE_GFX_WIDGETS", - "-DHAVE_LIBRETRODB", + "-DDONT_WANT_ARM_OPTIMIZATIONS", + "-DENABLE_HLSL", + "-DGLSLANG_OSINCLUDE_UNIX", + "-DHAVE_7ZIP", "-DHAVE_AUDIOMIXER", - "-DIOS", + "-DHAVE_BTSTACK", + "-DHAVE_BUILTINGLSLANG", + "-DHAVE_BUILTINMINIUPNPC", + "-DHAVE_CC_RESAMPLER", + "-DHAVE_CHEATS", + "-DHAVE_CHEEVOS", + "-DHAVE_COCOATOUCH", + "-DHAVE_COCOA_METAL", + "-DHAVE_CONFIGFILE", + "-DHAVE_COREAUDIO", "-DHAVE_DYNAMIC", + "-DHAVE_FILTERS_BUILTIN", + "-DHAVE_GFX_WIDGETS", + "-DHAVE_GLSL", + "-DHAVE_GLSLANG", + "-DHAVE_GRIFFIN", + "-DHAVE_HID", + "-DHAVE_IFINFO", + "-DHAVE_IMAGEVIEWER", + "-DHAVE_IOS_CUSTOMKEYBOARD", + "-DHAVE_IOS_SWIFT", + "-DHAVE_IOS_TOUCHMOUSE", + "-DHAVE_KEYMAPPER", + "-DHAVE_LANGEXTRA", + "-DHAVE_LIBRETRODB", + "-DHAVE_MAIN", + "-DHAVE_MATERIALUI", + "-DHAVE_MENU", + "-DHAVE_METAL", + "-DHAVE_MFI", + "-DHAVE_MINIUPNPC", + "-DHAVE_NETPLAYDISCOVERY", + "-DHAVE_NETWORKGAMEPAD", + "-DHAVE_NETWORKING", + "-DHAVE_ONLINE_UPDATER", "-DHAVE_OPENGL", "-DHAVE_OPENGLES", "-DHAVE_OPENGLES2", - "-DHAVE_CC_RESAMPLER", - "-DHAVE_GLSL", - "-DINLINE=inline", - "-DHAVE_THREADS", - "-D__LIBRETRO__", - "-DRARCH_MOBILE", - "-std=gnu99", - "-DHAVE_COREAUDIO", "-DHAVE_OVERLAY", - "-DHAVE_VIDEO_LAYOUT", - "-DHAVE_ZLIB", - "-DHAVE_RPNG", - "-DHAVE_RJPEG", + "-DHAVE_OZONE", + "-DHAVE_PATCH", "-DHAVE_RBMP", + "-DHAVE_REWIND", + "-DHAVE_RGUI", + "-DHAVE_RJPEG", + "-DHAVE_RPNG", "-DHAVE_RTGA", - "-DHAVE_COCOATOUCH", - "-DHAVE_MAIN", - "-DHAVE_CHEATS", - "-DHAVE_BTSTACK", + "-DHAVE_RUNAHEAD", "-DHAVE_RWAV", "-DHAVE_SCREENSHOTS", - "-DHAVE_REWIND", - "-DHAVE_PATCH", - "-DHAVE_IOS_CUSTOMKEYBOARD", - "-DHAVE_IOS_TOUCHMOUSE", - "-DHAVE_IOS_SWIFT", - ); - "OTHER_CFLAGS[arch=*]" = ( - "-DNS_BLOCK_ASSERTIONS=1", - "-DNDEBUG", - "-DDONT_WANT_ARM_ASM_OPTIMIZATIONS", - "-DHAVE_NETWORKGAMEPAD", - "-DHAVE_STB_FONT", - "-DHAVE_HID", - "-DHAVE_NETWORKING", - "-DHAVE_IFINFO", - "-DHAVE_NETPLAYDISCOVERY", - "-DHAVE_RUNAHEAD", - "-DHAVE_TRANSLATE", - "-DHAVE_GRIFFIN", - "-DHAVE_STB_VORBIS", - "-DHAVE_MINIUPNPC", - "-DHAVE_BUILTINMINIUPNPC", - "-DHAVE_UPDATE_ASSETS", - "-DHAVE_ONLINE_UPDATER", - "-DHAVE_LANGEXTRA", - "-DHAVE_CHEEVOS", - "-DRC_DISABLE_LUA", - "-DHAVE_IMAGEVIEWER", - "-DHAVE_RGUI", - "-DHAVE_CONFIGFILE", - "-DHAVE_MENU", - "-DHAVE_GFX_WIDGETS", - "-DHAVE_LIBRETRODB", - "-DHAVE_AUDIOMIXER", - "-DIOS", - "-DHAVE_OPENGL", - "-DHAVE_OPENGLES", - "-DHAVE_CC_RESAMPLER", - "-DHAVE_GLSL", - "-DINLINE=inline", - "-D__LIBRETRO__", - "-DRARCH_MOBILE", - "-DHAVE_COREAUDIO", - "-DHAVE_DYNAMIC", - "-DRARCH_INTERNAL", - "-DHAVE_OVERLAY", - "-DHAVE_VIDEO_LAYOUT", - "-DHAVE_ZLIB", - "-DHAVE_RPNG", - "-DHAVE_RJPEG", - "-DHAVE_RBMP", - "-DHAVE_RTGA", - "-DHAVE_COCOATOUCH", - "-DHAVE_MAIN", - "-DHAVE_THREADS", - "-DHAVE_FILTERS_BUILTIN", - "-DHAVE_7ZIP", - "-D_7ZIP_ST", - "-DHAVE_MATERIALUI", - "-DHAVE_XMB", - "-DHAVE_OZONE", "-DHAVE_SHADERPIPELINE", - "-D_LZMA_UINT32_IS_ULONG", - "-DHAVE_MFI", - "-DHAVE_KEYMAPPER", - "-DHAVE_COCOA_METAL", - "-DHAVE_METAL", "-DHAVE_SLANG", "-DHAVE_SPIRV_CROSS", - "-DHAVE_GLSLANG", - "-DWANT_GLSLANG", - "-DGLSLANG_OSINCLUDE_UNIX", - "-DENABLE_HLSL", - "-DHAVE_BUILTINGLSLANG", - "-DHAVE_CHEATS", - "-DHAVE_SCREENSHOTS", - "-DHAVE_REWIND", - "-DHAVE_PATCH", - "-DHAVE_RWAV", - "-DHAVE_BTSTACK", - "-DHAVE_OPENGLES2", - "-DHAVE_IOS_CUSTOMKEYBOARD", - "-DHAVE_IOS_TOUCHMOUSE", - "-DHAVE_IOS_SWIFT", + "-DHAVE_STB_FONT", + "-DHAVE_STB_VORBIS", + "-DHAVE_THREADS", + "-DHAVE_TRANSLATE", + "-DHAVE_UPDATE_ASSETS", + "-DHAVE_UPDATE_CORE_INFO", + "-DHAVE_VIDEO_LAYOUT", "-DHAVE_VULKAN", + "-DHAVE_XMB", + "-DHAVE_ZLIB", + "-DINLINE=inline", + "-DIOS", + "-DNDEBUG", + "-DNS_BLOCK_ASSERTIONS=1", + "-DRARCH_INTERNAL", + "-DRARCH_MOBILE", + "-DRC_DISABLE_LUA", + "-DWANT_GLSLANG", + "-D_7ZIP_ST", + "-D_LZMA_UINT32_IS_ULONG", + "-D__LIBRETRO__", ); PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchiOS11; PRODUCT_NAME = RetroArch; @@ -2252,7 +2196,7 @@ ); ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( - "-DDONT_WANT_ARM_ASM_OPTIMIZATIONS", + "-DDONT_WANT_ARM_OPTIMIZATIONS", "-DHAVE_NETWORKGAMEPAD", "-DHAVE_STB_FONT", "-DHAVE_HID", @@ -2383,7 +2327,6 @@ "-DHAVE_MAIN", "-DHAVE_VULKAN", ); - "OTHER_CFLAGS[arch=*]" = ""; "OTHER_LDFLAGS[arch=*]" = "-Wl,-segalign,4000"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2";