CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-12 22:01:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Themaister/SSNES

Browse Source
This commit is contained in:
Themaister 2012-01-11 23:10:05 +01:00
commit 67fb35b645
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.ps3
View File

@ -25,9 +25,9 @@ else
endif endif
ifeq ($(CELL_BUILD_TOOLS),SNC) ifeq ($(CELL_BUILD_TOOLS),SNC)
CC = $(CELL_SDK)/sn/ps3ppusnc CC = $(CELL_SDK)/$(HOST_DIR)/sn/bin/ps3ppusnc
CXX = $(CC) CXX = $(CC)
LD = $(CELL_SDK)/sn/ps3ppuld LD = $(CELL_SDK)/$(HOST_DIR)/sn/bin/ps3ppuld
else else
CC = $(CELL_SDK)/$(HOST_DIR)/ppu/bin/ppu-lv2-gcc CC = $(CELL_SDK)/$(HOST_DIR)/ppu/bin/ppu-lv2-gcc
CXX = $(CELL_SDK)/$(HOST_DIR)/ppu/bin/ppu-lv2-g++ CXX = $(CELL_SDK)/$(HOST_DIR)/ppu/bin/ppu-lv2-g++

5
ps3/main.c
View File

@ -27,6 +27,8 @@
#include <sys/spu_initialize.h> #include <sys/spu_initialize.h>
#include <sysutil/sysutil_gamecontent.h> #include <sysutil/sysutil_gamecontent.h>
#include "ps3_input.h"
#include "../conf/config_file.h" #include "../conf/config_file.h"
#include "../general.h" #include "../general.h"
#include "menu.h" #include "menu.h"
@ -100,14 +102,11 @@ static bool file_exists(const char * filename)
static void emulator_init_settings(void) static void emulator_init_settings(void)
{ {
bool config_file_newly_created = false;
if(!file_exists(SYS_CONFIG_FILE)) if(!file_exists(SYS_CONFIG_FILE))
{ {
FILE * f; FILE * f;
f = fopen(SYS_CONFIG_FILE, "w"); f = fopen(SYS_CONFIG_FILE, "w");
fclose(f); fclose(f);
config_file_newly_created = true;
} }
config_file_t * currentconfig = config_file_new(SYS_CONFIG_FILE); config_file_t * currentconfig = config_file_new(SYS_CONFIG_FILE);

2
ssnes.c
View File

@ -435,6 +435,8 @@ static void print_compiler(FILE *file)
fprintf(file, "\nCompiler: "); fprintf(file, "\nCompiler: ");
#if defined(_MSC_VER) #if defined(_MSC_VER)
fprintf(file, "MSVC (%d) %u-bit\n", _MSC_VER, (unsigned)(CHAR_BIT * sizeof(size_t))); fprintf(file, "MSVC (%d) %u-bit\n", _MSC_VER, (unsigned)(CHAR_BIT * sizeof(size_t)));
#elif defined(__SNC__)
fprintf(file, "SNC %u-bit\n", (unsigned)(CHAR_BIT * sizeof(size_t)));
#elif defined(_WIN32) && defined(__GNUC__) #elif defined(_WIN32) && defined(__GNUC__)
fprintf(file, "MinGW (%d.%d.%d) %u-bit\n", fprintf(file, "MinGW (%d.%d.%d) %u-bit\n",
__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__, (unsigned)(CHAR_BIT * sizeof(size_t))); __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__, (unsigned)(CHAR_BIT * sizeof(size_t)));