(OSX) Define -DHAVE_MENU

This commit is contained in:
twinaphex 2014-02-11 06:26:48 +11:00
parent a7a45ecb64
commit 7d7e32df47
9 changed files with 14 additions and 1 deletions

View File

@ -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";

View File

@ -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));