*Reverted fixed values of release version and redirected language files download to trunk again

*Added delete of full cover on art work uninstall and game uninstall
*Added delete of CSettings object on compiling for another IOS than 249
This commit is contained in:
dimok321 2011-10-25 19:51:50 +00:00
parent 513cca71c3
commit 2a79b36b77
6 changed files with 15 additions and 10 deletions

View File

@ -2,8 +2,8 @@
<app version="1"> <app version="1">
<name> USB Loader GX</name> <name> USB Loader GX</name>
<coder>USB Loader GX Team</coder> <coder>USB Loader GX Team</coder>
<version>2.3 r1122</version> <version>2.3 r1124</version>
<release_date>201110211851</release_date> <release_date>201110251948</release_date>
<!-- // remove this line to enable arguments <!-- // remove this line to enable arguments
<arguments> <arguments>
<arg>--ios=250</arg> <arg>--ios=250</arg>

View File

@ -62,9 +62,8 @@ endif
# options for code generation # options for code generation
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
CFLAGS = -g -O3 -Wall -Wno-multichar -Wno-unused-parameter -Wextra $(MACHDEP) $(INCLUDE) -DBUILD_IOS=$(IOS) CFLAGS = -g -O3 -Wall -Wno-multichar -Wno-unused-parameter -Wextra $(MACHDEP) $(INCLUDE) -DBUILD_IOS=$(IOS)
CXXFLAGS = -Xassembler -aln=$@.lst $(CFLAGS) CXXFLAGS = $(CFLAGS)
LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map,--section-start,.init=0x80B00000,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,malloc_usable_size LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map,--section-start,.init=0x80B00000,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,malloc_usable_size
-include $(PROJECTDIR)/Make.config
ifeq ($(BUILDMODE),channel) ifeq ($(BUILDMODE),channel)
CFLAGS += -DFULLCHANNEL CFLAGS += -DFULLCHANNEL
@ -149,6 +148,9 @@ export OUTPUT := $(CURDIR)/$(TARGET)
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
$(BUILD): $(BUILD):
@[ -d $@ ] || mkdir -p $@ @[ -d $@ ] || mkdir -p $@
ifneq ($(IOS),249)
@rm -f $(BUILD)/CSettings.o
endif
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
channel: channel:
@ -167,9 +169,8 @@ theme:
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
all: all:
@[ -d build ] || mkdir -p build
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile language @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile lang
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
clean: clean:

View File

@ -19,7 +19,7 @@
#include "utils/ShowError.h" #include "utils/ShowError.h"
#include "gecko.h" #include "gecko.h"
static const char * LanguageFilesURL = "http://usbloader-gui.googlecode.com/svn/tags/USBLoaderGX_v2_3/Languages/"; static const char * LanguageFilesURL = "http://usbloader-gui.googlecode.com/svn/trunk/Languages/";
int DownloadAllLanguageFiles() int DownloadAllLanguageFiles()
{ {

View File

@ -232,9 +232,9 @@ void WindowCredits()
char SvnRev[80]; char SvnRev[80];
#ifdef FULLCHANNEL #ifdef FULLCHANNEL
snprintf(SvnRev, sizeof(SvnRev), "v2.3c IOS%u (Rev %u)", IOS_GetVersion(), IOS_GetRevision()); snprintf(SvnRev, sizeof(SvnRev), "Rev%sc IOS%u (Rev %u)", GetRev(), IOS_GetVersion(), IOS_GetRevision());
#else #else
snprintf(SvnRev, sizeof(SvnRev), "v2.3 IOS%u (Rev %u)", IOS_GetVersion(), IOS_GetRevision()); snprintf(SvnRev, sizeof(SvnRev), "Rev%s IOS%u (Rev %u)", GetRev(), IOS_GetVersion(), IOS_GetRevision());
#endif #endif
char IosInfo[80] = ""; char IosInfo[80] = "";

View File

@ -118,6 +118,8 @@ int UninstallSM::GetMenuInternal()
if (CheckFile(filepath)) remove(filepath); if (CheckFile(filepath)) remove(filepath);
snprintf(filepath, sizeof(filepath), "%s%s.png", Settings.covers2d_path, GameID); snprintf(filepath, sizeof(filepath), "%s%s.png", Settings.covers2d_path, GameID);
if (CheckFile(filepath)) remove(filepath); if (CheckFile(filepath)) remove(filepath);
snprintf(filepath, sizeof(filepath), "%s%s.png", Settings.coversFull_path, GameID);
if (CheckFile(filepath)) remove(filepath);
snprintf(filepath, sizeof(filepath), "%s%s.png", Settings.disc_path, GameID); snprintf(filepath, sizeof(filepath), "%s%s.png", Settings.disc_path, GameID);
if (CheckFile(filepath)) remove(filepath); if (CheckFile(filepath)) remove(filepath);
snprintf(filepath, sizeof(filepath), "%s%s.txt", Settings.TxtCheatcodespath, GameID); snprintf(filepath, sizeof(filepath), "%s%s.txt", Settings.TxtCheatcodespath, GameID);
@ -159,6 +161,8 @@ int UninstallSM::GetMenuInternal()
if (CheckFile(filepath)) remove(filepath); if (CheckFile(filepath)) remove(filepath);
snprintf(filepath, sizeof(filepath), "%s%s.png", Settings.covers2d_path, GameID); snprintf(filepath, sizeof(filepath), "%s%s.png", Settings.covers2d_path, GameID);
if (CheckFile(filepath)) remove(filepath); if (CheckFile(filepath)) remove(filepath);
snprintf(filepath, sizeof(filepath), "%s%s.png", Settings.coversFull_path, GameID);
if (CheckFile(filepath)) remove(filepath);
} }
//! Settings: Delete Disc Artwork //! Settings: Delete Disc Artwork

View File

@ -43,7 +43,7 @@ EOF
<app version="1"> <app version="1">
<name> USB Loader GX</name> <name> USB Loader GX</name>
<coder>USB Loader GX Team</coder> <coder>USB Loader GX Team</coder>
<version>2.2 r$rev_new</version> <version>2.3 r$rev_new</version>
<release_date>$rev_date</release_date> <release_date>$rev_date</release_date>
<!-- // remove this line to enable arguments <!-- // remove this line to enable arguments
<arguments> <arguments>