[Box Backup-commit] COMMIT r2921 - box/chris/win32/pcre/build/vc2010

[subversion at boxbackup.org]

Author: chris
Date: 2011-04-15 13:35:46 +0100 (Fri, 15 Apr 2011)
New Revision: 2921

Modified:
   box/chris/win32/pcre/build/vc2010/dftables.vcxproj
   box/chris/win32/pcre/build/vc2010/pcre.vcxproj
   box/chris/win32/pcre/build/vc2010/pcregrep.vcxproj
   box/chris/win32/pcre/build/vc2010/pcreposix.vcxproj
   box/chris/win32/pcre/build/vc2010/pcretest.vcxproj
Log:
More fixes for static library build.


Modified: box/chris/win32/pcre/build/vc2010/dftables.vcxproj
===================================================================
--- box/chris/win32/pcre/build/vc2010/dftables.vcxproj	2011-04-15 10:57:10 UTC (rev 2920)
+++ box/chris/win32/pcre/build/vc2010/dftables.vcxproj	2011-04-15 12:35:46 UTC (rev 2921)
@@ -48,7 +48,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

Modified: box/chris/win32/pcre/build/vc2010/pcre.vcxproj
===================================================================
--- box/chris/win32/pcre/build/vc2010/pcre.vcxproj	2011-04-15 10:57:10 UTC (rev 2920)
+++ box/chris/win32/pcre/build/vc2010/pcre.vcxproj	2011-04-15 12:35:46 UTC (rev 2921)
@@ -49,10 +49,10 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PCRE_EXPORTS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PCRE_EXPORTS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
@@ -65,6 +65,9 @@
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
+    <Lib>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -120,10 +123,6 @@
     <ClInclude Include="unistd.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\vcres\pcre-dll-res.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\pcre78.dll.def" />
     <None Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>

Modified: box/chris/win32/pcre/build/vc2010/pcregrep.vcxproj
===================================================================
--- box/chris/win32/pcre/build/vc2010/pcregrep.vcxproj	2011-04-15 10:57:10 UTC (rev 2920)
+++ box/chris/win32/pcre/build/vc2010/pcregrep.vcxproj	2011-04-15 12:35:46 UTC (rev 2921)
@@ -50,8 +50,7 @@
       <AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>

Modified: box/chris/win32/pcre/build/vc2010/pcreposix.vcxproj
===================================================================
--- box/chris/win32/pcre/build/vc2010/pcreposix.vcxproj	2011-04-15 10:57:10 UTC (rev 2920)
+++ box/chris/win32/pcre/build/vc2010/pcreposix.vcxproj	2011-04-15 12:35:46 UTC (rev 2921)
@@ -49,10 +49,10 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PCREPOSIX78_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PCREPOSIX78_EXPORTS;HAVE_CONFIG_H;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
@@ -101,10 +101,6 @@
     <ClInclude Include="pcre.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\vcres\pcreposix-dll-res.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\pcreposix78.dll.def" />
     <None Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>

Modified: box/chris/win32/pcre/build/vc2010/pcretest.vcxproj
===================================================================
--- box/chris/win32/pcre/build/vc2010/pcretest.vcxproj	2011-04-15 10:57:10 UTC (rev 2920)
+++ box/chris/win32/pcre/build/vc2010/pcretest.vcxproj	2011-04-15 12:35:46 UTC (rev 2921)
@@ -50,8 +50,7 @@
       <AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>