Update Visual C++ support
-tests/interactive/Makefile.am, build/win32/Makefile.am: copy the generated test-unit-names.h to build/win32 so that it can be distributed in "make dist" (maybe we could dist the generated header in tests/interactive directly?) -Update test-interactive Visual C++ projects to include build/win32 in the list of folders to look for headers
This commit is contained in:
parent
d86a6d8df4
commit
a9771b596f
@ -1,3 +1,3 @@
|
||||
SUBDIRS = vs9 vs10
|
||||
|
||||
EXTRA_DIST = *.bat
|
||||
EXTRA_DIST = *.bat test-unit-names.h
|
||||
|
@ -71,6 +71,7 @@
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@ -90,6 +91,7 @@
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>_DEBUG;$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@ -113,6 +115,7 @@
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
@ -133,6 +136,7 @@
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
|
@ -31,6 +31,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=".."
|
||||
Optimization="0"
|
||||
PreprocessorDefinitions="_DEBUG;$(TestProgDef)"
|
||||
MinimalRebuild="true"
|
||||
@ -61,6 +62,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=".."
|
||||
Optimization="0"
|
||||
PreprocessorDefinitions="_DEBUG;$(TestProgDef)"
|
||||
MinimalRebuild="true"
|
||||
@ -95,6 +97,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=".."
|
||||
Optimization="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
PreprocessorDefinitions="$(TestProgDef)"
|
||||
@ -128,6 +131,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=".."
|
||||
PreprocessorDefinitions="$(TestProgDef)"
|
||||
RuntimeLibrary="2"
|
||||
UsePrecompiledHeader="0"
|
||||
|
@ -108,6 +108,9 @@ stamp-test-interactive: Makefile
|
||||
( echo "test-interactive $$test_bin" ) >> test-interactive.bat ; \
|
||||
done \
|
||||
&& cp *.bat $(top_srcdir)/build/win32/
|
||||
|
||||
../../build/win32/test-unit-names.h: test-unit-names.h
|
||||
cp test-unit-names.h $(top_srcdir)/build/win32
|
||||
|
||||
test-unit-names.h: stamp-test-unit-names
|
||||
@true
|
||||
|
Loading…
Reference in New Issue
Block a user