diff --git a/Makefile b/Makefile index db2bf2a9..afd8294d 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ INCLUDES := source CFLAGS = -g -O2 -save-temps -Wall $(MACHDEP) $(INCLUDE) CXXFLAGS = -Xassembler -aln=$@.lst $(CFLAGS) -LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map,--section-start,.init=0x8090a000 +LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map,--section-start,.init=0x80B00000 #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project @@ -60,6 +60,7 @@ export CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) export CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) sFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s))) SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S))) +ELFFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.elf))) BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) TTFFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.ttf))) PNGFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.png))) @@ -79,7 +80,8 @@ export OFILES := $(addsuffix .o,$(BINFILES)) \ $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \ $(sFILES:.s=.o) $(SFILES:.S=.o) \ $(TTFFILES:.ttf=.ttf.o) $(PNGFILES:.png=.png.o) \ - $(OGGFILES:.ogg=.ogg.o) $(PCMFILES:.pcm=.pcm.o) + $(OGGFILES:.ogg=.ogg.o) $(PCMFILES:.pcm=.pcm.o) \ + $(addsuffix .o,$(ELFFILES)) #--------------------------------------------------------------------------------- # build a list of include paths @@ -151,6 +153,11 @@ language: $(wildcard $(PROJECTDIR)/Languages/*.lang) #--------------------------------------------------------------------------------- # This rule links in binary data with .ttf, .png, and .mp3 extensions #--------------------------------------------------------------------------------- + +%.elf.o : %.elf + @echo $(notdir $<) + $(bin2o) + %.ttf.o : %.ttf @echo $(notdir $<) $(bin2o) diff --git a/gui.pnproj b/gui.pnproj index 15312042..9c2a2593 100644 --- a/gui.pnproj +++ b/gui.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/gui.pnps b/gui.pnps index ffeb9856..3c3ba32e 100644 --- a/gui.pnps +++ b/gui.pnps @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/source/menu.cpp b/source/menu.cpp index c7ee33f6..177c04c8 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -1916,7 +1916,9 @@ int MainMenu(int menu) { break; } } - + + //MemInfoPrompt(); + CloseXMLDatabase(); ExitGUIThreads(); bgMusic->Stop(); @@ -1930,7 +1932,7 @@ int MainMenu(int menu) { delete GameIDTxt; delete cover; delete coverImg; - delete fontClock; + delete fontClock; delete fontSystem; ShutdownAudio(); StopGX(); diff --git a/source/prompts/gameinfo.cpp b/source/prompts/gameinfo.cpp index d67d0674..824fc4b4 100644 --- a/source/prompts/gameinfo.cpp +++ b/source/prompts/gameinfo.cpp @@ -1113,4 +1113,9 @@ bool save_XML_URL() { // save xml url as as txt file for people without wifi } - +void MemInfoPrompt() +{ + char meminfotxt[200]; + strlcpy(meminfotxt,MemInfo(),sizeof(meminfotxt)); + WindowPrompt(0,meminfotxt, tr("OK")); +} diff --git a/source/prompts/gameinfo.h b/source/prompts/gameinfo.h index fd9e0bad..79a0c4fa 100644 --- a/source/prompts/gameinfo.h +++ b/source/prompts/gameinfo.h @@ -11,4 +11,5 @@ int showGameInfo(char *ID); bool save_XML_URL(); bool save_gamelist(int txt); +void MemInfoPrompt(); #endif