(SSNES_CONSOLE) Numerous cleanups, indenting cleanups, include header file fixes,

etc.

Makefile.xenon

@@ -18,9 +18,9 @@ PPU_TARGET_ADJUSTED := ssnes-libxenon.elf32
 LDDIRS = -L. -L$(DEVKITXENON)/usr/lib -L$(DEVKITXENON)/xenon/lib/32
 INCDIRS = -I. -I$(DEVKITXENON)/usr/include
 
-OBJ = fifo_buffer.o ssnes.o driver.o file.o settings.o message.o rewind.o movie.o gfx/gfx_common.o ups.o bps.o strl.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o xenon/main.o xenon/xenon360_audio.o xenon/xenon360_input.o xenon/xenon360_video.o
+OBJ = fifo_buffer.o ssnes.o driver.o file.o settings.o message.o rewind.o movie.o gfx/gfx_common.o patch.o compat/compat.o screenshot.o audio/hermite.o dynamic.o audio/utils.o conf/config_file.o xenon/main.o xenon/xenon360_audio.o xenon/xenon360_input.o xenon/xenon360_video.o
 
-LIBS = -lsnes -lxenon -lm -lc
+LIBS = -lretro -lxenon -lm -lc
 DEFINES = -std=gnu99 -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"0.9.5\" -DSSNES_CONSOLE -DHAVE_GETOPT_LONG=1 -Dmain=ssnes_main
 DEFINES += -maltivec -mhard-float -m32 -mpowerpc64 -mcpu=cell -mtune=cell -fno-pic -g -Wall -DXENON $(INCDIRS)
 DEFINES += -u read -u _start -u exc_base
@@ -52,4 +52,3 @@ clean:
 	rm -f $(OBJ)
 
 .PHONY: clean
-

ps3/main.c

@@ -170,7 +170,6 @@ static void init_settings(bool load_libretro_path)
    }
    else
    {
-
       config_file_t * conf = config_file_new(SYS_CONFIG_FILE);
 
       // g_settings
@@ -184,6 +183,7 @@ static void init_settings(bool load_libretro_path)
             //We need to set libretro to the first entry in the cores
 	    //directory so that it will be saved to the config file
             char ** dir_list = dir_list_new(LIBSNES_DIR_PATH, ".SELF");
+
 	    if (!dir_list)
 	    {
                SSNES_ERR("Couldn't read %s directory.\n", EMULATOR_CORE_DIR);
@@ -476,6 +476,7 @@ static bool manage_libretro_core(void)
    char tmp_path[1024], tmp_path2[1024], tmp_pathnewfile[1024];
    snprintf(tmp_path, sizeof(tmp_path), "%s/%s/CORE.SELF", usrDirPath, EMULATOR_CORE_DIR);
    SSNES_LOG("Assumed path of CORE.SELF: [%s]\n", tmp_path);
+
    if(path_file_exists(tmp_path))
    {
 	   //if CORE.SELF exists, this indicates we have just installed

ps3/menu.c

@@ -372,8 +372,6 @@ static void browser_render(filebrowser_t * b)
    cellDbgFontDraw();
 }
 
-
-
 static void set_setting_label(menu * menu_obj, uint64_t currentsetting)
 {
 	switch(currentsetting)
@@ -1072,7 +1070,6 @@ static void set_keybind_digital(uint64_t state, uint64_t system_joypad_id, uint6
    if(CTRL_LEFT(state) | CTRL_LSTICK_LEFT(state))
    {
       new_key = ssnes_input_find_previous_platform_key(g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].joykey);
-
       g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].joykey = new_key;
       set_delay = DELAY_MEDIUM;
    }
@@ -1080,9 +1077,7 @@ static void set_keybind_digital(uint64_t state, uint64_t system_joypad_id, uint6
    if(CTRL_RIGHT(state)  || CTRL_LSTICK_RIGHT(state) || CTRL_CROSS(state))
    {
       new_key = ssnes_input_find_next_platform_key(g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].joykey);
-
       g_settings.input.binds[currently_selected_controller_menu][default_snes_joypad_id].joykey = new_key;
-
       set_delay = DELAY_MEDIUM;
    }
 

xenon/cond.c

@@ -1,5 +1,6 @@
 /*  SSNES - A frontend for libretro.
  *  Copyright (C) 2010-2012 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2012 - Daniel De Matteis
  * 
  *  SSNES 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-

xenon/xenon360_input.c

@@ -19,7 +19,7 @@
 #include <string.h>
 
 #include "../driver.h"
-#include "../libsnes.hpp"
+#include "../libretro.h"
 
 #include <input/input.h>
 #include <usb/usbmain.h>

xenon/xenon360_video.c

@@ -13,7 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>