The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2024-11-25 12:06:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

reorg

Browse Source
This commit is contained in:
dborth 2010-03-21 23:49:59 +00:00
parent c2ff1b7277
commit 65eccf6e20
23 changed files with 95 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.gc
View File

@ -18,11 +18,11 @@ include $(DEVKITPPC)/gamecube_rules
TARGET := vbagx_gc TARGET := vbagx_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/sz source/unzip \ source/gui source/utils source/utils/sz \
source/vba source/vba/apu source/vba/common \ source/vba source/vba/apu source/vba/common \
source/vba/gb source/vba/gba source/vba/gb source/vba/gba
INCLUDES := source/vba source/ngc source/unzip INCLUDES := source
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# options for code generation # options for code generation

8
Makefile.wii
View File

@ -18,11 +18,11 @@ include $(DEVKITPPC)/wii_rules
TARGET := vbagx_wii TARGET := vbagx_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/utils source/ngc source/sz source/unzip \ source/gui source/utils source/utils/sz source/utils/unzip \
source/vba source/vba/apu source/vba/common \ source/vba source/vba/apu source/vba/common \
source/vba/gb source/vba/gba source/vba/gb source/vba/gba
INCLUDES := source/vba source/ngc source/unzip INCLUDES := source
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# options for code generation # options for code generation
@ -91,7 +91,7 @@ export OFILES := $(addsuffix .o,$(BINFILES)) \
$(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

2
source/audio.h
View File

@ -11,7 +11,7 @@
#ifndef __AUDIOMIXER__ #ifndef __AUDIOMIXER__
#define __AUDIOMIXER__ #define __AUDIOMIXER__
#include "common/SoundDriver.h" #include "vba/common/SoundDriver.h"
void InitialiseSound(); void InitialiseSound();
void StopAudio(); void StopAudio();

2
source/filebrowser.cpp
View File

@ -20,7 +20,7 @@
#include <di/di.h> #include <di/di.h>
#endif #endif
#include "vba.h" #include "vbagx.h"
#include "vbasupport.h" #include "vbasupport.h"
#include "vmmem.h" #include "vmmem.h"
#include "filebrowser.h" #include "filebrowser.h"

2
source/fileop.cpp
View File

@ -24,7 +24,7 @@
#include <ogc/dvd.h> #include <ogc/dvd.h>
#include <iso9660.h> #include <iso9660.h>
#include "vba.h" #include "vbagx.h"
#include "vbasupport.h" #include "vbasupport.h"
#include "fileop.h" #include "fileop.h"
#include "networkop.h" #include "networkop.h"

9
source/gameinput.cpp
View File

@ -18,16 +18,17 @@
#include <unistd.h> #include <unistd.h>
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include "vba.h" #include "vbagx.h"
#include "button_mapping.h" #include "button_mapping.h"
#include "audio.h" #include "audio.h"
#include "video.h" #include "video.h"
#include "input.h" #include "input.h"
#include "gameinput.h" #include "gameinput.h"
#include "vbasupport.h" #include "vbasupport.h"
#include "gba/GBA.h"
#include "gba/bios.h" #include "vba/gba/GBA.h"
#include "gba/GBAinline.h" #include "vba/gba/bios.h"
#include "vba/gba/GBAinline.h"
extern bool CalibrateWario; extern bool CalibrateWario;

8
source/gcunzip.cpp
View File

@ -15,12 +15,12 @@
#include <zlib.h> #include <zlib.h>
extern "C" { extern "C" {
#include "../sz/7zCrc.h" #include "utils/sz/7zCrc.h"
#include "../sz/7zIn.h" #include "utils/sz/7zIn.h"
#include "../sz/7zExtract.h" #include "utils/sz/7zExtract.h"
} }
#include "vba.h" #include "vbagx.h"
#include "fileop.h" #include "fileop.h"
#include "filebrowser.h" #include "filebrowser.h"
#include "menu.h" #include "menu.h"

9
source/gui/gui.h
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 "vbagx.h"
#include "vba.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[];

2
source/gui/gui_text.cpp
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;

11
source/input.cpp
View File

@ -17,18 +17,19 @@
#include <unistd.h> #include <unistd.h>
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include "vba.h" #include "vbagx.h"
#include "button_mapping.h" #include "button_mapping.h"
#include "audio.h" #include "audio.h"
#include "video.h" #include "video.h"
#include "input.h" #include "input.h"
#include "gameinput.h" #include "gameinput.h"
#include "vbasupport.h" #include "vbasupport.h"
#include "gui/gui.h"
#include "gba/GBA.h"
#include "gba/bios.h"
#include "gba/GBAinline.h"
#include "fastmath.h" #include "fastmath.h"
#include "gui/gui.h"
#include "vba/gba/GBA.h"
#include "vba/gba/bios.h"
#include "vba/gba/GBAinline.h"
int rumbleRequest[4] = {0,0,0,0}; int rumbleRequest[4] = {0,0,0,0};
GuiTrigger userInput[4]; GuiTrigger userInput[4];

9
source/inputmario.cpp
View File

@ -18,16 +18,17 @@
#include <unistd.h> #include <unistd.h>
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include "vba.h" #include "vbagx.h"
#include "button_mapping.h" #include "button_mapping.h"
#include "audio.h" #include "audio.h"
#include "video.h" #include "video.h"
#include "input.h" #include "input.h"
#include "gameinput.h" #include "gameinput.h"
#include "vbasupport.h" #include "vbasupport.h"
#include "gba/GBA.h"
#include "gba/bios.h" #include "vba/gba/GBA.h"
#include "gba/GBAinline.h" #include "vba/gba/bios.h"
#include "vba/gba/GBAinline.h"
u32 MarioKartInput(unsigned short pad) { u32 MarioKartInput(unsigned short pad) {
u32 J = StandardMovement(pad); u32 J = StandardMovement(pad);

9
source/inputmetroid.cpp
View File

@ -18,16 +18,17 @@
#include <unistd.h> #include <unistd.h>
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include "vba.h" #include "vbagx.h"
#include "button_mapping.h" #include "button_mapping.h"
#include "audio.h" #include "audio.h"
#include "video.h" #include "video.h"
#include "input.h" #include "input.h"
#include "gameinput.h" #include "gameinput.h"
#include "vbasupport.h" #include "vbasupport.h"
#include "gba/GBA.h"
#include "gba/bios.h" #include "vba/gba/GBA.h"
#include "gba/GBAinline.h" #include "vba/gba/bios.h"
#include "vba/gba/GBAinline.h"
u32 MetroidZeroInput(unsigned short pad) { u32 MetroidZeroInput(unsigned short pad) {
u32 J = StandardMovement(pad) | DecodeClassic(pad); u32 J = StandardMovement(pad) | DecodeClassic(pad);

11
source/inputmortalkombat.cpp
View File

@ -18,17 +18,18 @@
#include <unistd.h> #include <unistd.h>
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include "vba.h" #include "vbagx.h"
#include "button_mapping.h" #include "button_mapping.h"
#include "audio.h" #include "audio.h"
#include "video.h" #include "video.h"
#include "input.h" #include "input.h"
#include "gameinput.h" #include "gameinput.h"
#include "vbasupport.h" #include "vbasupport.h"
#include "gba/GBA.h"
#include "gba/bios.h" #include "vba/gba/GBA.h"
#include "gba/GBAinline.h" #include "vba/gba/bios.h"
#include "gb/gbGlobals.h" #include "vba/gba/GBAinline.h"
#include "vba/gb/gbGlobals.h"
void DebugPrintf(const char *format, ...); void DebugPrintf(const char *format, ...);
void gbSetSpritePal(u8 WhichPal, u32 bright, u32 medium, u32 dark); void gbSetSpritePal(u8 WhichPal, u32 bright, u32 medium, u32 dark);

9
source/inputstarwars.cpp
View File

@ -18,16 +18,17 @@
#include <unistd.h> #include <unistd.h>
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include "vba.h" #include "vbagx.h"
#include "button_mapping.h" #include "button_mapping.h"
#include "audio.h" #include "audio.h"
#include "video.h" #include "video.h"
#include "input.h" #include "input.h"
#include "gameinput.h" #include "gameinput.h"
#include "vbasupport.h" #include "vbasupport.h"
#include "gba/GBA.h"
#include "gba/bios.h" #include "vba/gba/GBA.h"
#include "gba/GBAinline.h" #include "vba/gba/bios.h"
#include "vba/gba/GBAinline.h"
u32 LegoStarWars1Input(unsigned short pad) { u32 LegoStarWars1Input(unsigned short pad) {
u32 J = StandardMovement(pad) | DecodeGamecube(pad); u32 J = StandardMovement(pad) | DecodeGamecube(pad);

9
source/inputzelda.cpp
View File

@ -18,7 +18,7 @@
#include <unistd.h> #include <unistd.h>
#include <wiiuse/wpad.h> #include <wiiuse/wpad.h>
#include "vba.h" #include "vbagx.h"
#include "button_mapping.h" #include "button_mapping.h"
#include "audio.h" #include "audio.h"
#include "video.h" #include "video.h"
@ -26,9 +26,10 @@
#include "gui/gui.h" #include "gui/gui.h"
#include "gameinput.h" #include "gameinput.h"
#include "vbasupport.h" #include "vbasupport.h"
#include "gba/GBA.h"
#include "gba/bios.h" #include "vba/gba/GBA.h"
#include "gba/GBAinline.h" #include "vba/gba/bios.h"
#include "vba/gba/GBAinline.h"
//#define ALLOWCHEAT //#define ALLOWCHEAT

6
source/menu.cpp
View File

@ -20,7 +20,7 @@
#include <di/di.h> #include <di/di.h>
#endif #endif
#include "vba.h" #include "vbagx.h"
#include "vbasupport.h" #include "vbasupport.h"
#include "video.h" #include "video.h"
#include "filebrowser.h" #include "filebrowser.h"
@ -29,12 +29,12 @@
#include "fileop.h" #include "fileop.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 "filelist.h" #include "filelist.h"
#include "gui/gui.h"
#include "menu.h" #include "menu.h"
#include "gamesettings.h" #include "gamesettings.h"
#include "gui/gui.h"
#include "utils/gettext.h"
#define THREAD_SLEEP 100 #define THREAD_SLEEP 100

8
source/networkop.cpp
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 "vbagx.h"
#include "miniunz.h"
#include "vba.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;

2
source/preferences.cpp
View File

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

15
source/vba.cpp
View File

@ -21,14 +21,7 @@
#include <di/di.h> #include <di/di.h>
#endif #endif
#include "FreeTypeGX.h" #include "vbagx.h"
#include "gba/Globals.h"
#include "gba/Sound.h"
#include "utils/usb2storage.h"
#include "utils/mload.h"
#include "vba.h"
#include "vbasupport.h" #include "vbasupport.h"
#include "preferences.h" #include "preferences.h"
#include "audio.h" #include "audio.h"
@ -39,6 +32,12 @@
#include "input.h" #include "input.h"
#include "video.h" #include "video.h"
#include "gamesettings.h" #include "gamesettings.h"
#include "utils/usb2storage.h"
#include "utils/mload.h"
#include "utils/FreeTypeGX.h"
#include "vba/gba/Globals.h"
#include "vba/gba/Sound.h"
extern "C" { extern "C" {
extern void __exception_setreload(int t); extern void __exception_setreload(int t);

2
source/vba.h
View File

@ -12,8 +12,8 @@
#include <unistd.h> #include <unistd.h>
#include "FreeTypeGX.h"
#include "filelist.h" #include "filelist.h"
#include "utils/FreeTypeGX.h"
#define APPNAME "Visual Boy Advance GX" #define APPNAME "Visual Boy Advance GX"
#define APPVERSION "2.1.2" #define APPVERSION "2.1.2"

31
source/vbasupport.cpp
View File

@ -16,9 +16,22 @@
#include <malloc.h> #include <malloc.h>
#include <ogc/lwp_watchdog.h> #include <ogc/lwp_watchdog.h>
#include "pngu.h" #include "vbagx.h"
#include "fileop.h"
#include "filebrowser.h"
#include "audio.h"
#include "vmmem.h"
#include "input.h"
#include "gameinput.h"
#include "video.h"
#include "menu.h"
#include "gcunzip.h"
#include "gamesettings.h"
#include "preferences.h"
#include "fastmath.h"
#include "utils/pngu.h"
#include "utils/unzip/unzip.h"
#include "unzip.h"
#include "Util.h" #include "Util.h"
#include "common/Port.h" #include "common/Port.h"
#include "gba/Flash.h" #include "gba/Flash.h"
@ -33,20 +46,6 @@
#include "gb/gbCheats.h" #include "gb/gbCheats.h"
#include "gb/gbSound.h" #include "gb/gbSound.h"
#include "vba.h"
#include "fileop.h"
#include "filebrowser.h"
#include "audio.h"
#include "vmmem.h"
#include "input.h"
#include "gameinput.h"
#include "video.h"
#include "menu.h"
#include "gcunzip.h"
#include "gamesettings.h"
#include "preferences.h"
#include "fastmath.h"
static u32 start; static u32 start;
int cartridgeType = 0; int cartridgeType = 0;
u32 RomIdCode; u32 RomIdCode;

2
source/video.cpp
View File

@ -16,7 +16,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "vba.h" #include "vbagx.h"
#include "menu.h" #include "menu.h"
#include "input.h" #include "input.h"

12
source/vmmem.cpp
View File

@ -15,17 +15,17 @@
#include <fat.h> #include <fat.h>
#include <sys/dir.h> #include <sys/dir.h>
#include "gba/GBA.h" #include "vbagx.h"
#include "gba/Globals.h"
#include "Util.h"
#include "common/Port.h"
#include "vba.h"
#include "fileop.h" #include "fileop.h"
#include "menu.h" #include "menu.h"
#include "filebrowser.h" #include "filebrowser.h"
#include "gcunzip.h" #include "gcunzip.h"
#include "vba/gba/GBA.h"
#include "vba/gba/Globals.h"
#include "vba/Util.h"
#include "vba/common/Port.h"
#define MEM_BAD 0xff #define MEM_BAD 0xff
#define MEM_VM 0x01 #define MEM_VM 0x01
#define MEM_UN 0x80 #define MEM_UN 0x80