diff --git a/build/PortableInstaller/PortableInstaller.vcxproj b/build/PortableInstaller/PortableInstaller.vcxproj index e6f5f8003..23e6b5efb 100644 --- a/build/PortableInstaller/PortableInstaller.vcxproj +++ b/build/PortableInstaller/PortableInstaller.vcxproj @@ -132,12 +132,6 @@ - - - - - - dictionaries\ diff --git a/build/PortableInstaller/PortableInstaller.vcxproj.filters b/build/PortableInstaller/PortableInstaller.vcxproj.filters index 14d7d29a6..cf2d140a8 100644 --- a/build/PortableInstaller/PortableInstaller.vcxproj.filters +++ b/build/PortableInstaller/PortableInstaller.vcxproj.filters @@ -13,9 +13,6 @@ {61b13b0c-d018-48c6-8629-b44b83aa0dc8} - - {0461dadd-a953-4fee-8240-bf3eb1d3a240} - {8880eb0c-4bf7-424d-9a79-73c20c2dd169} @@ -102,18 +99,6 @@ - - Runtime - - - Runtime - - - Runtime - - - Runtime - CSRI diff --git a/build/standard-settings.props b/build/standard-settings.props index bdd8e7ac6..04b290fa7 100644 --- a/build/standard-settings.props +++ b/build/standard-settings.props @@ -55,7 +55,7 @@ - MultiThreadedDLL + MultiThreaded MaxSpeed true true diff --git a/packages/win_installer/aegisub3.iss b/packages/win_installer/aegisub3.iss index c9481406c..d3c109eef 100644 --- a/packages/win_installer/aegisub3.iss +++ b/packages/win_installer/aegisub3.iss @@ -50,7 +50,6 @@ ArchitecturesAllowed=x64 #include "fragment_mainprogram.iss" #include "fragment_associations.iss" -#include "fragment_runtimes.iss" #ifdef ARCH64 #include "fragment_codecs_64.iss" #else diff --git a/packages/win_installer/fragment_runtimes.iss b/packages/win_installer/fragment_runtimes.iss deleted file mode 100644 index 5c27d11ad..000000000 --- a/packages/win_installer/fragment_runtimes.iss +++ /dev/null @@ -1,49 +0,0 @@ -; Copyright (c) 2007-2009, Niels Martin Hansen -; -; Redistribution and use in source and binary forms, with or without -; modification, are permitted provided that the following conditions are met: -; -; * Redistributions of source code must retain the above copyright notice, -; this list of conditions and the following disclaimer. -; * Redistributions in binary form must reproduce the above copyright notice, -; this list of conditions and the following disclaimer in the documentation -; and/or other materials provided with the distribution. -; * Neither the name of the Aegisub Group nor the names of its contributors -; may be used to endorse or promote products derived from this software -; without specific prior written permission. -; -; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -; ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -; LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -; SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -; CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -; POSSIBILITY OF SUCH DAMAGE. -; -; ----------------------------------------------------------------------------- -; -; AEGISUB -; -; Website: http://www.aegisub.org/ -; Contact: mailto:nielsm@indvikleren.dk -; - -; This file implements checking for and installing runtime libraries for Aegisub -#ifdef ARCH64 -#define SUFFIX "x64" -#else -#define SUFFIX "x86" -#endif - -[Files] -Source: src\redist\{#SUFFIX}\Microsoft.VC140.CRT\msvcp140.dll; DestDir: {app}; Flags: ignoreversion -Source: src\redist\{#SUFFIX}\Microsoft.VC140.CRT\concrt140.dll; DestDir: {app}; Flags: ignoreversion -Source: src\redist\{#SUFFIX}\Microsoft.VC140.CRT\vccorlib140.dll; DestDir: {app}; Flags: ignoreversion -Source: src\redist\{#SUFFIX}\Microsoft.VC140.CRT\vcruntime140.dll; DestDir: {app}; Flags: ignoreversion -Source: src\redist\{#SUFFIX}\Microsoft.VC140.MFC\mfc140u.dll; DestDir: {app}; Flags: ignoreversion -Source: src\redist\{#SUFFIX}\Microsoft.VC140.MFC\mfcm140u.dll; DestDir: {app}; Flags: ignoreversion -