From b3fe96e996fe8f70740ce5f61ca78e16a4ef9b8f Mon Sep 17 00:00:00 2001 From: MELERIX Date: Sun, 1 Mar 2015 21:37:55 -0300 Subject: [PATCH] Cleanup & Updates for installer. - Removed old Spanish langs from installer. - Updated proper Project64 Stup version. --- Source/Installer/Installer.iss | 2 -- Source/Installer/Installer.vcproj | 4 ++-- Source/Installer/Installer.vcxproj | 4 ++-- Source/Installer/package_zip.bat | 2 -- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Source/Installer/Installer.iss b/Source/Installer/Installer.iss index a1fd4e1c0..9a68b8d4a 100644 --- a/Source/Installer/Installer.iss +++ b/Source/Installer/Installer.iss @@ -55,8 +55,6 @@ Source: "{#BaseDir}\Lang\Lithuanian.pj.Lang"; DestDir: "{app}\Lang" Source: "{#BaseDir}\Lang\Norwegian.pj.Lang"; DestDir: "{app}\Lang" Source: "{#BaseDir}\Lang\Polish.pj.Lang"; DestDir: "{app}\Lang" Source: "{#BaseDir}\Lang\Russian.pj.Lang"; DestDir: "{app}\Lang" -Source: "{#BaseDir}\Lang\Spanish (South America).pj.Lang"; DestDir: "{app}\Lang" -Source: "{#BaseDir}\Lang\Spanish (Spain).pj.Lang"; DestDir: "{app}\Lang" Source: "{#BaseDir}\Lang\Spanish.pj.Lang"; DestDir: "{app}\Lang" Source: "{#BaseDir}\Lang\Swedish.pj.Lang"; DestDir: "{app}\Lang" Source: "{#BaseDir}\Lang\T-Chinese.pj.Lang"; DestDir: "{app}\Lang" diff --git a/Source/Installer/Installer.vcproj b/Source/Installer/Installer.vcproj index c8a3f6b60..f8c0c9e39 100644 --- a/Source/Installer/Installer.vcproj +++ b/Source/Installer/Installer.vcproj @@ -136,7 +136,7 @@ Name="VCCustomBuildTool" CommandLine=""$(Root)bin\Inno Setup\ISCC.exe" /dConfiguration="$(ConfigurationName)" "$(InputName).iss" " AdditionalDependencies="$(OutDir)\Project64.exe" - Outputs="$(OutDir)\Setup Project64 2.0.exe" + Outputs="$(OutDir)\Setup Project64 2.2.exe" /> diff --git a/Source/Installer/Installer.vcxproj b/Source/Installer/Installer.vcxproj index 357464d54..ef90d088b 100644 --- a/Source/Installer/Installer.vcxproj +++ b/Source/Installer/Installer.vcxproj @@ -54,10 +54,10 @@ "$(Root)bin\Inno Setup\ISCC.exe" /dConfiguration="$(Configuration)" "%(Filename).iss" $(OutDir)Project64.exe;%(AdditionalInputs) - $(OutDir)Setup Project64 2.0.exe;%(Outputs) + $(OutDir)Setup Project64 2.2.exe;%(Outputs) "$(Root)bin\Inno Setup\ISCC.exe" /dConfiguration="$(Configuration)" "%(Filename).iss" $(OutDir)Project64.exe;%(AdditionalInputs) - $(OutDir)Setup Project64 2.0.exe;%(Outputs) + $(OutDir)Setup Project64 2.2.exe;%(Outputs) diff --git a/Source/Installer/package_zip.bat b/Source/Installer/package_zip.bat index 1f392fb98..d300794cf 100644 --- a/Source/Installer/package_zip.bat +++ b/Source/Installer/package_zip.bat @@ -47,8 +47,6 @@ copy "%base_dir%\Lang\Lithuanian.pj.Lang" "%base_dir%\Bin\Package\Lang" copy "%base_dir%\Lang\Norwegian.pj.Lang" "%base_dir%\Bin\Package\Lang" copy "%base_dir%\Lang\Polish.pj.Lang" "%base_dir%\Bin\Package\Lang" copy "%base_dir%\Lang\Russian.pj.Lang" "%base_dir%\Bin\Package\Lang" -copy "%base_dir%\Lang\Spanish (South America).pj.Lang" "%base_dir%\Bin\Package\Lang" -copy "%base_dir%\Lang\Spanish (Spain).pj.Lang" "%base_dir%\Bin\Package\Lang" copy "%base_dir%\Lang\Spanish.pj.Lang" "%base_dir%\Bin\Package\Lang" copy "%base_dir%\Lang\Swedish.pj.Lang" "%base_dir%\Bin\Package\Lang" copy "%base_dir%\Lang\T-Chinese.pj.Lang" "%base_dir%\Bin\Package\Lang"