Enable optimization for Release builds, speed up all builds

HertzDevil · Dec 30, 2017 · a229cbc · a229cbc
1 parent 34aa6dd
commit a229cbc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/0CC-FamiTracker.reg b/0CC-FamiTracker.reg
@@ -4,6 +4,7 @@ REGEDIT
 ;   registered in your InitInstance automatically with a call to
 ;   CWinApp::RegisterShellFileTypes and COleObjectFactory::UpdateRegistryAll.
 
+HKEY_CLASSES_ROOT\.ftm = "0CC-FamiTracker Module"
 HKEY_CLASSES_ROOT\.0cc = "0CC-FamiTracker Module"
 HKEY_CLASSES_ROOT\0CCFamiTracker.Document\shell\open\command = 0CC-FamiTracker.EXE %1
 HKEY_CLASSES_ROOT\0CCFamiTracker.Document\shell\open\ddeexec = [open("%1")]
@@ -12,5 +13,6 @@ HKEY_CLASSES_ROOT\0CCFamiTracker.Document\shell\open\ddeexec\application = 0CC-F
     ;  (it defaults to the app name in "command")
 HKEY_CLASSES_ROOT\0CCFamiTracker.Document = 0CC-FamiTracker Module
 
+HKEY_CLASSES_ROOT\.fti = "0CC-FamiTracker Instrument"
 HKEY_CLASSES_ROOT\.0ci = "0CC-FamiTracker Instrument"
-HKEY_CLASSES_ROOT\0CCFamiTracker.Instrument = 0CC-FamiTracker Instrument
+HKEY_CLASSES_ROOT\0CCFamiTracker.Instrument = 0CC-FamiTracker Instrument
diff --git a/0CC-FamiTracker.sln b/0CC-FamiTracker.sln
@@ -16,47 +16,34 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Debug|Win32.Build.0 = Debug|Win32
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Debug|x64.ActiveCfg = Debug|x64
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Debug|x64.Build.0 = Debug|x64
-		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Debug|x86.ActiveCfg = Debug|Win32
-		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Debug|x86.Build.0 = Debug|Win32
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Release|Win32.ActiveCfg = Release|Win32
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Release|Win32.Build.0 = Release|Win32
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Release|x64.ActiveCfg = Release|x64
 		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Release|x64.Build.0 = Release|x64
-		{92FE0690-CE4F-4CCF-A52C-23265AE7429F}.Release|x86.ActiveCfg = Release|Win32
 		{33A617D6-9013-4AB7-8F3B-A033DDB0D3A0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{33A617D6-9013-4AB7-8F3B-A033DDB0D3A0}.Debug|Win32.Build.0 = Debug|Win32
 		{33A617D6-9013-4AB7-8F3B-A033DDB0D3A0}.Debug|x64.ActiveCfg = Debug|x64
 		{33A617D6-9013-4AB7-8F3B-A033DDB0D3A0}.Debug|x64.Build.0 = Debug|x64
-		{33A617D6-9013-4AB7-8F3B-A033DDB0D3A0}.Debug|x86.ActiveCfg = Debug|Win32
-		{33A617D6-9013-4AB7-8F3B-A033DDB0D3A0}.Debug|x86.Build.0 = Debug|Win32
 		{33A617D6-9013-4AB7-8F3B-A033DDB0D3A0}.Release|Win32.ActiveCfg = Release|Win32
 		{33A617D6-9013-4AB7-8F3B-A033DDB0D3A0}.Release|Win32.Build.0 = Release|Win32
 		{33A617D6-9013-4AB7-8F3B-A033DDB0D3A0}.Release|x64.ActiveCfg = Release|x64
 		{33A617D6-9013-4AB7-8F3B-A033DDB0D3A0}.Release|x64.Build.0 = Release|x64
-		{33A617D6-9013-4AB7-8F3B-A033DDB0D3A0}.Release|x86.ActiveCfg = Release|Win32
-		{33A617D6-9013-4AB7-8F3B-A033DDB0D3A0}.Release|x86.Build.0 = Release|Win32
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Debug|Win32.Build.0 = Debug|Win32
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Debug|x64.ActiveCfg = Debug|x64
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Debug|x64.Build.0 = Debug|x64
-		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Debug|x86.ActiveCfg = Debug|Win32
-		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Debug|x86.Build.0 = Debug|Win32
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Release|Win32.ActiveCfg = Release|Win32
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Release|Win32.Build.0 = Release|Win32
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Release|x64.ActiveCfg = Release|x64
 		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Release|x64.Build.0 = Release|x64
-		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Release|x86.ActiveCfg = Release|Win32
-		{F2AEFCB7-5232-4EC0-9418-40D777613E46}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/0CC-FamiTracker.vcxproj b/0CC-FamiTracker.vcxproj
@@ -57,6 +57,7 @@
     <UseOfAtl>false</UseOfAtl>
     <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -128,7 +129,7 @@
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
@@ -144,10 +145,12 @@
     <GenerateManifest>false</GenerateManifest>
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(LibraryPath)</LibraryPath>
     <IncludePath>$(VC_IncludePath);$(WindowsSdk_71A_IncludePath)</IncludePath>
+    <EnableManagedIncrementalBuild>true</EnableManagedIncrementalBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <GenerateManifest>false</GenerateManifest>
     <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(LibraryPath)</LibraryPath>
+    <EnableManagedIncrementalBuild>true</EnableManagedIncrementalBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
     <GenerateManifest>false</GenerateManifest>
@@ -175,12 +178,13 @@
       <MinimalRebuild>false</MinimalRebuild>
       <AdditionalIncludeDirectories>$(ProjectDir)libft0cc\include;$(DXSDK_DIR)\Include\;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ObjectFileName>obj/$(IntDir)/%(RelativeDir)</ObjectFileName>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <MultiProcessorCompilation>false</MultiProcessorCompilation>
       <WarningLevel>Level3</WarningLevel>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <ConformanceMode>true</ConformanceMode>
+      <DiagnosticsFormat>Caret</DiagnosticsFormat>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -258,10 +262,10 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <ObjectFileName>obj/$(IntDir)/%(RelativeDir)</ObjectFileName>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <ConformanceMode>true</ConformanceMode>
+      <DiagnosticsFormat>Caret</DiagnosticsFormat>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -282,6 +286,7 @@
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
       <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
     <Manifest />
   </ItemDefinitionGroup>

diff --git a/Source/Instrument.h b/Source/Instrument.h
@@ -24,6 +24,7 @@
 #pragma once
 
 #include <string>
+#include <string_view>
 
 // Instrument types
 enum inst_type_t {
@@ -51,7 +52,7 @@ class CInstrument {
 	void SetName(std::string_view Name);		// // //
 	std::string_view GetName() const;		// // //
 	void RegisterManager(CInstrumentManagerInterface *pManager);		// // //
-	virtual void OnBlankInstrument();										// // // Setup some initial values
+	virtual void OnBlankInstrument();									// // // Setup some initial values
 
 	void SaveFTI(CSimpleFile &File) const;								// // // Saves to an FTI file