Michael Jerris added magic that builds lib/curllib.vcproj automatically (for

newer MSVC versions)

diff --git a/CHANGES b/CHANGES
index 67ea606..d2c219b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel (26 July 2006)
+- Michael Jerris added magic that builds lib/curllib.vcproj automatically for
+  newer MSVC.
+
 Daniel (25 July 2006)
 - Georg Horn made the transfer timeout error message include more details.
 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index aad2d61..3b0d077 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -23,6 +23,7 @@
 AUTOMAKE_OPTIONS = foreign nostdinc
 
 DSP = curllib.dsp
+VCPROJ = curllib.vcproj
 
 DOCS = README.encoding README.memoryleak README.ares README.curlx      \
  README.hostip README.multi_socket README.httpauth README.pipelining
@@ -33,9 +34,9 @@ EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 Makefile.riscos   \
  libcurl.framework.make libcurl.plist libcurl.rc config-amigaos.h      \
  amigaos.c amigaos.h makefile.amiga Makefile.netware nwlib.c           \
  libcurl.imp msvcproj.head msvcproj.foot config-win32ce.h              \
- Makefile.Watcom config-tpf.h $(DOCS)
+ Makefile.Watcom config-tpf.h $(DOCS) $(VCPROJ)
 
-CLEANFILES = $(DSP)
+CLEANFILES = $(DSP) $(VCPROJ)
 
 lib_LTLIBRARIES = libcurl.la
 
@@ -121,6 +122,7 @@ dist-hook:
        echo "/* ca bundle path set in here*/" > $(distdir)/ca-bundle.h
 
 DSPOUT = | awk '{printf("%s\r\n", $$0)}' >> $(DSP)
+VCPROJOUT = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ)
 
 $(DSP): msvcproj.head msvcproj.foot Makefile.am
        echo "creating $(DSP)"
@@ -142,3 +144,15 @@ $(DSP): msvcproj.head msvcproj.foot Makefile.am
        done; \
        echo "# End Group" $(DSPOUT); \
        cat $(srcdir)/msvcproj.foot $(DSPOUT) )
+
+$(VCPROJ): vc8proj.head vc8proj.foot Makefile.am
+       echo "creating $(VCPROJ)"
+       @(cp $(srcdir)/vc8proj.head $(VCPROJ); \
+       for file in $(WIN32SOURCES); do \
+       echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT); \
+       done; \
+       echo "</Filter><Filter  Name=\"Header Files\">" $(VCPROJOUT); \
+       for file in $(WIN32HEADERS); do \
+       echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT); \
+       done; \
+       cat $(srcdir)/vc8proj.foot $(VCPROJOUT) )

diff --git a/lib/vc8proj.foot b/lib/vc8proj.foot
new file mode 100644 (file)
index 0000000..9dc63c2
--- /dev/null
+++ b/lib/vc8proj.foot
@@ -0,0 +1,11 @@
+\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/lib/vc8proj.head b/lib/vc8proj.head
new file mode 100644 (file)
index 0000000..523eeb9
--- /dev/null
+++ b/lib/vc8proj.head
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="curllib"\r
+       ProjectGUID="{87EE9DA4-DE1E-4448-8324-183C98DCA588}"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory=".\Release"\r
+                       IntermediateDirectory=".\Release"\r
+                       ConfigurationType="4"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" TypeLibraryName=".\Release/curllib.tlb" HeaderFileName=""\r
+                       />\r
+                       <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories=".,..\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\Release/curllib.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" BrowseInformation="1" WarningLevel="0" SuppressStartupBanner="true" DebugInformationFormat="3"\r
+                       />\r
+                       <Tool Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033"\r
+                       />\r
+                       <Tool Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool Name="VCLibrarianTool"\r
+                       />\r
+                       <Tool Name="VCALinkTool"\r
+                       />\r
+                       <Tool Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool Name="VCBscMakeTool" SuppressStartupBanner="true" OutputFile=".\Release/curllib.bsc"\r
+                       />\r
+                       <Tool Name="VCFxCopTool"\r
+                       />\r
+                       <Tool Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory=".\Debug"\r
+                       IntermediateDirectory=".\Debug"\r
+                       ConfigurationType="4"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" TypeLibraryName=".\Debug/curllib.tlb" HeaderFileName=""\r
+                       />\r
+                       <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".,..\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/curllib.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" BrowseInformation="1" WarningLevel="0" SuppressStartupBanner="true" DebugInformationFormat="3"\r
+                       />\r
+                       <Tool Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033"\r
+                       />\r
+                       <Tool Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool Name="VCLibrarianTool"\r
+                       />\r
+                       <Tool Name="VCALinkTool"\r
+                       />\r
+                       <Tool Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool Name="VCBscMakeTool" SuppressStartupBanner="true" OutputFile=".\Debug/curllib.bsc"\r
+                       />\r
+                       <Tool Name="VCFxCopTool"\r
+                       />\r
+                       <Tool Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       >\r
+\r