Finally move flash0 into assets, fixing #9468 and #9520

CMake fix
Fix the innosetup and zip scripts for the new assets location

CMakeLists.txt

@@ -1780,7 +1780,7 @@ if (TargetBin)
 		# TODO: there must a native way to copy these.
 		# Now this is very prone to errors when changes occur.
 		# Also better to have assets under Resources dir for OS X.
-		file(GLOB_RECURSE FLASH0_FILES flash0/*)
+		file(GLOB_RECURSE FLASH0_FILES assets/flash0/*)
 		file(GLOB_RECURSE LANG_FILES assets/lang/*)
 		file(GLOB_RECURSE SHADER_FILES assets/shaders/*)
 
@@ -1805,7 +1805,7 @@ endif()
 # installs
 if(NOT ANDROID)
 file(INSTALL ${NativeAssets} DESTINATION assets)
-file(INSTALL flash0 DESTINATION assets)
+file(INSTALL assets/flash0 DESTINATION assets)
 endif()
 # packaging and code signing
 if(IOS)

Core/System.cpp

@@ -637,7 +637,7 @@ void InitSysDirectories() {
 	const std::string path = File::GetExeDirectory();
 
 	// Mount a filesystem
-	g_Config.flash0Directory = path + "flash0/";
+	g_Config.flash0Directory = path + "assets/flash0/";
 
 	// Detect the "My Documents"(XP) or "Documents"(on Vista/7/8) folder.
 #if PPSSPP_PLATFORM(UWP)

UI/NativeApp.cpp

@@ -353,7 +353,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
 		config = "./config";
 
 	g_Config.memStickDirectory = config + "/ppsspp/";
-	g_Config.flash0Directory = File::GetExeDirectory() + "/flash0/";
+	g_Config.flash0Directory = File::GetExeDirectory() + "/assets/flash0/";
 #endif
 
 	if (cache_dir && strlen(cache_dir)) {

Windows/zipup.cmd

@@ -16,7 +16,7 @@ REM Not distributing the 10 version because it's not compatible with older Windo
 copy dx9sdk\8.1\Redist\D3D\x64\d3dcompiler_47.dll .
 copy dx9sdk\8.1\Redist\D3D\x86\d3dcompiler_47.dll .\d3dcompiler_47.x86.dll
 @echo on
-zip --recurse-paths %name% assets flash0 PPSSPPWindows.exe PPSSPPWindows64.exe d3dcompiler_47.dll d3dcompiler_47.x86.dll README.md
+zip --recurse-paths %name% assets PPSSPPWindows.exe PPSSPPWindows64.exe d3dcompiler_47.dll d3dcompiler_47.x86.dll README.md
 @echo off
 del d3dcompiler_47.dll d3dcompiler_v47.x86.dll
 

headless/Headless.cpp

@@ -365,7 +365,7 @@ int main(int argc, const char* argv[])
 	}
 	// Or else, maybe in the executable's dir.
 	if (!File::Exists(g_Config.flash0Directory))
-		g_Config.flash0Directory = File::GetExeDirectory() + "flash0/";
+		g_Config.flash0Directory = File::GetExeDirectory() + "assets/flash0/";
 
 	if (screenshotFilename != 0)
 		headlessHost->SetComparisonScreenshot(screenshotFilename);

ppsspp.iss

@@ -23,7 +23,7 @@ Source: "notinstalled.txt"; DestName: "installed.txt"; DestDir: "{app}";
 Source: "assets\*.*"; DestDir: "{app}\assets"
 Source: "assets\shaders\*.*"; DestDir: "{app}\assets\shaders"
 Source: "assets\lang\*.ini"; DestDir: "{app}\assets\lang"
-Source: "flash0\font\*.*"; DestDir: "{app}\flash0\font"
+Source: "assets\flash0\font\*.*"; DestDir: "{app}\assets\flash0\font"
 Source: "dx9sdk\8.1\Redist\D3D\x64\d3dcompiler_47.dll"; DestDir: "{app}"
 Source: "dx9sdk\8.1\Redist\D3D\x86\d3dcompiler_47.dll"; DestName: "d3dcompiler_47.x86.dll"; DestDir: "{app}"