diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander index b20c90e3f5..383fc95baf 100644 --- a/Makefile.ps3.salamander +++ b/Makefile.ps3.salamander @@ -15,7 +15,7 @@ PPU_CFLAGS += -DHAVE_LOGGER -Iconsole/logger PPU_SRCS += console/logger/logger.c endif -PPU_TARGET = retroarch-salamander.elf +PPU_TARGET = retroarch-salamander_ps3.elf ifeq ($(CELL_BUILD_TOOLS),SNC) PPU_CFLAGS += -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1 diff --git a/Makefile.wii b/Makefile.wii index 8193c53ba0..e8d636d264 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -62,7 +62,7 @@ $(ELF_TARGET): $(OBJ) $(LD) -r -b binary -o $@ $< pkg: all - cp -r $(DOL_TARGET) wii/pkg/boot.dol + cp -r $(DOL_TARGET) wii/pkg/CORE.dol clean: rm -f $(DOL_TARGET) diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander new file mode 100644 index 0000000000..0b1f7fbb77 --- /dev/null +++ b/Makefile.wii.salamander @@ -0,0 +1,73 @@ +### +## +# Makefile for RetroArch Wii. +## + +DEBUG = 0 +HAVE_LOGGER = 0 +HAVE_FILE_LOGGER = 0 + +PC_DEVELOPMENT_IP_ADDRESS = "192.168.1.7" +PC_DEVELOPMENT_UDP_PORT = 3490 + +CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc +CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++ +LD = $(DEVKITPPC)/bin/powerpc-eabi-ld + +DOL_TARGET := retroarch-salamander_gx.dol +ELF_TARGET := retroarch-salamander_gx.elf + +INCLUDE := -I. -I$(DEVKITPRO)/libogc/include +LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L. + +MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float +CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE) +LDFLAGS := $(MACHDEP) +LIBS := -lfat -lretro_wii -lwiiuse -logc -lbte + +OBJ = wii/salamander/main.o console/rarch_console_exec.o console/rarch_console_libretro_mgmt.o file_path.o compat/compat.o conf/config_file.o console/exec/dol.o + +ifeq ($(HAVE_LOGGER), 1) +CFLAGS += -DHAVE_LOGGER +CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) +CFLAGS += -Iconsole/logger +OBJ += console/logger/logger.o +endif + +ifeq ($(HAVE_FILE_LOGGER), 1) +CFLAGS += -DHAVE_FILE_LOGGER +CFLAGS += -Iconsole/logger +endif + +CFLAGS += -std=gnu99 -DHAVE_DEFAULT_RETROPAD_INPUT -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_RARCH_EXEC -DHAVE_CONFIGFILE=1 -DGEKKO -DHW_RVL -DPACKAGE_VERSION=\"0.9.6\" -Wno-char-subscripts + +ifeq ($(DEBUG), 1) + CFLAGS += -O0 -g +else + CFLAGS += -O3 +endif + +all: $(DOL_TARGET) + +%.dol: %.elf + $(DEVKITPPC)/bin/elf2dol $< $@ + +$(ELF_TARGET): $(OBJ) + $(CXX) -o $@ $(LDFLAGS) $(LIBDIRS) $(OBJ) $(LIBS) + +%.o: %.c + $(CC) $(CFLAGS) -c -o $@ $< + +%.bmpobj: %.bmp + $(LD) -r -b binary -o $@ $< + +pkg: all + cp -r $(DOL_TARGET) wii/pkg/boot.dol + +clean: + rm -f $(DOL_TARGET) + rm -f $(ELF_TARGET) + rm -f $(OBJ) + +.PHONY: clean + diff --git a/console/rarch_console_exec.c b/console/rarch_console_exec.c index 4802f0accd..e863808ede 100644 --- a/console/rarch_console_exec.c +++ b/console/rarch_console_exec.c @@ -28,6 +28,7 @@ #elif defined(GEKKO) #include #include +#include #include "exec/dol.h" #endif diff --git a/wii/salamander/main.c b/wii/salamander/main.c new file mode 100644 index 0000000000..08a0cd9118 --- /dev/null +++ b/wii/salamander/main.c @@ -0,0 +1,141 @@ +/* RetroArch - A frontend for libretro. + * Copyright (C) 2010-2012 - Hans-Kristian Arntzen + * Copyright (C) 2011-2012 - Daniel De Matteis + * + * 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; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#include +#include "../../boolean.h" +#include +#include + +#include +#include +#include + +#include "../gx_input.h" + +#include "../../console/rarch_console.h" +#include "../../console/rarch_console_exec.h" +#include "../../console/rarch_console_libretro_mgmt.h" +#include "../../console/rarch_console_input.h" +#include "../../console/rarch_console_config.h" +#include "../../console/rarch_console_settings.h" +#include "../../console/rarch_console_main_wrap.h" +#include "../../conf/config_file.h" +#include "../../conf/config_file_macros.h" +#include "../../general.h" +#include "../../file.h" + +char LIBRETRO_DIR_PATH[512]; +char SYS_CONFIG_FILE[512]; +char libretro_path[512]; +char PORT_DIR[512]; +char app_dir[512]; + +static void find_and_set_first_file(void) +{ + //Last fallback - we'll need to start the first executable file + // we can find in the RetroArch cores directory + + char first_file[512]; + rarch_manage_libretro_set_first_file(first_file, sizeof(first_file), + LIBRETRO_DIR_PATH, "dol"); + + if(first_file) + strlcpy(libretro_path, first_file, sizeof(libretro_path)); + else + RARCH_ERR("Failed last fallback - RetroArch Salamander will exit.\n"); +} + +static void init_settings(void) +{ + char tmp_str[512]; + bool config_file_exists; + + if(!path_file_exists(SYS_CONFIG_FILE)) + { + FILE * f; + config_file_exists = false; + RARCH_ERR("Config file \"%s\" doesn't exist. Creating...\n", SYS_CONFIG_FILE); + f = fopen(SYS_CONFIG_FILE, "w"); + fclose(f); + } + else + config_file_exists = true; + + //try to find CORE executable + char core_executable[1024]; + snprintf(core_executable, sizeof(core_executable), "%s/CORE.dol", LIBRETRO_DIR_PATH); + + if(path_file_exists(core_executable)) + { + //Start CORE executable + snprintf(libretro_path, sizeof(libretro_path), core_executable); + RARCH_LOG("Start [%s].\n", libretro_path); + } + else + { + if(config_file_exists) + { + config_file_t * conf = config_file_new(SYS_CONFIG_FILE); + config_get_array(conf, "libretro_path", tmp_str, sizeof(tmp_str)); + snprintf(libretro_path, sizeof(libretro_path), tmp_str); + } + + if(!config_file_exists || !strcmp(libretro_path, "")) + find_and_set_first_file(); + else + { + RARCH_LOG("Start [%s] found in retroarch.cfg.\n", libretro_path); + } + } +} + +static void get_environment_settings(void) +{ + getcwd(PORT_DIR, MAXPATHLEN); + snprintf(SYS_CONFIG_FILE, sizeof(SYS_CONFIG_FILE), "%sretroarch.cfg", PORT_DIR); + snprintf(LIBRETRO_DIR_PATH, sizeof(LIBRETRO_DIR_PATH), PORT_DIR); +} + +int main(int argc, char *argv[]) +{ +#ifdef HAVE_LOGGER + g_extern.verbose = true; + logger_init(); +#endif + +#ifdef HW_RVL + L2Enhance(); +#endif + + fatInitDefault(); + getcwd(app_dir, sizeof(app_dir)); + + get_environment_settings(); + + //TODO: Add control options later - for 'set_first_file' + { + //normal executable loading path + init_settings(); + } + +#ifdef HAVE_LOGGER + logger_shutdown(); +#endif + + rarch_console_exec(libretro_path); + + return 1; +}