diff options
| author | Yang Tse <yangsita@gmail.com> | 2013-02-11 19:11:14 +0100 | 
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2013-02-13 13:28:13 +0100 | 
| commit | beae838ed567f248e8edac97569954ff75e43d09 (patch) | |
| tree | a520a89ad40db2c723e584aa638b43f01c3c12d8 /lib | |
| parent | 7970821117d2877964308726fae6a6b7f41ca786 (diff) | |
move msvc IDE related files to 'vc' directory tree
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/.gitignore | 2 | ||||
| -rw-r--r-- | lib/Makefile.am | 72 | ||||
| -rw-r--r-- | lib/msvcproj.foot | 11 | ||||
| -rw-r--r-- | lib/msvcproj.head | 147 | ||||
| -rw-r--r-- | lib/vc6libcurl.dsw | 29 | ||||
| -rw-r--r-- | lib/vc8proj.foot | 11 | ||||
| -rw-r--r-- | lib/vc8proj.head | 105 | 
7 files changed, 7 insertions, 370 deletions
diff --git a/lib/.gitignore b/lib/.gitignore index a88bc9281..e289640c6 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -7,8 +7,6 @@ TAGS  Makefile.vc8.dist  Makefile.vc9.dist  libcurl.plist.dist -libcurl.vcproj -vc6libcurl.dsp  Makefile.vc10.dist  libcurl.vers  *.a diff --git a/lib/Makefile.am b/lib/Makefile.am index 23f8661f5..f777df1cd 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -21,27 +21,21 @@  ###########################################################################  AUTOMAKE_OPTIONS = foreign nostdinc -DSP = vc6libcurl.dsp -VCPROJ = libcurl.vcproj -  DOCS = README.encoding README.memoryleak README.ares README.curlx	\   README.hostip README.multi_socket README.httpauth README.pipelining    \   README.curl_off_t README.pingpong  CMAKE_DIST = CMakeLists.txt curl_config.h.cmake -EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 $(DSP)		\ - vc6libcurl.dsw config-win32.h config-win32ce.h config-riscos.h		\ - config-mac.h curl_config.h.in makefile.dj config-dos.h libcurl.plist	\ - libcurl.rc config-amigaos.h makefile.amiga Makefile.netware nwlib.c	\ - nwos.c msvcproj.head msvcproj.foot config-win32ce.h config-os400.h	\ - setup-os400.h config-symbian.h Makefile.Watcom config-tpf.h $(DOCS)	\ - $(VCPROJ) mk-ca-bundle.pl mk-ca-bundle.vbs firefox-db2pem.sh		\ - $(CMAKE_DIST) config-vxworks.h Makefile.vxworks checksrc.pl		\ +EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 config-win32.h	\ + config-win32ce.h config-riscos.h config-mac.h curl_config.h.in		\ + makefile.dj config-dos.h libcurl.plist libcurl.rc config-amigaos.h	\ + makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h	\ + config-os400.h setup-os400.h config-symbian.h Makefile.Watcom		\ + config-tpf.h $(DOCS) mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST)	\ + firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl	\   objnames-test08.sh objnames-test10.sh objnames.inc -CLEANFILES = $(DSP) $(VCPROJ) -  lib_LTLIBRARIES = libcurl.la  LIBCURL_LIBS = @LIBCURL_LIBS@ @@ -162,58 +156,6 @@ include Makefile.inc  libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS)  libcurlu_la_SOURCES = $(CSOURCES) $(HHEADERS) -WIN32SOURCES = $(CSOURCES) -WIN32HEADERS = $(HHEADERS) config-win32.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)" -	@(cp $(srcdir)/msvcproj.head $(DSP); \ -	echo "# Begin Group \"Source Files\"" $(DSPOUT); \ -        echo "" $(DSPOUT); \ -        echo "# PROP Default_Filter \"\"" $(DSPOUT); \ -        win32_srcs='$(WIN32SOURCES)'; \ -        sorted_srcs=`for file in $$win32_srcs; do echo $$file; done | sort`; \ -        for file in $$sorted_srcs; do \ -	echo "# Begin Source File" $(DSPOUT); \ -	echo "" $(DSPOUT); \ -	echo "SOURCE=.\\"$$file $(DSPOUT); \ -	echo "# End Source File" $(DSPOUT); \ -	done; \ -	echo "# End Group" $(DSPOUT); \ -	echo "# Begin Group \"Header Files\"" $(DSPOUT); \ -        echo "" $(DSPOUT); \ -        echo "# PROP Default_Filter \"\"" $(DSPOUT); \ -        win32_hdrs='$(WIN32HEADERS)'; \ -        sorted_hdrs=`for file in $$win32_hdrs; do echo $$file; done | sort`; \ -        for file in $$sorted_hdrs; do \ -	echo "# Begin Source File" $(DSPOUT); \ -	echo "" $(DSPOUT); \ -	echo "SOURCE=.\\"$$file $(DSPOUT); \ -	echo "# End Source File" $(DSPOUT); \ -	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); \ -        win32_srcs='$(WIN32SOURCES)'; \ -        sorted_srcs=`for file in $$win32_srcs; do echo $$file; done | sort`; \ -        for file in $$sorted_srcs; do \ -	echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT); \ -	done; \ -	echo "</Filter><Filter	Name=\"Header Files\">" $(VCPROJOUT); \ -        win32_hdrs='$(WIN32HEADERS)'; \ -        sorted_hdrs=`for file in $$win32_hdrs; do echo $$file; done | sort`; \ -        for file in $$sorted_hdrs; do \ -	echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT); \ -	done; \ -	cat $(srcdir)/vc8proj.foot $(VCPROJOUT) ) - -  checksrc:  	@@PERL@ $(top_srcdir)/lib/checksrc.pl -D$(top_srcdir)/lib $(CSOURCES) $(HHEADERS) diff --git a/lib/msvcproj.foot b/lib/msvcproj.foot deleted file mode 100644 index 8ce4ca0af..000000000 --- a/lib/msvcproj.foot +++ /dev/null @@ -1,11 +0,0 @@ - -# Begin Group "Resource Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\libcurl.rc -# End Source File -# End Group -# End Target -# End Project diff --git a/lib/msvcproj.head b/lib/msvcproj.head deleted file mode 100644 index 59e539dfa..000000000 --- a/lib/msvcproj.head +++ /dev/null @@ -1,147 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libcurl" - Package Owner=<4>
 -# Microsoft Developer Studio Generated Build File, Format Version 6.00
 -# ** DO NOT EDIT **
 -
 -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 -# TARGTYPE "Win32 (x86) Static Library" 0x0104
 -
 -CFG=libcurl - Win32 LIB Debug
 -!MESSAGE This is not a valid makefile. To build this project using NMAKE,
 -!MESSAGE use the Export Makefile command and run
 -!MESSAGE 
 -!MESSAGE NMAKE /f "libcurl.mak".
 -!MESSAGE 
 -!MESSAGE You can specify a configuration when running NMAKE
 -!MESSAGE by defining the macro CFG on the command line. For example:
 -!MESSAGE 
 -!MESSAGE NMAKE /f "libcurl.mak" CFG="libcurl - Win32 LIB Debug"
 -!MESSAGE 
 -!MESSAGE Possible choices for configuration are:
 -!MESSAGE 
 -!MESSAGE "libcurl - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
 -!MESSAGE "libcurl - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
 -!MESSAGE "libcurl - Win32 LIB Debug" (based on "Win32 (x86) Static Library")
 -!MESSAGE "libcurl - Win32 LIB Release" (based on "Win32 (x86) Static Library")
 -!MESSAGE 
 -
 -# Begin Project
 -# PROP AllowPerConfigDependencies 0
 -# PROP Scc_ProjName ""
 -# PROP Scc_LocalPath ""
 -
 -!IF  "$(CFG)" == "libcurl - Win32 DLL Debug"
 -
 -# PROP BASE Use_MFC 0
 -# PROP BASE Use_Debug_Libraries 1
 -# PROP BASE Output_Dir "DLL-Debug"
 -# PROP BASE Intermediate_Dir "DLL-Debug"
 -# PROP BASE Target_Dir ""
 -# PROP Use_MFC 0
 -# PROP Use_Debug_Libraries 1
 -# PROP Output_Dir "DLL-Debug"
 -# PROP Intermediate_Dir "DLL-Debug"
 -# PROP Ignore_Export_Lib 0
 -# PROP Target_Dir ""
 -CPP=cl.exe
 -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /FD /GZ /c
 -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /FD /GZ /c
 -MTL=midl.exe
 -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 -RSC=rc.exe
 -# ADD BASE RSC /l 0x409 /d "_DEBUG"
 -# ADD RSC /l 0x409 /d "_DEBUG"
 -BSC32=bscmake.exe
 -# ADD BASE BSC32 /nologo
 -# ADD BSC32 /nologo
 -LINK32=link.exe
 -# ADD BASE LINK32 kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /dll /incremental:no /map /debug /machine:I386 /out:"DLL-Debug/libcurld.dll" /implib:"DLL-Debug/libcurld_imp.lib" /pdbtype:sept
 -# ADD LINK32 kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /dll /incremental:no /map /debug /machine:I386 /out:"DLL-Debug/libcurld.dll" /implib:"DLL-Debug/libcurld_imp.lib" /pdbtype:sept
 -
 -!ELSEIF  "$(CFG)" == "libcurl - Win32 DLL Release"
 -
 -# PROP BASE Use_MFC 0
 -# PROP BASE Use_Debug_Libraries 0
 -# PROP BASE Output_Dir "DLL-Release"
 -# PROP BASE Intermediate_Dir "DLL-Release"
 -# PROP BASE Target_Dir ""
 -# PROP Use_MFC 0
 -# PROP Use_Debug_Libraries 0
 -# PROP Output_Dir "DLL-Release"
 -# PROP Intermediate_Dir "DLL-Release"
 -# PROP Ignore_Export_Lib 0
 -# PROP Target_Dir ""
 -CPP=cl.exe
 -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /FD /c
 -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /FD /c
 -MTL=midl.exe
 -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 -RSC=rc.exe
 -# ADD BASE RSC /l 0x409 /d "NDEBUG"
 -# ADD RSC /l 0x409 /d "NDEBUG"
 -BSC32=bscmake.exe
 -# ADD BASE BSC32 /nologo
 -# ADD BSC32 /nologo
 -LINK32=link.exe
 -# ADD BASE LINK32 kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /dll /pdb:none /machine:I386 /out:"DLL-Release/libcurl.dll" /implib:"DLL-Release/libcurl_imp.lib"
 -# ADD LINK32 kernel32.lib ws2_32.lib wldap32.lib advapi32.lib /nologo /dll /pdb:none /machine:I386 /out:"DLL-Release/libcurl.dll" /implib:"DLL-Release/libcurl_imp.lib"
 -
 -!ELSEIF  "$(CFG)" == "libcurl - Win32 LIB Debug"
 -
 -# PROP BASE Use_MFC 0
 -# PROP BASE Use_Debug_Libraries 1
 -# PROP BASE Output_Dir "LIB-Debug"
 -# PROP BASE Intermediate_Dir "LIB-Debug"
 -# PROP BASE Target_Dir ""
 -# PROP Use_MFC 0
 -# PROP Use_Debug_Libraries 1
 -# PROP Output_Dir "LIB-Debug"
 -# PROP Intermediate_Dir "LIB-Debug"
 -# PROP Target_Dir ""
 -CPP=cl.exe
 -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /D "CURL_STATICLIB" /FD /GZ /c
 -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /D "CURL_STATICLIB" /FD /GZ /c
 -RSC=rc.exe
 -# ADD BASE RSC /l 0x409 /d "_DEBUG"
 -# ADD RSC /l 0x409 /d "_DEBUG"
 -BSC32=bscmake.exe
 -# ADD BASE BSC32 /nologo
 -# ADD BSC32 /nologo
 -LIB32=link.exe -lib
 -# ADD BASE LIB32 /nologo /out:"LIB-Debug/libcurld.lib" /machine:I386
 -# ADD LIB32 /nologo /out:"LIB-Debug/libcurld.lib" /machine:I386
 -
 -!ELSEIF  "$(CFG)" == "libcurl - Win32 LIB Release"
 -
 -# PROP BASE Use_MFC 0
 -# PROP BASE Use_Debug_Libraries 0
 -# PROP BASE Output_Dir "LIB-Release"
 -# PROP BASE Intermediate_Dir "LIB-Release"
 -# PROP BASE Target_Dir ""
 -# PROP Use_MFC 0
 -# PROP Use_Debug_Libraries 0
 -# PROP Output_Dir "LIB-Release"
 -# PROP Intermediate_Dir "LIB-Release"
 -# PROP Target_Dir ""
 -CPP=cl.exe
 -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /D "CURL_STATICLIB" /FD /c
 -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "BUILDING_LIBCURL" /D "CURL_STATICLIB" /FD /c
 -RSC=rc.exe
 -# ADD BASE RSC /l 0x409 /d "NDEBUG"
 -# ADD RSC /l 0x409 /d "NDEBUG"
 -BSC32=bscmake.exe
 -# ADD BASE BSC32 /nologo
 -# ADD BSC32 /nologo
 -LIB32=link.exe -lib
 -# ADD BASE LIB32 /nologo /out:"LIB-Release/libcurl.lib" /machine:I386
 -# ADD LIB32 /nologo /out:"LIB-Release/libcurl.lib" /machine:I386
 -
 -!ENDIF 
 -
 -# Begin Target
 -
 -# Name "libcurl - Win32 DLL Debug"
 -# Name "libcurl - Win32 DLL Release"
 -# Name "libcurl - Win32 LIB Debug"
 -# Name "libcurl - Win32 LIB Release"
 diff --git a/lib/vc6libcurl.dsw b/lib/vc6libcurl.dsw deleted file mode 100644 index 1fa8814a6..000000000 --- a/lib/vc6libcurl.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 -
 -###############################################################################
 -
 -Project: "libcurl"=".\vc6libcurl.dsp" - Package Owner=<4>
 -
 -Package=<5>
 -{{{
 -}}}
 -
 -Package=<4>
 -{{{
 -}}}
 -
 -###############################################################################
 -
 -Global:
 -
 -Package=<5>
 -{{{
 -}}}
 -
 -Package=<3>
 -{{{
 -}}}
 -
 -###############################################################################
 -
 diff --git a/lib/vc8proj.foot b/lib/vc8proj.foot deleted file mode 100644 index ac861b02c..000000000 --- a/lib/vc8proj.foot +++ /dev/null @@ -1,11 +0,0 @@ - -		</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 deleted file mode 100644 index 13326fa83..000000000 --- a/lib/vc8proj.head +++ /dev/null @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject -	ProjectType="Visual C++" -	Version="8.00" -	Name="libcurl" -	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/libcurl.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/libcurl.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/libcurl.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/libcurl.tlb" HeaderFileName="" -			/> -			<Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".,..\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BUILDING_LIBCURL" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/libcurl.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/libcurl.bsc" -			/> -			<Tool Name="VCFxCopTool" -			/> -			<Tool Name="VCPostBuildEventTool" -			/> -		</Configuration> -	</Configurations> -	<References> -	</References> -	<Files> -		<Filter -			Name="Source Files" -			> -  | 
