cheng/mpir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor change to build of tests on Windows

Browse Source
This commit is contained in:
gladman 2010-07-12 21:04:54 +00:00
parent ab19b8236c
commit 1bba7e3c4c
4 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.vc10/mpir-tests/check_config.bat
View File

@ -15,10 +15,13 @@ call :no_spc %1
set in_plf=%_res%
call :no_spc %2
set in_cnf=%_res%
echo %odir%\mpirxx.lib
if "%tpe%" NEQ "%in_tpe%" (call :seterr & echo ERROR: last MPIR build was a %tpe%, not a %in_tpe% & exit /b %errorlevel%)
if "%tpe%" EQU "lib" if not exist ..\%odir%\mpirxx.lib (call :seterr & echo ERROR: static library tests need 'mpirxx.lib' & exit /b %errorlevel%)
if "%in_plf%" EQU "%plf%" if "%in_cnf%" EQU "%cnf%" echo OK & exit /b 0
if "%in_plf%" EQU "%plf%" if "%in_cnf%" EQU "%cnf%" if "%in_tpe%" EQU "%tpe%" echo OK & exit /b 0
call :seterr
echo ERROR Last MPIR build was %tpe%\%plf%\%cnf%, not %in_tpe%\%in_plf%\%in_cnf%
exit /b %errorlevel%
call :seterr
echo ERROR Last MPIR build was %plf%\%cnf%, not %in_plf%\%in_cnf%

10
build.vc10/mpir-tests/dll-test-config.props
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<LIBS>$(SolutionDir)dll\$(Platform)\$(Configuration)\mpir.lib;$(LIBS)</LIBS>
<MPLIBS>$(SolutionDir)dll\$(Platform)\$(Configuration)\mpir.lib</MPLIBS>
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
@ -11,11 +11,11 @@
<ItemDefinitionGroup>
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<AdditionalIncludeDirectories>$(SolutionDir)..\;$(SolutionDir)$(PlatformName);$(SolutionDir)..\tests</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)..\;$(SolutionDir)..\tests</AdditionalIncludeDirectories>
<PreprocessorDefinitions>__GMP_LIBGMP_DLL</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>$(LIBS);$(OutDir)\add-test-lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(MPLIBS);$(OutDir)\add-test-lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
<PreBuildEvent>
@ -23,8 +23,8 @@
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<BuildMacro Include="LIBS">
<Value>$(LIBS)</Value>
<BuildMacro Include="MPLIBS">
<Value>$(MPLIBS)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
</ItemGroup>

10
build.vc10/mpir-tests/lib-test-config.props
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<LIBS>$(SolutionDir)lib\$(Platform)\$(Configuration)\mpir.lib;$(SolutionDir)lib\$(Platform)\$(Configuration)\mpirxx.lib;$(LIBS)</LIBS>
<MPLIBS>$(SolutionDir)lib\$(Platform)\$(Configuration)\mpir.lib;$(SolutionDir)lib\$(Platform)\$(Configuration)\mpirxx.lib</MPLIBS>
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
@ -11,10 +11,10 @@
<ItemDefinitionGroup>
<ClCompile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>$(SolutionDir)..\;$(SolutionDir)$(PlatformName);$(SolutionDir)..\tests</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)..\;$(SolutionDir)..\tests</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>$(LIBS);$(OutDir)\add-test-lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(MPLIBS);$(OutDir)\add-test-lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
<PreBuildEvent>
@ -22,8 +22,8 @@
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<BuildMacro Include="LIBS">
<Value>$(LIBS)</Value>
<BuildMacro Include="MPLIBS">
<Value>$(MPLIBS)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
</ItemGroup>

13
build.vc10/mpir-tests/test-config.props
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<LIBS>$(SolutionDir)dll\$(Platform)\$(Configuration)\mpir.lib;$(LIBS)</LIBS>
<MPLIBS>$(SolutionDir)lib\$(Platform)\$(Configuration)\mpir.lib;$(SolutionDir)lib\$(Platform)\$(Configuration)\mpirxx.lib</MPLIBS>
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
@ -10,12 +10,11 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<AdditionalIncludeDirectories>$(SolutionDir)..\;$(SolutionDir)$(PlatformName);$(SolutionDir)..\tests</AdditionalIncludeDirectories>
<PreprocessorDefinitions>__GMP_LIBGMP_DLL</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>$(SolutionDir)..\;$(SolutionDir)..\tests</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>$(LIBS);$(OutDir)\add-test-lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(MPLIBS);$(OutDir)\add-test-lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
<PreBuildEvent>
@ -23,8 +22,8 @@
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<BuildMacro Include="LIBS">
<Value>$(LIBS)</Value>
<BuildMacro Include="MPLIBS">
<Value>$(MPLIBS)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
</ItemGroup>