From 8d1ece05ca5d7de2e1926b8c7469a5d5f616c6b8 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Fri, 31 Mar 2017 23:50:17 +0200 Subject: [PATCH] Finally move flash0 into assets, fixing #9468 and #9520 CMake fix Fix the innosetup and zip scripts for the new assets location --- CMakeLists.txt | 4 ++-- Core/System.cpp | 2 +- UI/NativeApp.cpp | 2 +- Windows/zipup.cmd | 2 +- {flash0 => assets/flash0}/font/jpn0.pgf | Bin {flash0 => assets/flash0}/font/kr0.pgf | Bin {flash0 => assets/flash0}/font/ltn0.pgf | Bin {flash0 => assets/flash0}/font/ltn1.pgf | Bin {flash0 => assets/flash0}/font/ltn10.pgf | Bin {flash0 => assets/flash0}/font/ltn11.pgf | Bin {flash0 => assets/flash0}/font/ltn12.pgf | Bin {flash0 => assets/flash0}/font/ltn13.pgf | Bin {flash0 => assets/flash0}/font/ltn14.pgf | Bin {flash0 => assets/flash0}/font/ltn15.pgf | Bin {flash0 => assets/flash0}/font/ltn2.pgf | Bin {flash0 => assets/flash0}/font/ltn3.pgf | Bin {flash0 => assets/flash0}/font/ltn4.pgf | Bin {flash0 => assets/flash0}/font/ltn5.pgf | Bin {flash0 => assets/flash0}/font/ltn6.pgf | Bin {flash0 => assets/flash0}/font/ltn7.pgf | Bin {flash0 => assets/flash0}/font/ltn8.pgf | Bin {flash0 => assets/flash0}/font/ltn9.pgf | Bin headless/Headless.cpp | 2 +- ppsspp.iss | 2 +- 24 files changed, 7 insertions(+), 7 deletions(-) rename {flash0 => assets/flash0}/font/jpn0.pgf (100%) rename {flash0 => assets/flash0}/font/kr0.pgf (100%) rename {flash0 => assets/flash0}/font/ltn0.pgf (100%) rename {flash0 => assets/flash0}/font/ltn1.pgf (100%) rename {flash0 => assets/flash0}/font/ltn10.pgf (100%) rename {flash0 => assets/flash0}/font/ltn11.pgf (100%) rename {flash0 => assets/flash0}/font/ltn12.pgf (100%) rename {flash0 => assets/flash0}/font/ltn13.pgf (100%) rename {flash0 => assets/flash0}/font/ltn14.pgf (100%) rename {flash0 => assets/flash0}/font/ltn15.pgf (100%) rename {flash0 => assets/flash0}/font/ltn2.pgf (100%) rename {flash0 => assets/flash0}/font/ltn3.pgf (100%) rename {flash0 => assets/flash0}/font/ltn4.pgf (100%) rename {flash0 => assets/flash0}/font/ltn5.pgf (100%) rename {flash0 => assets/flash0}/font/ltn6.pgf (100%) rename {flash0 => assets/flash0}/font/ltn7.pgf (100%) rename {flash0 => assets/flash0}/font/ltn8.pgf (100%) rename {flash0 => assets/flash0}/font/ltn9.pgf (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 19038c88a4..b6ed0e50e3 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/Core/System.cpp b/Core/System.cpp index 3d35e40843..afa680b0e7 100644 --- a/Core/System.cpp +++ b/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) diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 8452d4d61d..63774b03a4 100644 --- a/UI/NativeApp.cpp +++ b/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)) { diff --git a/Windows/zipup.cmd b/Windows/zipup.cmd index 141777bcdf..011770fdcc 100644 --- a/Windows/zipup.cmd +++ b/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 diff --git a/flash0/font/jpn0.pgf b/assets/flash0/font/jpn0.pgf similarity index 100% rename from flash0/font/jpn0.pgf rename to assets/flash0/font/jpn0.pgf diff --git a/flash0/font/kr0.pgf b/assets/flash0/font/kr0.pgf similarity index 100% rename from flash0/font/kr0.pgf rename to assets/flash0/font/kr0.pgf diff --git a/flash0/font/ltn0.pgf b/assets/flash0/font/ltn0.pgf similarity index 100% rename from flash0/font/ltn0.pgf rename to assets/flash0/font/ltn0.pgf diff --git a/flash0/font/ltn1.pgf b/assets/flash0/font/ltn1.pgf similarity index 100% rename from flash0/font/ltn1.pgf rename to assets/flash0/font/ltn1.pgf diff --git a/flash0/font/ltn10.pgf b/assets/flash0/font/ltn10.pgf similarity index 100% rename from flash0/font/ltn10.pgf rename to assets/flash0/font/ltn10.pgf diff --git a/flash0/font/ltn11.pgf b/assets/flash0/font/ltn11.pgf similarity index 100% rename from flash0/font/ltn11.pgf rename to assets/flash0/font/ltn11.pgf diff --git a/flash0/font/ltn12.pgf b/assets/flash0/font/ltn12.pgf similarity index 100% rename from flash0/font/ltn12.pgf rename to assets/flash0/font/ltn12.pgf diff --git a/flash0/font/ltn13.pgf b/assets/flash0/font/ltn13.pgf similarity index 100% rename from flash0/font/ltn13.pgf rename to assets/flash0/font/ltn13.pgf diff --git a/flash0/font/ltn14.pgf b/assets/flash0/font/ltn14.pgf similarity index 100% rename from flash0/font/ltn14.pgf rename to assets/flash0/font/ltn14.pgf diff --git a/flash0/font/ltn15.pgf b/assets/flash0/font/ltn15.pgf similarity index 100% rename from flash0/font/ltn15.pgf rename to assets/flash0/font/ltn15.pgf diff --git a/flash0/font/ltn2.pgf b/assets/flash0/font/ltn2.pgf similarity index 100% rename from flash0/font/ltn2.pgf rename to assets/flash0/font/ltn2.pgf diff --git a/flash0/font/ltn3.pgf b/assets/flash0/font/ltn3.pgf similarity index 100% rename from flash0/font/ltn3.pgf rename to assets/flash0/font/ltn3.pgf diff --git a/flash0/font/ltn4.pgf b/assets/flash0/font/ltn4.pgf similarity index 100% rename from flash0/font/ltn4.pgf rename to assets/flash0/font/ltn4.pgf diff --git a/flash0/font/ltn5.pgf b/assets/flash0/font/ltn5.pgf similarity index 100% rename from flash0/font/ltn5.pgf rename to assets/flash0/font/ltn5.pgf diff --git a/flash0/font/ltn6.pgf b/assets/flash0/font/ltn6.pgf similarity index 100% rename from flash0/font/ltn6.pgf rename to assets/flash0/font/ltn6.pgf diff --git a/flash0/font/ltn7.pgf b/assets/flash0/font/ltn7.pgf similarity index 100% rename from flash0/font/ltn7.pgf rename to assets/flash0/font/ltn7.pgf diff --git a/flash0/font/ltn8.pgf b/assets/flash0/font/ltn8.pgf similarity index 100% rename from flash0/font/ltn8.pgf rename to assets/flash0/font/ltn8.pgf diff --git a/flash0/font/ltn9.pgf b/assets/flash0/font/ltn9.pgf similarity index 100% rename from flash0/font/ltn9.pgf rename to assets/flash0/font/ltn9.pgf diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 166a1274c0..888bcc735a 100644 --- a/headless/Headless.cpp +++ b/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); diff --git a/ppsspp.iss b/ppsspp.iss index 78c9f06711..f1b3c5bd72 100644 --- a/ppsspp.iss +++ b/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}"