diff --git a/aegisub/version.cpp b/aegisub/version.cpp index 6fb95202e3873e3a584d9aeeb210673512e5419a..588242a46d8f8973929034b8aaf5b29a1a577551 100644 --- a/aegisub/version.cpp +++ b/aegisub/version.cpp @@ -78,7 +78,7 @@ struct VersionInfoStruct { wxString SCMStr, VersionStr; // Update this whenever a new version is released - VersionNumber = _T("v2.0.0"); + VersionNumber = _T("v2.1.0"); #ifdef _DEBUG IsDebug = true; #else diff --git a/assdraw/assdraw.vcproj b/assdraw/assdraw.vcproj index f61c1636aa10feff0b9688dad4a2c38cdb228ce4..6e99d3500f2774d8116dcc7f37119bbf40bee5ed 100644 --- a/assdraw/assdraw.vcproj +++ b/assdraw/assdraw.vcproj @@ -11,6 +11,9 @@ <Platform Name="Win32" /> + <Platform + Name="x64" + /> </Platforms> <ToolFiles> </ToolFiles> @@ -60,6 +63,7 @@ /> <Tool Name="VCLinkerTool" + OutputFile="$(OutDir)\assdraw3_d.exe" LinkIncremental="2" GenerateDebugInformation="true" SubSystem="2" @@ -90,6 +94,83 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\assdraw3_d_x64.exe" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" @@ -133,6 +214,7 @@ /> <Tool Name="VCLinkerTool" + OutputFile="$(OutDir)\assdraw3.exe" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" @@ -165,6 +247,83 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\assdraw3_x64.exe" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> </Configurations> <References> </References> diff --git a/assdraw/src/assdraw.cpp b/assdraw/src/assdraw.cpp index a6f228f99849b9905c6b882d012c997fbf00c109..8635a023612d052631f0f681f6f0fc61996eb8ce 100644 --- a/assdraw/src/assdraw.cpp +++ b/assdraw/src/assdraw.cpp @@ -47,7 +47,12 @@ ///////////// // Libraries #ifdef __VISUALC__ +#pragma comment(lib, "Vfw32.lib") #pragma comment(lib, "comctl32.lib") +#pragma comment(lib, "rpcrt4.lib") +#pragma comment(lib, "winmm.lib") +#pragma comment(lib, "advapi32.lib") +#pragma comment(lib, "wsock32.lib") #ifdef __WXDEBUG__ #pragma comment(lib, "wxmsw28ud_propgrid.lib") #else diff --git a/assdraw/src/engine.cpp b/assdraw/src/engine.cpp index 101e2f9ccb296c1b96182471843ff164d159c6ef..7bc3c211e94ba1faba0d6f79040242c9ef0a2262 100644 --- a/assdraw/src/engine.cpp +++ b/assdraw/src/engine.cpp @@ -146,7 +146,7 @@ ASSDrawEngine::ASSDrawEngine( wxWindow *parent, int extraflags ) ASSDrawEngine::~ASSDrawEngine() { ResetEngine ( false ); - delete pointsys; + //delete pointsys; } // parse ASS draw commands; returns the number of parsed commands