From de0132cd43acd06de791c2cb2612a799b0f3aa9e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 6 Jan 2013 14:41:55 +0100 Subject: [PATCH] (NGC) Some build fixes --- Makefile.ngc | 2 +- console/logger/logger_override.h | 5 +++-- console/rarch_console_config.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.ngc b/Makefile.ngc index 0da346a4fe..0a31c32016 100644 --- a/Makefile.ngc +++ b/Makefile.ngc @@ -56,7 +56,7 @@ CFLAGS += -DHAVE_FILE_LOGGER CFLAGS += -Iconsole/logger endif -CFLAGS += -std=gnu99 -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_RGUI -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC -DGEKKO -DHAVE_ZLIB -DWANT_RZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DPACKAGE_VERSION=\"0.9.8-beta3\" -Dmain=rarch_main -Wno-char-subscripts +CFLAGS += -std=gnu99 -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_RMENU -DHAVE_RGUI -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC -DGEKKO -DHAVE_ZLIB -DWANT_RZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DPACKAGE_VERSION=\"0.9.8-beta3\" -Dmain=rarch_main -Wno-char-subscripts ifeq ($(DEBUG), 1) CFLAGS += -O0 -g diff --git a/console/logger/logger_override.h b/console/logger/logger_override.h index 2fd37cf846..06745b6eff 100644 --- a/console/logger/logger_override.h +++ b/console/logger/logger_override.h @@ -5,8 +5,7 @@ * RetroArch is free software: you can redistribute it and/or modify it under the terms * of the GNU General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * @@ -59,3 +58,5 @@ #endif #endif + +#endif diff --git a/console/rarch_console_config.c b/console/rarch_console_config.c index 5e5c6f6931..455f3ae905 100644 --- a/console/rarch_console_config.c +++ b/console/rarch_console_config.c @@ -60,7 +60,7 @@ void rarch_config_load (void) CONFIG_GET_BOOL(audio.rate_control, "audio_rate_control"); CONFIG_GET_FLOAT(audio.rate_control_delta, "audio_rate_control_delta"); - for (unsigned i = 0; i < MAX_PADS; i++) + for (unsigned i = 0; i < 8; i++) { char cfg[64]; snprintf(cfg, sizeof(cfg), "input_dpad_emulation_p%u", i + 1);