diff --git a/build/aegisub_vs2005/aegisub_vs2005.vcproj b/build/aegisub_vs2005/aegisub_vs2005.vcproj index 40495695dec0b26dcc0a1c4694accae9fe15ff15..f840a1d186436aca01d74a6a8ba37df2fcc59197 100644 --- a/build/aegisub_vs2005/aegisub_vs2005.vcproj +++ b/build/aegisub_vs2005/aegisub_vs2005.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8.00" + Version="8,00" Name="aegisub_vs2005" ProjectGUID="{65C67A5D-D31C-4DB6-965B-69AF7EFA4B5A}" RootNamespace="aegisub_vs2005" @@ -157,7 +157,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="../../bin/aegisub_d.exe" + OutputFile="../../bin/aegisub_d_x64.exe" LinkIncremental="2" AdditionalLibraryDirectories="../../lib" GenerateManifest="true" @@ -328,7 +328,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="../../bin/aegisub.exe" + OutputFile="../../bin/aegisub_x64.exe" LinkIncremental="1" AdditionalLibraryDirectories="../../lib" GenerateManifest="true" diff --git a/hunspell/src/win_api/libhunspell.vcproj b/hunspell/src/win_api/libhunspell.vcproj index 0e9031b9db430393426444478bf8d4525b98de11..d22ad18c0c340e86420914b7fe2ab9f680ca0c4e 100644 --- a/hunspell/src/win_api/libhunspell.vcproj +++ b/hunspell/src/win_api/libhunspell.vcproj @@ -87,14 +87,13 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" - IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + Name="Debug|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" - WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -110,21 +109,21 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="2" + Optimization="0" AdditionalIncludeDirectories="..\hunspell;." - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb" WarningLevel="4" Detect64BitPortabilityProblems="false" - DebugInformationFormat="0" + DebugInformationFormat="3" DisableSpecificWarnings="4706" /> <Tool @@ -132,15 +131,14 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\lib\libhunspell.lib" + AdditionalOptions="/machine:x64" + OutputFile="..\..\..\lib\libhunspell_d_x64.lib" /> <Tool Name="VCALinkTool" @@ -150,7 +148,6 @@ /> <Tool Name="VCBscMakeTool" - SuppressStartupBanner="false" /> <Tool Name="VCFxCopTool" @@ -160,13 +157,14 @@ /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -182,21 +180,21 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="3" + InlineFunctionExpansion="2" AdditionalIncludeDirectories="..\hunspell;." - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HUNSPELL_STATIC;_CRT_SECURE_NO_WARNINGS" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb" WarningLevel="4" Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" + DebugInformationFormat="0" DisableSpecificWarnings="4706" /> <Tool @@ -204,13 +202,15 @@ /> <Tool Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\lib\libhunspell_d.lib" + OutputFile="..\..\..\lib\libhunspell.lib" /> <Tool Name="VCALinkTool" @@ -220,6 +220,7 @@ /> <Tool Name="VCBscMakeTool" + SuppressStartupBanner="false" /> <Tool Name="VCFxCopTool" @@ -283,7 +284,8 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\..\..\lib\libhunspell.lib" + AdditionalOptions="/machine:x64" + OutputFile="..\..\..\lib\libhunspell_x64.lib" /> <Tool Name="VCALinkTool" @@ -329,7 +331,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="Debug|x64" > <Tool Name="VCCLCompilerTool" @@ -337,7 +339,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release|Win32" > <Tool Name="VCCLCompilerTool" diff --git a/installer/latest.txt b/installer/latest.txt index f9bd19373a20d7a09070628277be9f8a3f19465a..18780fd8e8ebdefb5841c9ffb91a9df3608d6ad3 100644 --- a/installer/latest.txt +++ b/installer/latest.txt @@ -1,3 +1,3 @@ release;1.10-524;http://www.aegisub.net/;Aegisub 1.10 -svn;1787;http://www.malakith.net/amz/aegisub/;Aegisub Pre-Release 2.00 r1787 build - Several important bug fixes... as usual. \ No newline at end of file +svn;1813;http://www.malakith.net/amz/aegisub/;Aegisub Pre-Release 2.00 r1813 build - Guess what? Bug fixes! \ No newline at end of file diff --git a/lua51/lua51_vc8.vcproj b/lua51/lua51_vc8.vcproj index abcdb61dfe2fc973aac5c4f2fca466c50e4af069..04f65f87a197d4310fd70e073cfcbe5930a3bade 100644 --- a/lua51/lua51_vc8.vcproj +++ b/lua51/lua51_vc8.vcproj @@ -87,12 +87,12 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="..\lib\" - IntermediateDirectory="Release" + Name="Debug|x64" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" + CharacterSet="1" > <Tool Name="VCPreBuildEventTool" @@ -108,15 +108,22 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - RuntimeLibrary="2" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + DisableLanguageExtensions="false" UsePrecompiledHeader="0" WarningLevel="3" + WarnAsError="true" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" + CompileAs="2" DisableSpecificWarnings="4996" /> <Tool @@ -130,7 +137,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="$(OutDir)/lua51.lib" + OutputFile="$(OutDir)/lua51d_x64.lib" /> <Tool Name="VCALinkTool" @@ -149,12 +156,12 @@ /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + Name="Release|Win32" + OutputDirectory="..\lib\" + IntermediateDirectory="Release" ConfigurationType="4" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="1" + CharacterSet="2" > <Tool Name="VCPreBuildEventTool" @@ -170,22 +177,15 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - DisableLanguageExtensions="false" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" - WarnAsError="true" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" - CompileAs="2" DisableSpecificWarnings="4996" /> <Tool @@ -199,7 +199,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="$(OutDir)/lua51d.lib" + OutputFile="$(OutDir)/lua51.lib" /> <Tool Name="VCALinkTool" @@ -262,7 +262,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="$(OutDir)/lua51.lib" + OutputFile="$(OutDir)/lua51_x64.lib" /> <Tool Name="VCALinkTool"