This commit is contained in:
dborth 2010-03-21 23:43:54 +00:00
parent 4897932f08
commit 05e3fe6067
26 changed files with 101 additions and 108 deletions

View File

@ -18,10 +18,10 @@ include $(DEVKITPPC)/gamecube_rules
TARGET := snes9xgx-gc TARGET := snes9xgx-gc
TARGETDIR := executables TARGETDIR := executables
BUILD := build_gc BUILD := build_gc
SOURCES := source/ngc/images source/ngc/sounds source/ngc/fonts source/ngc/lang \ SOURCES := source source/images source/sounds source/fonts source/lang \
source/ngc/gui source/ngc source/snes9x source/snes9x/apu \ source/gui source/utils source/utils/sz \
source/sz source/snes9x source/snes9x/apu
INCLUDES := source/snes9x source/ngc INCLUDES := source source/snes9x
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# options for code generation # options for code generation

View File

@ -18,11 +18,10 @@ include $(DEVKITPPC)/wii_rules
TARGET := snes9xgx-wii TARGET := snes9xgx-wii
TARGETDIR := executables TARGETDIR := executables
BUILD := build_wii BUILD := build_wii
SOURCES := source/ngc/images source/ngc/sounds source/ngc/fonts source/ngc/lang \ SOURCES := source source/images source/sounds source/fonts source/lang \
source/ngc/gui source/ngc source/ngc/utils \ source/gui source/utils source/utils/sz source/utils/unzip \
source/snes9x source/snes9x/apu \ source/snes9x source/snes9x/apu
source/sz source/unzip INCLUDES := source source/snes9x
INCLUDES := source/snes9x source/ngc source/unzip
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# options for code generation # options for code generation
@ -88,7 +87,7 @@ export OFILES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
$(TTFFILES:.ttf=.ttf.o) $(LANGFILES:.lang=.lang.o) \ $(TTFFILES:.ttf=.ttf.o) $(LANGFILES:.lang=.lang.o) \
$(PNGFILES:.png=.png.o) \ $(PNGFILES:.png=.png.o) \
$(OGGFILES:.ogg=.ogg.o) $(PCMFILES:.pcm=.pcm.o) \ $(OGGFILES:.ogg=.ogg.o) $(PCMFILES:.pcm=.pcm.o) \
$(CURDIR)/source/ngc/utils/ehcmodule.elf.o $(CURDIR)/source/utils/ehcmodule.elf.o
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# build a list of include paths # build a list of include paths

View File

@ -18,9 +18,8 @@ include $(DEVKITXENON)/rules
TARGET := snes9xgx-xenon TARGET := snes9xgx-xenon
TARGETDIR := executables TARGETDIR := executables
BUILD := build_xenon BUILD := build_xenon
SOURCES := source/xenon source/snes9x source/sz SOURCES := source/xenon source/snes9x source/utils/sz
# source/unzip INCLUDES := source/snes9x source/xenon
INCLUDES := source/snes9x source/xenon source/unzip
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# options for code generation # options for code generation
@ -43,8 +42,6 @@ LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project # any extra libraries we wish to link with the project
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
#LIBS := -ldb -ldi -lpngu -lpng -lmxml -lmetaphrasis \
# -lfat -lwiiuse -lz -lbte -logc -lasnd -ltremor -lfreetype -ltinysmb
LIBS = -lm -lxenon LIBS = -lm -lxenon
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

View File

@ -17,18 +17,18 @@
#include <string.h> #include <string.h>
#include <asndlib.h> #include <asndlib.h>
#include "snes9x.h"
#include "memmap.h"
#include "cpuexec.h"
#include "ppu.h"
#include "apu/apu.h"
#include "display.h"
#include "gfx.h"
#include "spc7110.h"
#include "controls.h"
#include "video.h" #include "video.h"
#include "snes9x/snes9x.h"
#include "snes9x/memmap.h"
#include "snes9x/cpuexec.h"
#include "snes9x/ppu.h"
#include "snes9x/apu/apu.h"
#include "snes9x/display.h"
#include "snes9x/gfx.h"
#include "snes9x/spc7110.h"
#include "snes9x/controls.h"
extern int ConfigRequested; extern int ConfigRequested;
/*** Double buffered audio ***/ /*** Double buffered audio ***/

View File

@ -11,7 +11,7 @@
#include "port.h" #include "port.h"
#include "cheats.h" #include "cheats.h"
#include "snes9xGX.h" #include "snes9xgx.h"
#include "fileop.h" #include "fileop.h"
#include "filebrowser.h" #include "filebrowser.h"

View File

@ -24,12 +24,8 @@
#include <di/di.h> #include <di/di.h>
#endif #endif
#include "snes9x.h" #include "snes9xgx.h"
#include "memmap.h"
#include "cheats.h"
#include "filebrowser.h" #include "filebrowser.h"
#include "snes9xGX.h"
#include "menu.h" #include "menu.h"
#include "video.h" #include "video.h"
#include "networkop.h" #include "networkop.h"
@ -39,6 +35,10 @@
#include "freeze.h" #include "freeze.h"
#include "sram.h" #include "sram.h"
#include "snes9x/snes9x.h"
#include "snes9x/memmap.h"
#include "snes9x/cheats.h"
BROWSERINFO browser; BROWSERINFO browser;
BROWSERENTRY * browserList = NULL; // list of files/folders in browser BROWSERENTRY * browserList = NULL; // list of files/folders in browser

View File

@ -27,7 +27,7 @@
#include <ogc/dvd.h> #include <ogc/dvd.h>
#include <iso9660.h> #include <iso9660.h>
#include "snes9xGX.h" #include "snes9xgx.h"
#include "fileop.h" #include "fileop.h"
#include "networkop.h" #include "networkop.h"
#include "gcunzip.h" #include "gcunzip.h"

View File

@ -21,11 +21,11 @@
#include "filter.h" #include "filter.h"
#include "video.h" #include "video.h"
#include "snes9xGX.h" #include "snes9xgx.h"
#include "memmap.h"
#include "menu.h" #include "menu.h"
#include "snes9x/memmap.h"
#define NUMBITS (16) #define NUMBITS (16)
static int RGBtoYUV[1<<NUMBITS]; static int RGBtoYUV[1<<NUMBITS];

View File

@ -18,7 +18,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include "snes9x.h" #include "snes9x/snes9x.h"
enum RenderFilter{ enum RenderFilter{
FILTER_NONE = 0, FILTER_NONE = 0,

View File

@ -13,18 +13,18 @@
#include <gccore.h> #include <gccore.h>
#include <stdio.h> #include <stdio.h>
#include "snes9x.h" #include "snes9xgx.h"
#include "port.h"
#include "memmap.h"
#include "snapshot.h"
#include "language.h"
#include "snes9xGX.h"
#include "fileop.h" #include "fileop.h"
#include "filebrowser.h" #include "filebrowser.h"
#include "menu.h" #include "menu.h"
#include "video.h" #include "video.h"
#include "pngu.h" #include "utils/pngu.h"
#include "snes9x/snes9x.h"
#include "snes9x/port.h"
#include "snes9x/memmap.h"
#include "snes9x/snapshot.h"
#include "snes9x/language.h"
bool8 S9xOpenSnapshotFile(const char *filepath, bool8 readonly, STREAM *file) bool8 S9xOpenSnapshotFile(const char *filepath, bool8 readonly, STREAM *file)
{ {

View File

@ -16,18 +16,18 @@
#include <string.h> #include <string.h>
#include <zlib.h> #include <zlib.h>
extern "C" { #include "snes9xgx.h"
#include "../sz/7zCrc.h"
#include "../sz/7zIn.h"
#include "../sz/7zExtract.h"
}
#include "snes9xGX.h"
#include "fileop.h" #include "fileop.h"
#include "filebrowser.h" #include "filebrowser.h"
#include "menu.h" #include "menu.h"
#include "gcunzip.h" #include "gcunzip.h"
extern "C" {
#include "utils/sz/7zCrc.h"
#include "utils/sz/7zIn.h"
#include "utils/sz/7zExtract.h"
}
#define ZIPCHUNK 2048 #define ZIPCHUNK 2048
/* /*

View File

@ -41,14 +41,15 @@
#include <math.h> #include <math.h>
#include <asndlib.h> #include <asndlib.h>
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include "pngu.h"
#include "FreeTypeGX.h" #include "snes9xgx.h"
#include "snes9xGX.h"
#include "video.h" #include "video.h"
#include "filelist.h" #include "filelist.h"
#include "fileop.h" #include "fileop.h"
#include "input.h" #include "input.h"
#include "oggplayer.h" #include "../utils/pngu.h"
#include "../utils/FreeTypeGX.h"
#include "../utils/oggplayer.h"
extern FreeTypeGX *fontSystem[]; extern FreeTypeGX *fontSystem[];

View File

@ -9,7 +9,7 @@
***************************************************************************/ ***************************************************************************/
#include "gui.h" #include "gui.h"
#include "../gettext.h" #include "../utils/gettext.h"
static GXColor presetColor = (GXColor){255, 255, 255, 255}; static GXColor presetColor = (GXColor){255, 255, 255, 255};
static int currentSize = 0; static int currentSize = 0;

View File

@ -21,17 +21,17 @@
#include <unistd.h> #include <unistd.h>
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include "snes9x.h" #include "snes9xgx.h"
#include "memmap.h"
#include "controls.h"
#include "snes9xGX.h"
#include "button_mapping.h" #include "button_mapping.h"
#include "menu.h" #include "menu.h"
#include "video.h" #include "video.h"
#include "input.h" #include "input.h"
#include "gui/gui.h" #include "gui/gui.h"
#include "snes9x/snes9x.h"
#include "snes9x/memmap.h"
#include "snes9x/controls.h"
int rumbleRequest[4] = {0,0,0,0}; int rumbleRequest[4] = {0,0,0,0};
GuiTrigger userInput[4]; GuiTrigger userInput[4];

View File

@ -20,11 +20,7 @@
#include <di/di.h> #include <di/di.h>
#endif #endif
#include "snes9x.h" #include "snes9xgx.h"
#include "memmap.h"
#include "cheats.h"
#include "snes9xGX.h"
#include "video.h" #include "video.h"
#include "filebrowser.h" #include "filebrowser.h"
#include "gcunzip.h" #include "gcunzip.h"
@ -34,12 +30,16 @@
#include "freeze.h" #include "freeze.h"
#include "preferences.h" #include "preferences.h"
#include "button_mapping.h" #include "button_mapping.h"
#include "gettext.h"
#include "input.h" #include "input.h"
#include "filter.h" #include "filter.h"
#include "filelist.h" #include "filelist.h"
#include "gui/gui.h" #include "gui/gui.h"
#include "menu.h" #include "menu.h"
#include "utils/gettext.h"
#include "snes9x/snes9x.h"
#include "snes9x/memmap.h"
#include "snes9x/cheats.h"
extern SCheatData Cheat; extern SCheatData Cheat;
@ -3422,7 +3422,7 @@ static int MenuSettingsFile()
firstRun = false; firstRun = false;
// some load/save devices are not implemented - here's where we skip them // some load/save devices are not implemented - here's where we skip them
// they need to be skipped in the order they were enumerated in snes9xGX.h // they need to be skipped in the order they were enumerated in snes9xgx.h
// no USB ports on GameCube // no USB ports on GameCube
#ifdef HW_DOL #ifdef HW_DOL

View File

@ -23,13 +23,13 @@ ConnectShare (bool silent)
#include <mxml.h> #include <mxml.h>
#include <malloc.h> #include <malloc.h>
#include "unzip.h" #include "snes9xgx.h"
#include "miniunz.h"
#include "snes9xGX.h"
#include "menu.h" #include "menu.h"
#include "fileop.h" #include "fileop.h"
#include "http.h"
#include "filebrowser.h" #include "filebrowser.h"
#include "utils/http.h"
#include "utils/unzip/unzip.h"
#include "utils/unzip/miniunz.h"
bool inNetworkInit = false; bool inNetworkInit = false;
static bool networkInit = false; static bool networkInit = false;

View File

@ -10,14 +10,13 @@
#include <zlib.h> #include <zlib.h>
#include "snes9x.h" #include "snes9xgx.h"
#include "memmap.h"
#include "snes9xGX.h"
#include "menu.h" #include "menu.h"
#include "memfile.h" #include "memfile.h"
#include "fileop.h" #include "fileop.h"
#include "filebrowser.h" #include "filebrowser.h"
#include "snes9x/snes9x.h"
#include "snes9x/memmap.h"
static int readInt2(MFILE *f) { static int readInt2(MFILE *f) {
int res = 0; int res = 0;

View File

@ -15,7 +15,7 @@
#include <ogcsys.h> #include <ogcsys.h>
#include <mxml.h> #include <mxml.h>
#include "snes9xGX.h" #include "snes9xgx.h"
#include "menu.h" #include "menu.h"
#include "fileop.h" #include "fileop.h"
#include "filebrowser.h" #include "filebrowser.h"

View File

@ -19,15 +19,14 @@
#include <unistd.h> #include <unistd.h>
#include <ogc/lwp_watchdog.h> #include <ogc/lwp_watchdog.h>
#include "snes9x.h" #include "snes9xgx.h"
#include "memmap.h"
#include "display.h"
#include "apu/apu.h"
#include "controls.h"
#include "snes9xGX.h"
#include "video.h" #include "video.h"
#include "audio.h" #include "audio.h"
#include "snes9x/snes9x.h"
#include "snes9x/memmap.h"
#include "snes9x/display.h"
#include "snes9x/apu/apu.h"
#include "snes9x/controls.h"
#define MAX_MESSAGE_LEN (36 * 3) #define MAX_MESSAGE_LEN (36 * 3)

View File

@ -195,7 +195,7 @@
#endif #endif
#ifdef GEKKO #ifdef GEKKO
#include "../ngc/snes9xGX.h" #include "../snes9xgx.h"
#endif #endif
using namespace std; using namespace std;

View File

@ -6,7 +6,7 @@
* Michniewski 2008 * Michniewski 2008
* Tantric 2008-2010 * Tantric 2008-2010
* *
* snes9xGX.cpp * snes9xgx.cpp
* *
* This file controls overall program flow. Most things start and end here! * This file controls overall program flow. Most things start and end here!
***************************************************************************/ ***************************************************************************/
@ -27,16 +27,7 @@
#include <di/di.h> #include <di/di.h>
#endif #endif
#include "FreeTypeGX.h" #include "snes9xgx.h"
#include "snes9x.h"
#include "memmap.h"
#include "apu/apu.h"
#include "controls.h"
#include "utils/usb2storage.h"
#include "utils/mload.h"
#include "snes9xGX.h"
#include "networkop.h" #include "networkop.h"
#include "video.h" #include "video.h"
#include "audio.h" #include "audio.h"
@ -48,6 +39,14 @@
#include "fileop.h" #include "fileop.h"
#include "filebrowser.h" #include "filebrowser.h"
#include "input.h" #include "input.h"
#include "utils/usb2storage.h"
#include "utils/mload.h"
#include "utils/FreeTypeGX.h"
#include "snes9x/snes9x.h"
#include "snes9x/memmap.h"
#include "snes9x/apu/apu.h"
#include "snes9x/controls.h"
int ScreenshotRequested = 0; int ScreenshotRequested = 0;
int ConfigRequested = 0; int ConfigRequested = 0;

View File

@ -14,7 +14,7 @@
#ifndef _SNES9XGX_H_ #ifndef _SNES9XGX_H_
#define _SNES9XGX_H_ #define _SNES9XGX_H_
#include "FreeTypeGX.h" #include "utils/FreeTypeGX.h"
#include "snes9x.h" #include "snes9x.h"
#include "filter.h" #include "filter.h"
#include "filelist.h" #include "filelist.h"

View File

@ -15,15 +15,14 @@
#include <string.h> #include <string.h>
#include <ogcsys.h> #include <ogcsys.h>
#include "snes9x.h" #include "snes9xgx.h"
#include "memmap.h"
#include "srtc.h"
#include "snes9xGX.h"
#include "menu.h" #include "menu.h"
#include "fileop.h" #include "fileop.h"
#include "filebrowser.h" #include "filebrowser.h"
#include "input.h" #include "input.h"
#include "snes9x/snes9x.h"
#include "snes9x/memmap.h"
#include "snes9x/srtc.h"
/**************************************************************************** /****************************************************************************
* Load SRAM * Load SRAM

View File

@ -6,7 +6,7 @@
#include "gettext.h" #include "gettext.h"
#include "filelist.h" #include "filelist.h"
#include "snes9xGX.h" #include "snes9xgx.h"
typedef struct _MSG typedef struct _MSG
{ {

View File

@ -19,10 +19,7 @@
#include <unistd.h> #include <unistd.h>
#include <ogc/texconv.h> #include <ogc/texconv.h>
#include "snes9x.h" #include "snes9xgx.h"
#include "memmap.h"
#include "snes9xGX.h"
#include "menu.h" #include "menu.h"
#include "filter.h" #include "filter.h"
#include "filelist.h" #include "filelist.h"
@ -30,6 +27,9 @@
#include "gui/gui.h" #include "gui/gui.h"
#include "input.h" #include "input.h"
#include "snes9x/snes9x.h"
#include "snes9x/memmap.h"
/*** Snes9x GFX Buffer ***/ /*** Snes9x GFX Buffer ***/
#define SNES9XGFX_SIZE (EXT_PITCH*EXT_HEIGHT) #define SNES9XGFX_SIZE (EXT_PITCH*EXT_HEIGHT)
#define FILTERMEM_SIZE (512*MAX_SNES_HEIGHT*4) #define FILTERMEM_SIZE (512*MAX_SNES_HEIGHT*4)

View File

@ -15,7 +15,7 @@
#include <ogcsys.h> #include <ogcsys.h>
#include "snes9x.h" #include "snes9x/snes9x.h"
void AllocGfxMem(); void AllocGfxMem();
void FreeGfxMem(); void FreeGfxMem();