- Set to v5.4.0

This commit is contained in:
Fledge68 2019-12-25 10:05:32 -06:00
parent a721007051
commit 1a4a5e0e93
6 changed files with 2 additions and 30 deletions

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 MiB

After

Width:  |  Height:  |  Size: 3.6 MiB

View File

@ -1,21 +1,10 @@
#define APP_WIIFLOW //uncomment this line to compile wfl as wiiflow
#ifdef APP_WIIFLOW
#define APP_NAME "WiiFlow WFL" #define APP_NAME "WiiFlow WFL"
#else #define APP_VERSION "5.4.0"
#define APP_NAME "WiiFlow Lite"
#endif
#define APP_VERSION "5.3.0 beta 15"
#define APP_DATA_DIR "wiiflow" #define APP_DATA_DIR "wiiflow"
#ifdef APP_WIIFLOW
#define APPS_DIR "apps/wiiflow" #define APPS_DIR "apps/wiiflow"
#else
#define APPS_DIR "apps/wiiflow_lite"
#endif
//#define EMU_NANDS_DIR "nands"
#define GAMES_DIR "%s:/wbfs" #define GAMES_DIR "%s:/wbfs"
#define HOMEBREW_DIR "apps" #define HOMEBREW_DIR "apps"
#define DF_GC_GAMES_DIR "%s:/games" #define DF_GC_GAMES_DIR "%s:/games"

View File

@ -705,11 +705,7 @@ void CVideo::waitMessage(const TexData &tex)
void CVideo::startImage(void) void CVideo::startImage(void)
{ {
TexData splashTex; TexData splashTex;
#ifdef APP_WIIFLOW
TexHandle.fromJPG(splashTex, wfsplash_jpg, wfsplash_jpg_size); TexHandle.fromJPG(splashTex, wfsplash_jpg, wfsplash_jpg_size);
#else
TexHandle.fromJPG(splashTex, wflsplash_jpg, wflsplash_jpg_size);
#endif
waitMessage(splashTex); waitMessage(splashTex);
render(); render();

View File

@ -141,22 +141,14 @@ void writeStub()
/* Extract our stub */ /* Extract our stub */
u32 StubSize = 0; u32 StubSize = 0;
#ifdef APP_WIIFLOW
u8 *Stub = DecompressCopy(wfstub_bin, wfstub_bin_size, &StubSize); u8 *Stub = DecompressCopy(wfstub_bin, wfstub_bin_size, &StubSize);
#else
u8 *Stub = DecompressCopy(stub_bin, stub_bin_size, &StubSize);
#endif
/* Copy our own stub into memory */ /* Copy our own stub into memory */
memcpy((void*)0x80001800, Stub, StubSize); memcpy((void*)0x80001800, Stub, StubSize);
DCFlushRange((void*)0x80001800, StubSize); DCFlushRange((void*)0x80001800, StubSize);
/* And free the memory again */ /* And free the memory again */
#ifdef APP_WIIFLOW
if(Stub != wfstub_bin) if(Stub != wfstub_bin)
#else
if(Stub != stub_bin)
#endif
free(Stub); free(Stub);
} }

View File

@ -412,14 +412,9 @@ bool CMenu::init(bool usb_mounted)
/* Check if locked, set return to, set exit to, and init multi threading */ /* Check if locked, set return to, set exit to, and init multi threading */
m_locked = m_cfg.getString("GENERAL", "parent_code", "").size() >= 4; m_locked = m_cfg.getString("GENERAL", "parent_code", "").size() >= 4;
/* Switch the WFLA and DWFA when using official wiiflow */ /* Switch WFLA to DWFA in case they were using old wiiflow lite */
#ifdef APP_WIIFLOW
if(m_cfg.getString("GENERAL", "returnto") == "WFLA") if(m_cfg.getString("GENERAL", "returnto") == "WFLA")
m_cfg.setString("GENERAL", "returnto", "DWFA"); m_cfg.setString("GENERAL", "returnto", "DWFA");
#else
if(m_cfg.getString("GENERAL", "returnto") == "DWFA")
m_cfg.setString("GENERAL", "returnto", "WFLA");
#endif
/* set WIIFLOW_DEF exit to option */ /* set WIIFLOW_DEF exit to option */
/* 0 thru 2 of exit to enum (EXIT_TO_MENU, EXIT_TO_HBC, EXIT_TO_WIIU) in sys.h */ /* 0 thru 2 of exit to enum (EXIT_TO_MENU, EXIT_TO_HBC, EXIT_TO_WIIU) in sys.h */