From 654c9b353b06669f9c09c9dd1e02b5106c0e6e87 Mon Sep 17 00:00:00 2001 From: dborth Date: Sun, 10 Aug 2008 03:36:44 +0000 Subject: [PATCH] update makefiles, readme --- Makefile | 41 ++--------------------------------------- Makefile.gc | 17 +++++++---------- Makefile.wii | 20 ++++++++------------ README.txt | 29 +++++++++++++++++++++++++++-- 4 files changed, 44 insertions(+), 63 deletions(-) diff --git a/Makefile b/Makefile index afbe1ea..65a1cb6 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,8 @@ -.PHONY = all wii gc wii-clean gc-clean wii-run gc-run specials specials-clean specials-wii specials-gc specials-wii-clean specials-gc-clean - -VERSION := 004 +.PHONY = all wii gc wii-clean gc-clean wii-run gc-run all: wii gc -clean: wii-clean gc-clean specials-clean +clean: wii-clean gc-clean wii: $(MAKE) -f Makefile.wii @@ -23,38 +21,3 @@ gc-clean: gc-run: $(MAKE) -f Makefile.gc run - -# Custom Quicksave Versions - -specials: specials-wii specials-gc - -specials-clean: specials-wii-clean specials-gc-clean - -specials-wii: - touch source/ngc/snes9xGX.h - $(MAKE) "CUSTOMFLAGS:=-DQUICK_SAVE_SLOT=0" "LOADTYPE:='"MCSLOTA"'" "VERSION:=$(VERSION)" -f Makefile.wii - touch source/ngc/snes9xGX.h - $(MAKE) "CUSTOMFLAGS:=-DQUICK_SAVE_SLOT=1" "LOADTYPE:='"MCSLOTB"'" "VERSION:=$(VERSION)" -f Makefile.wii - touch source/ngc/snes9xGX.h - $(MAKE) "CUSTOMFLAGS:=-DQUICK_SAVE_SLOT=3" "LOADTYPE:='"SD"'" "VERSION:=$(VERSION)" -f Makefile.wii - -specials-gc: - touch source/ngc/snes9xGX.h - $(MAKE) "CUSTOMFLAGS:=-DQUICK_SAVE_SLOT=0" "LOADTYPE:='"MCSLOTA"'" "VERSION:=$(VERSION)" -f Makefile.gc - touch source/ngc/snes9xGX.h - $(MAKE) "CUSTOMFLAGS:=-DQUICK_SAVE_SLOT=1" "LOADTYPE:='"MCSLOTB"'" "VERSION:=$(VERSION)" -f Makefile.gc - touch source/ngc/snes9xGX.h - $(MAKE) "CUSTOMFLAGS:=-DQUICK_SAVE_SLOT=3" "LOADTYPE:='"SD"'" "VERSION:=$(VERSION)" -f Makefile.gc - touch source/ngc/snes9xGX.h - $(MAKE) "CUSTOMFLAGS:=-DQUICK_SAVE_SLOT=4" "LOADTYPE:='"SMB"'" "VERSION:=$(VERSION)" -f Makefile.gc - -specials-wii-clean: - $(MAKE) "CUSTOMFLAGS:=-DQUICK_SAVE_SLOT=0" "LOADTYPE:='"MCSLOTA"'" "VERSION:=$(VERSION)" -f Makefile.wii clean - $(MAKE) "CUSTOMFLAGS:=-DQUICK_SAVE_SLOT=1" "LOADTYPE:='"MCSLOTB"'" "VERSION:=$(VERSION)" -f Makefile.wii clean - $(MAKE) "CUSTOMFLAGS:=-DQUICK_SAVE_SLOT=3" "LOADTYPE:='"SD"'" "VERSION:=$(VERSION)" -f Makefile.wii clean - -specials-gc-clean: - $(MAKE) "CUSTOMFLAGS:=-DQUICK_SAVE_SLOT=0" "LOADTYPE:='"MCSLOTA"'" "VERSION:=$(VERSION)" -f Makefile.gc clean - $(MAKE) "CUSTOMFLAGS:=-DQUICK_SAVE_SLOT=1" "LOADTYPE:='"MCSLOTB"'" "VERSION:=$(VERSION)" -f Makefile.gc clean - $(MAKE) "CUSTOMFLAGS:=-DQUICK_SAVE_SLOT=3" "LOADTYPE:='"SD"'" "VERSION:=$(VERSION)" -f Makefile.gc clean - $(MAKE) "CUSTOMFLAGS:=-DQUICK_SAVE_SLOT=4" "LOADTYPE:='"SMB"'" "VERSION:=$(VERSION)" -f Makefile.gc clean \ No newline at end of file diff --git a/Makefile.gc b/Makefile.gc index fbbbe5e..c9a0107 100644 --- a/Makefile.gc +++ b/Makefile.gc @@ -1,3 +1,5 @@ +VERSION := 005 + #--------------------------------------------------------------------------------- # Clear the implicit built in rules #--------------------------------------------------------------------------------- @@ -9,28 +11,22 @@ endif include $(DEVKITPPC)/gamecube_rules -LOADTYPE = "sd" -VERSION = "version" - #--------------------------------------------------------------------------------- # TARGET is the name of the output # BUILD is the directory where object files & intermediate files will be placed # SOURCES is a list of directories containing source code # INCLUDES is a list of directories containing extra header files #--------------------------------------------------------------------------------- -TARGET := executables/snes9xgx-$(VERSION)-$(LOADTYPE)-gc +TARGET := executables/snes9xgx-$(VERSION)-gc BUILD := build_gc -SOURCES := source/snes9x source/unzip source/ngc source/smb +SOURCES := source/snes9x source/ngc DATA := data -INCLUDES := source/snes9x source/unzip source/ngc source/smb +INCLUDES := source/snes9x source/ngc #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -CUSTOMFLAGS = -DQUICK_SAVE_SLOT=1 -DSMB_SVID='"Crunchewy"' \ - -DSMB_IP='"192.168.1.111"' -DGW_IP='"192.168.1.1"' - CFLAGS = -g -O2 -Wall $(MACHDEP) $(INCLUDE) \ -DNGC -DNO_ASM -DCPU_SHUTDOWN -DSPC700C \ -DSPC700_SHUTDOWN -DNEW_COLOUR_BLENDING \ @@ -45,7 +41,7 @@ LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map -Wl,--cref #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project #--------------------------------------------------------------------------------- -LIBS := -lfat -lz -logc -lm -lfreetype -lbba +LIBS := -lbba -ltinysmb -lfat -lz -logc -lm -lfreetype #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing @@ -110,6 +106,7 @@ export OUTPUT := $(CURDIR)/$(TARGET) $(BUILD): @[ -d $@ ] || mkdir -p $@ @make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.gc + @rm -fr $(OUTPUT).elf #--------------------------------------------------------------------------------- clean: diff --git a/Makefile.wii b/Makefile.wii index f0f8833..3b99417 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -1,3 +1,5 @@ +VERSION := 005 + #--------------------------------------------------------------------------------- # Clear the implicit built in rules #--------------------------------------------------------------------------------- @@ -9,34 +11,28 @@ endif include $(DEVKITPPC)/wii_rules -LOADTYPE = "sd" -VERSION = "version" - #--------------------------------------------------------------------------------- # TARGET is the name of the output # BUILD is the directory where object files & intermediate files will be placed # SOURCES is a list of directories containing source code # INCLUDES is a list of directories containing extra header files #--------------------------------------------------------------------------------- -TARGET := executables/snes9xgx-$(VERSION)-$(LOADTYPE)-wii +TARGET := executables/snes9xgx-$(VERSION)-wii BUILD := build_wii -SOURCES := source/snes9x source/unzip source/ngc source/smb +SOURCES := source/snes9x source/ngc DATA := data -INCLUDES := source/snes9x source/unzip source/ngc source/smb +INCLUDES := source/snes9x source/ngc #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- -CUSTOMFLAGS = -DQUICK_SAVE_SLOT=3 -DSMB_SVID='"Crunchewy"' \ - -DSMB_IP='"192.168.1.111"' -DGW_IP='"192.168.1.1"' - CFLAGS = -g -O2 -Wall $(MACHDEP) $(INCLUDE) \ -DNGC -DHW_RVL -DNO_ASM -DCPU_SHUTDOWN -DSPC700C \ -DSPC700_SHUTDOWN -DNEW_COLOUR_BLENDING \ -DNO_INLINE_GET_SET -DSDD1_DECOMP -DCORRECT_VRAM_READS \ -DDETECT_NASTY_FX_INTERLEAVE -DNGC_ZOOM -DSDUSE_LFN \ - -DFORCE_WII=1 $(CUSTOMFLAGS)\ + -DFORCE_WII=1 $(CUSTOMFLAGS) \ -fomit-frame-pointer -fno-exceptions -Wno-unused-parameter -pipe CXXFLAGS = $(CFLAGS) @@ -45,8 +41,7 @@ LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map -Wl,--cref #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project #--------------------------------------------------------------------------------- -LIBS := -lfat -lwiiuse -lz -lbte -logc -lm -lfreetype -# -logcsys +LIBS := -lfat -lwiiuse -lz -lbte -logc -lm -lfreetype -ltinysmb #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing @@ -111,6 +106,7 @@ export OUTPUT := $(CURDIR)/$(TARGET) $(BUILD): @[ -d $@ ] || mkdir -p $@ @make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.wii + @rm -fr $(OUTPUT).elf #--------------------------------------------------------------------------------- clean: diff --git a/README.txt b/README.txt index 3130108..4e674ad 100644 --- a/README.txt +++ b/README.txt @@ -10,12 +10,37 @@ ­———————————————————————————————————————————————————————————————————————•ßrK• ×—–­—–­—–­—–­ –­—–­—–­—–­—–­—–­—–­—–­—–­—–­— ­—–­—–­—–­—–­—–­—–­—–­—-­—–­-–•¬ -|0O×øo· SNES9XGX v004 ·oø×O0| +|0O×øo· SNES9XGX v005 ·oø×O0| `¨•¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨' PLEASE NOTE: THIS DOCUMENT IS A WORK IN PROGRESS -[What's New 004] +[What's New 005] + +michniewski +- added: Superscope/mouse/justifier support, with Wii remote + +Tantric +- added: cheats menu! Loads .CHT file from /snes9x/cheats folder, + .CHT file name must match file name of ROM +- added: load/save preference selector. ROM, SRAM, Freeze, and preferences + are saved/loaded according to these +- added: preliminary Wii SMB support +- added: 'Auto' settings for save/load - attempts to automatically determine + your load/save device(s) - SD, USB, Memory Card, DVD, SMB +- added: ROM Information page +- added: Game Menu - all game-specific options are here now: + SRAM save/load, Freeze save/load, game reload, etc +- added: Credits page +- fixed: sd gecko works now +- fixed: full USB support +- changed: menu structure +- changed: if Home button is pressed when a game is running, Game Menu pops up +- changed: if preferences can't be loaded at the start and/or are reset, + preferences menu pops up +- changed: SRAM load - game reloaded automatically after loading SRAM + +[What Was New 004] - added: option to disable AA filtering (snes graphics 'crisper', AA now default OFF)