diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/RetroArch_OSX_PPC.xcodeproj/project.pbxproj b/apple/RetroArch_OSX_PPC.xcodeproj/RetroArch_OSX_PPC.xcodeproj/project.pbxproj index e25928bebb..072a58e02c 100644 --- a/apple/RetroArch_OSX_PPC.xcodeproj/RetroArch_OSX_PPC.xcodeproj/project.pbxproj +++ b/apple/RetroArch_OSX_PPC.xcodeproj/RetroArch_OSX_PPC.xcodeproj/project.pbxproj @@ -237,11 +237,16 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + GCC_ALTIVEC_EXTENSIONS = NO; GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; + OTHER_CFLAGS = ( + "-DHAVE_DYNAMIC,", + "-DHAVE_MENU", + ); PREBINDING = NO; SDKROOT = macosx10.5; }; @@ -251,10 +256,14 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - GCC_ALTIVEC_EXTENSIONS = YES; + GCC_ALTIVEC_EXTENSIONS = NO; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + OTHER_CFLAGS = ( + "-DHAVE_DYNAMIC,", + "-DHAVE_MENU", + ); PREBINDING = NO; SDKROOT = macosx10.5; VALID_ARCHS = "ppc ppc64 ppc7400 ppc970"; diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/cdecls.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/cdecls.pbxbtree index ff36a73e3a..76fad2c48a 100644 Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/cdecls.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/cdecls.pbxbtree differ diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/decls.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/decls.pbxbtree index 536017dab5..31e07ec61b 100644 Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/decls.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/decls.pbxbtree differ diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/imports.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/imports.pbxbtree index 8383bdeb1c..30cba25799 100644 Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/imports.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/imports.pbxbtree differ diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/pbxindex.header b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/pbxindex.header index 14aedffa9b..1e1f6a0ad5 100644 Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/pbxindex.header and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/pbxindex.header differ diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/refs.pbxbtree b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/refs.pbxbtree index 34c7f592fc..2cea1a2f6d 100644 Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/refs.pbxbtree and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/refs.pbxbtree differ diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/control b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/control index 15b36d4e4c..b4c616ce51 100644 Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/control and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/strings.pbxstrings/control differ diff --git a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/symbols0.pbxsymbols b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/symbols0.pbxsymbols index 3ac8c8a631..f4848d5edc 100644 Binary files a/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/symbols0.pbxsymbols and b/apple/RetroArch_OSX_PPC.xcodeproj/build/RetroArch_OSX_PPC.build/RetroArch_OSX_PPC.pbxindex/symbols0.pbxsymbols differ diff --git a/settings.c b/settings.c index 41521fead3..49738591a6 100644 --- a/settings.c +++ b/settings.c @@ -306,7 +306,9 @@ void config_set_defaults(void) g_settings.stdin_cmd_enable = stdin_cmd_enable; g_settings.game_history_size = game_history_size; +#ifdef HAVE_MENU g_settings.rgui_show_start_screen = rgui_show_start_screen; +#endif rarch_assert(sizeof(g_settings.input.binds[0]) >= sizeof(retro_keybinds_1)); rarch_assert(sizeof(g_settings.input.binds[1]) >= sizeof(retro_keybinds_rest)); @@ -456,12 +458,14 @@ static void config_load_core_specific(void) ) return; +#ifdef HAVE_MENU if (*g_settings.rgui_config_directory) { path_resolve_realpath(g_settings.rgui_config_directory, sizeof(g_settings.rgui_config_directory)); strlcpy(g_extern.core_specific_config_path, g_settings.rgui_config_directory, sizeof(g_extern.core_specific_config_path)); } else +#endif { // Use original config file's directory as a fallback. fill_pathname_basedir(g_extern.core_specific_config_path, g_extern.config_path, sizeof(g_extern.core_specific_config_path));