From d53a8208d386b9e7dc3b19e470ccdc9c61d5db0b Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Tue, 15 Oct 2013 11:55:02 +0200 Subject: [PATCH] Add InnoSetup script to make a basic installer. Adds a redist submodule where the installer can get the VC redists. --- .gitmodules | 3 +++ notinstalled.txt | 2 ++ ppsspp.iss | 41 +++++++++++++++++++++++++++++++++++++++++ redist | 1 + 4 files changed, 47 insertions(+) create mode 100644 notinstalled.txt create mode 100644 ppsspp.iss create mode 160000 redist diff --git a/.gitmodules b/.gitmodules index 9ef58f55bc..6357ba72a7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "dx9sdk"] path = dx9sdk url = https://github.com/hrydgard/minidx9.git +[submodule "redist"] + path = redist + url = https://github.com/hrydgard/ppsspp-redist.git diff --git a/notinstalled.txt b/notinstalled.txt new file mode 100644 index 0000000000..b0df32871b --- /dev/null +++ b/notinstalled.txt @@ -0,0 +1,2 @@ +This gets renamed to "installed.txt" in the installer. +Tells PPSSPP to consider itself installed and to not write data files into its own directory. \ No newline at end of file diff --git a/ppsspp.iss b/ppsspp.iss new file mode 100644 index 0000000000..a1c4acf1c9 --- /dev/null +++ b/ppsspp.iss @@ -0,0 +1,41 @@ +[Setup] +AppName={cm:AppName} +AppVersion=0.9.5 +DefaultDirName={pf}\PPSSPP +; Since no icons will be created in "{group}", we don't need the wizard +; to ask for a Start Menu folder name: +DisableProgramGroupPage=yes +UninstallDisplayIcon={app}\PPSSPPWindows.exe +OutputDir=. +UsePreviousLanguage=no + +[CustomMessages] +AppName=PPSSPP +LaunchProgram=Start PPSSPP after finishing installation + +[Files] +Source: "PPSSPPWindows.exe"; DestDir: "{app}" +Source: "README.md"; DestName: "README.txt"; DestDir: "{app}"; Flags: isreadme +Source: "notinstalled.txt"; DestName: "installed.txt"; DestDir: "{app}"; +Source: "assets\ppge_atlas.zim"; DestDir: "{app}\assets" +Source: "assets\ui_atlas.zim"; DestDir: "{app}\assets" +Source: "lang\*.ini"; DestDir: "{app}\lang" +Source: "flash0\font\*.*"; DestDir: "{app}\flash0\font" +Source: "redist/vcredist_x86.exe"; DestDir: {tmp} + +[Run] +Filename: {tmp}\vcredist_x86.exe; Parameters: "/passive /Q:a /c:""msiexec /qb /i vcredist.msi"" "; StatusMsg: Installing 2010 RunTime... +; Hm, I wonder if we need to manually delete vcredist_x86.exe as well. +Filename: {app}\PPSSPPWindows.exe; Description: {cm:LaunchProgram,{cm:AppName}}; Flags: nowait postinstall skipifsilent + +[Icons] +Name: "{commonprograms}\PPSSPP"; Filename: "{app}\PPSSPPWindows.exe" + +[Code] +begin + +if (not isUninstaller()) then begin + SaveStringToFile(ExpandFilename('installed.txt'), 'Installed' + #13#10, False); +end + +end. \ No newline at end of file diff --git a/redist b/redist new file mode 160000 index 0000000000..9d7d3ec5a0 --- /dev/null +++ b/redist @@ -0,0 +1 @@ +Subproject commit 9d7d3ec5a0f8ddbeede4562627b6efb5c0b94e8e