- Set to v5.4.0

Fledge68 · Dec 25, 2019 · 1a4a5e0 · 1a4a5e0
1 parent a721007
commit 1a4a5e0
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 30 deletions.
diff --git a/out/bins/ext_booter.bin b/out/bins/ext_booter.bin
diff --git a/out/boot.dol b/out/boot.dol
diff --git a/source/defines.h b/source/defines.h
@@ -1,21 +1,10 @@
 
-#define APP_WIIFLOW //uncomment this line to compile wfl as wiiflow
-
-#ifdef APP_WIIFLOW
 #define APP_NAME "WiiFlow WFL"
-#else
-#define APP_NAME "WiiFlow Lite"
-#endif
-#define APP_VERSION "5.3.0 beta 15"
+#define APP_VERSION "5.4.0"
 
 #define APP_DATA_DIR "wiiflow"
-#ifdef APP_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 HOMEBREW_DIR "apps"
 #define DF_GC_GAMES_DIR "%s:/games"

diff --git a/source/gui/video.cpp b/source/gui/video.cpp
@@ -705,11 +705,7 @@ void CVideo::waitMessage(const TexData &tex)
 void CVideo::startImage(void)
 {
  TexData splashTex;
-#ifdef APP_WIIFLOW
  TexHandle.fromJPG(splashTex, wfsplash_jpg, wfsplash_jpg_size);
-#else
- TexHandle.fromJPG(splashTex, wflsplash_jpg, wflsplash_jpg_size);
-#endif
 
  waitMessage(splashTex);
  render();

diff --git a/source/homebrew/homebrew.cpp b/source/homebrew/homebrew.cpp
@@ -141,22 +141,14 @@ void writeStub()
 
  /* Extract our stub */
  u32 StubSize = 0;
-#ifdef APP_WIIFLOW
  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 */
  memcpy((void*)0x80001800, Stub, StubSize);
  DCFlushRange((void*)0x80001800, StubSize);
 
  /* And free the memory again */
-#ifdef APP_WIIFLOW
  if(Stub != wfstub_bin)
-#else
- if(Stub != stub_bin)
-#endif
  free(Stub);
 }
 

diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp
@@ -412,14 +412,9 @@ bool CMenu::init(bool usb_mounted)
  /* Check if locked, set return to, set exit to, and init multi threading */
  m_locked = m_cfg.getString("GENERAL", "parent_code", "").size() >= 4;
 
- /* Switch the WFLA and DWFA when using official wiiflow */
-#ifdef APP_WIIFLOW
+ /* Switch WFLA to DWFA in case they were using old wiiflow lite */
  if(m_cfg.getString("GENERAL", "returnto") == "WFLA")
  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 */
  /* 0 thru 2 of exit to enum (EXIT_TO_MENU, EXIT_TO_HBC, EXIT_TO_WIIU) in sys.h */