Commit 78a47826 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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

newer MSVC versions)
parent ecfaa4f8

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -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.

lib/Makefile.am

+16 −2
Original line number Diff line number Diff line
@@ -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) )

lib/vc8proj.foot

0 → 100644
+11 −0
Original line number Diff line number Diff line 


		</Filter>

		<Filter

			Name="Resource Files"

			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

			>

		</Filter>

	</Files>

	<Globals>

	</Globals>

</VisualStudioProject>

lib/vc8proj.head

0 → 100644
+105 −0
Original line number Diff line number Diff line 
<?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"

			>