aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2006-07-25 22:06:42 +0000
committerDaniel Stenberg <daniel@haxx.se>2006-07-25 22:06:42 +0000
commit78a47826b26d666586dc98028f38b5a0d6f59ad2 (patch)
tree85999c5517e0fc4c1cc7cf3d9955463b224b4476
parentecfaa4f8699ff8c17c31cafd2f429b101d2b594f (diff)
Michael Jerris added magic that builds lib/curllib.vcproj automatically (for
newer MSVC versions)
-rw-r--r--CHANGES4
-rw-r--r--lib/Makefile.am18
-rw-r--r--lib/vc8proj.foot11
-rw-r--r--lib/vc8proj.head105
4 files changed, 136 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 67ea60614..d2c219bf4 100644
--- 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 aad2d61b3..3b0d0770f 100644
--- 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
index 000000000..9dc63c28e
--- /dev/null
+++ b/lib/vc8proj.foot
@@ -0,0 +1,11 @@
+
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/lib/vc8proj.head b/lib/vc8proj.head
new file mode 100644
index 000000000..523eeb9e3
--- /dev/null
+++ b/lib/vc8proj.head
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="curllib"
+ ProjectGUID="{87EE9DA4-DE1E-4448-8324-183C98DCA588}"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool Name="VCPreBuildEventTool"
+ />
+ <Tool Name="VCCustomBuildTool"
+ />
+ <Tool Name="VCXMLDataGeneratorTool"
+ />
+ <Tool Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" TypeLibraryName=".\Release/curllib.tlb" HeaderFileName=""
+ />
+ <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"
+ />
+ <Tool Name="VCManagedResourceCompilerTool"
+ />
+ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033"
+ />
+ <Tool Name="VCPreLinkEventTool"
+ />
+ <Tool Name="VCLibrarianTool"
+ />
+ <Tool Name="VCALinkTool"
+ />
+ <Tool Name="VCXDCMakeTool"
+ />
+ <Tool Name="VCBscMakeTool" SuppressStartupBanner="true" OutputFile=".\Release/curllib.bsc"
+ />
+ <Tool Name="VCFxCopTool"
+ />
+ <Tool Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool Name="VCPreBuildEventTool"
+ />
+ <Tool Name="VCCustomBuildTool"
+ />
+ <Tool Name="VCXMLDataGeneratorTool"
+ />
+ <Tool Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" TypeLibraryName=".\Debug/curllib.tlb" HeaderFileName=""
+ />
+ <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"
+ />
+ <Tool Name="VCManagedResourceCompilerTool"
+ />
+ <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033"
+ />
+ <Tool Name="VCPreLinkEventTool"
+ />
+ <Tool Name="VCLibrarianTool"
+ />
+ <Tool Name="VCALinkTool"
+ />
+ <Tool Name="VCXDCMakeTool"
+ />
+ <Tool Name="VCBscMakeTool" SuppressStartupBanner="true" OutputFile=".\Debug/curllib.bsc"
+ />
+ <Tool Name="VCFxCopTool"
+ />
+ <Tool Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ >
+