mirror of
				https://github.com/chibicitiberiu/rainmeter-studio.git
				synced 2024-02-24 04:33:31 +00:00 
			
		
		
		
	Actually fix running debug projects that use unit testing
This commit is contained in:
		@@ -12,9 +12,15 @@
 | 
				
			|||||||
    <OutDir>$(IntDir)</OutDir>
 | 
					    <OutDir>$(IntDir)</OutDir>
 | 
				
			||||||
  </PropertyGroup>
 | 
					  </PropertyGroup>
 | 
				
			||||||
  <ItemGroup>
 | 
					  <ItemGroup>
 | 
				
			||||||
    <ClCompile Include="MathParser_Test.cpp" />
 | 
					    <ClCompile Include="MathParser_Test.cpp">
 | 
				
			||||||
    <ClCompile Include="PathUtil_Test.cpp" />
 | 
					      <ExcludedFromBuild>$(ExcludeTestFile)</ExcludedFromBuild>
 | 
				
			||||||
    <ClCompile Include="StringUtil_Test.cpp" />
 | 
					    </ClCompile>
 | 
				
			||||||
 | 
					    <ClCompile Include="PathUtil_Test.cpp">
 | 
				
			||||||
 | 
					      <ExcludedFromBuild>$(ExcludeTestFile)</ExcludedFromBuild>
 | 
				
			||||||
 | 
					    </ClCompile>
 | 
				
			||||||
 | 
					    <ClCompile Include="StringUtil_Test.cpp">
 | 
				
			||||||
 | 
					      <ExcludedFromBuild>$(ExcludeTestFile)</ExcludedFromBuild>
 | 
				
			||||||
 | 
					    </ClCompile>
 | 
				
			||||||
  </ItemGroup>
 | 
					  </ItemGroup>
 | 
				
			||||||
  <ItemGroup>
 | 
					  <ItemGroup>
 | 
				
			||||||
    <ProjectReference Include="Common.vcxproj">
 | 
					    <ProjectReference Include="Common.vcxproj">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,7 +23,7 @@
 | 
				
			|||||||
    </ClCompile>
 | 
					    </ClCompile>
 | 
				
			||||||
    <Link>
 | 
					    <Link>
 | 
				
			||||||
      <AdditionalDependencies>comctl32.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;shlwapi.lib;d2d1.lib;dwrite.lib;windowscodecs.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
 | 
					      <AdditionalDependencies>comctl32.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;shlwapi.lib;d2d1.lib;dwrite.lib;windowscodecs.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
 | 
				
			||||||
      <DelayLoadDLLs>Winmm.dll;Version.dll;d2d1.dll;dwrite.dll</DelayLoadDLLs>
 | 
					      <DelayLoadDLLs>Winmm.dll;Version.dll;d2d1.dll;dwrite.dll;$(DelayLoadTestDLL)</DelayLoadDLLs>
 | 
				
			||||||
      <ModuleDefinitionFile>Exports.def</ModuleDefinitionFile>
 | 
					      <ModuleDefinitionFile>Exports.def</ModuleDefinitionFile>
 | 
				
			||||||
    </Link>
 | 
					    </Link>
 | 
				
			||||||
  </ItemDefinitionGroup>
 | 
					  </ItemDefinitionGroup>
 | 
				
			||||||
@@ -35,7 +35,7 @@
 | 
				
			|||||||
    </ClCompile>
 | 
					    </ClCompile>
 | 
				
			||||||
    <Link>
 | 
					    <Link>
 | 
				
			||||||
      <AdditionalDependencies>comctl32.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;shlwapi.lib;d2d1.lib;dwrite.lib;windowscodecs.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
 | 
					      <AdditionalDependencies>comctl32.lib;Wininet.lib;UxTheme.lib;Winmm.lib;gdiplus.lib;Iphlpapi.lib;shlwapi.lib;d2d1.lib;dwrite.lib;windowscodecs.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
 | 
				
			||||||
      <DelayLoadDLLs>Winmm.dll;Version.dll;d2d1.dll;dwrite.dll</DelayLoadDLLs>
 | 
					      <DelayLoadDLLs>Winmm.dll;Version.dll;d2d1.dll;dwrite.dll;$(DelayLoadTestDLL)</DelayLoadDLLs>
 | 
				
			||||||
      <ModuleDefinitionFile>Exports.def</ModuleDefinitionFile>
 | 
					      <ModuleDefinitionFile>Exports.def</ModuleDefinitionFile>
 | 
				
			||||||
    </Link>
 | 
					    </Link>
 | 
				
			||||||
  </ItemDefinitionGroup>
 | 
					  </ItemDefinitionGroup>
 | 
				
			||||||
@@ -88,7 +88,7 @@
 | 
				
			|||||||
      <PrecompiledHeader>Use</PrecompiledHeader>
 | 
					      <PrecompiledHeader>Use</PrecompiledHeader>
 | 
				
			||||||
    </ClCompile>
 | 
					    </ClCompile>
 | 
				
			||||||
    <ClCompile Include="ConfigParser_Test.cpp">
 | 
					    <ClCompile Include="ConfigParser_Test.cpp">
 | 
				
			||||||
      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
 | 
					      <ExcludedFromBuild>$(ExcludeTestFile)</ExcludedFromBuild>
 | 
				
			||||||
    </ClCompile>
 | 
					    </ClCompile>
 | 
				
			||||||
    <ClCompile Include="DialogAbout.cpp">
 | 
					    <ClCompile Include="DialogAbout.cpp">
 | 
				
			||||||
      <PrecompiledHeader>Use</PrecompiledHeader>
 | 
					      <PrecompiledHeader>Use</PrecompiledHeader>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,16 +30,23 @@
 | 
				
			|||||||
    <OutDir Condition="'$(ConfigurationType)'=='StaticLibrary'">$(IntDir)</OutDir>
 | 
					    <OutDir Condition="'$(ConfigurationType)'=='StaticLibrary'">$(IntDir)</OutDir>
 | 
				
			||||||
  </PropertyGroup>
 | 
					  </PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <!-- Macros for unit testing. -->
 | 
				
			||||||
 | 
					  <PropertyGroup Label="UserMacros">
 | 
				
			||||||
 | 
					    <ExcludeTestFile>true</ExcludeTestFile>
 | 
				
			||||||
 | 
					    <ExcludeTestFile Condition="'$(Configuration)'=='Debug'">false</ExcludeTestFile>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <!-- Non-static projects must delayload CppUnitTestFramework.dll to avoid the "module not found"
 | 
				
			||||||
 | 
					         errors (since CppUnitTestFramework.dll is available only when running tests). -->
 | 
				
			||||||
 | 
					    <DelayLoadTestDLL Condition="'$(ConfigurationType)'!='StaticLibrary'">Microsoft.VisualStudio.TestTools.CppUnitTestFramework.dll</DelayLoadTestDLL>
 | 
				
			||||||
 | 
					  </PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  <ItemDefinitionGroup>
 | 
					  <ItemDefinitionGroup>
 | 
				
			||||||
    <ClCompile>
 | 
					    <ClCompile>
 | 
				
			||||||
      <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      <!-- Set the version macros to 0x0601 (Win7) to avoid using Win8 specific features in the Win8 SDK. -->
 | 
					      <!-- Set the version macros to 0x0601 (Win7) to avoid using Win8 specific features in the Win8 SDK. -->
 | 
				
			||||||
      <PreprocessorDefinitions>WIN32;_WINDOWS;WINVER=0x0601;_WIN32_WINNT=0x0601;_WIN32_IE=0x0601;PSAPI_VERSION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 | 
					      <PreprocessorDefinitions>WIN32;_WINDOWS;WINVER=0x0601;_WIN32_WINNT=0x0601;_WIN32_IE=0x0601;PSAPI_VERSION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 | 
				
			||||||
      <WarningLevel>Level3</WarningLevel>
 | 
					      <WarningLevel>Level3</WarningLevel>
 | 
				
			||||||
    </ClCompile>
 | 
					    </ClCompile>
 | 
				
			||||||
    <Link>
 | 
					    <Link>
 | 
				
			||||||
      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 | 
					 | 
				
			||||||
      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
 | 
					      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
 | 
				
			||||||
      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
 | 
					      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
 | 
				
			||||||
      <RuntimeTypeInfo>false</RuntimeTypeInfo>
 | 
					      <RuntimeTypeInfo>false</RuntimeTypeInfo>
 | 
				
			||||||
@@ -51,11 +58,13 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
 | 
					  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
 | 
				
			||||||
    <ClCompile>
 | 
					    <ClCompile>
 | 
				
			||||||
 | 
					      <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 | 
				
			||||||
      <Optimization>Disabled</Optimization>
 | 
					      <Optimization>Disabled</Optimization>
 | 
				
			||||||
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 | 
					      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 | 
				
			||||||
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 | 
					      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 | 
				
			||||||
    </ClCompile>
 | 
					    </ClCompile>
 | 
				
			||||||
    <Link>
 | 
					    <Link>
 | 
				
			||||||
 | 
					      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 | 
				
			||||||
      <GenerateDebugInformation>true</GenerateDebugInformation>
 | 
					      <GenerateDebugInformation>true</GenerateDebugInformation>
 | 
				
			||||||
    </Link>
 | 
					    </Link>
 | 
				
			||||||
    <ResourceCompile>
 | 
					    <ResourceCompile>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user