- I renamed everything in the windows builds files that used the name 'curllib'
to the proper 'libcurl' as clearly this caused confusion.
This commit is contained in:
Daniel Stenberg
parent
3a7e8c9f5f
commit
8b66981ce0
4
CHANGES
4
CHANGES
@ -6,6 +6,10 @@
|
||||
|
||||
Changelog
|
||||
|
||||
Daniel Stenberg (23 Feb 2009)
|
||||
- I renamed everything in the windows builds files that used the name 'curllib'
|
||||
to the proper 'libcurl' as clearly this caused confusion.
|
||||
|
||||
Yang Tse (20 Feb 2009)
|
||||
- Do not halt compilation when using VS2008 to build a Windows 2000 target.
|
||||
|
||||
|
||||
@ -383,7 +383,7 @@ Win32
|
||||
- Modify lib/setup.h
|
||||
- Modify lib/Makefile.vc6
|
||||
- Add defines to Project/Settings/C/C++/General/Preprocessor Definitions
|
||||
in the curllib.dsw/curllib.dsp Visual C++ 6 IDE project.
|
||||
in the libcurl.dsw/libcurl.dsp Visual C++ 6 IDE project.
|
||||
|
||||
|
||||
Important static libcurl usage note
|
||||
|
||||
@ -7,6 +7,6 @@ Makefile
|
||||
config.h
|
||||
stamp-*
|
||||
getdate.c
|
||||
curllib.dsp
|
||||
curllib.vcproj
|
||||
libcurl.dsp
|
||||
libcurl.vcproj
|
||||
*.dist
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# | (__| |_| | _ <| |___
|
||||
# \___|\___/|_| \_\_____|
|
||||
#
|
||||
# Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
#
|
||||
# This software is licensed as described in the file COPYING, which
|
||||
# you should have received as part of this distribution. The terms
|
||||
@ -22,15 +22,15 @@
|
||||
###########################################################################
|
||||
AUTOMAKE_OPTIONS = foreign nostdinc
|
||||
|
||||
DSP = curllib.dsp
|
||||
VCPROJ = curllib.vcproj
|
||||
DSP = libcurl.dsp
|
||||
VCPROJ = libcurl.vcproj
|
||||
|
||||
DOCS = README.encoding README.memoryleak README.ares README.curlx \
|
||||
README.hostip README.multi_socket README.httpauth README.pipelining \
|
||||
README.NSS README.curl_off_t
|
||||
|
||||
EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 Makefile.riscos $(DSP) \
|
||||
curllib.dsw config-win32.h config-win32ce.h config-riscos.h config-mac.h \
|
||||
libcurl.dsw config-win32.h config-win32ce.h config-riscos.h config-mac.h \
|
||||
config.h.in makefile.dj config.dos libcurl.framework.make libcurl.plist \
|
||||
libcurl.rc config-amigaos.h amigaos.c amigaos.h makefile.amiga \
|
||||
Makefile.netware nwlib.c nwos.c libcurl.imp msvcproj.head msvcproj.foot \
|
||||
|
||||
@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "curllib"=".\curllib.dsp" - Package Owner=<4>
|
||||
Project: "libcurl"=".\libcurl.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
@ -1,27 +1,27 @@
|
||||
# Microsoft Developer Studio Project File - Name="curllib" - Package Owner=<4>
|
||||
# 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=curllib - Win32 LIB Debug
|
||||
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 "curllib.mak".
|
||||
!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 "curllib.mak" CFG="curllib - Win32 LIB Debug"
|
||||
!MESSAGE NMAKE /f "libcurl.mak" CFG="libcurl - Win32 LIB Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "curllib - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "curllib - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "curllib - Win32 LIB Debug" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "curllib - Win32 LIB Release" (based on "Win32 (x86) Static Library")
|
||||
!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
|
||||
@ -29,7 +29,7 @@ CFG=curllib - Win32 LIB Debug
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
|
||||
!IF "$(CFG)" == "curllib - Win32 DLL Debug"
|
||||
!IF "$(CFG)" == "libcurl - Win32 DLL Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
@ -58,7 +58,7 @@ LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib ws2_32.lib wldap32.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 /nologo /dll /incremental:no /map /debug /machine:I386 /out:"DLL-Debug/libcurld.dll" /implib:"DLL-Debug/libcurld_imp.lib" /pdbtype:sept
|
||||
|
||||
!ELSEIF "$(CFG)" == "curllib - Win32 DLL Release"
|
||||
!ELSEIF "$(CFG)" == "libcurl - Win32 DLL Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
@ -87,7 +87,7 @@ LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib ws2_32.lib wldap32.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 /nologo /dll /pdb:none /machine:I386 /out:"DLL-Release/libcurl.dll" /implib:"DLL-Release/libcurl_imp.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "curllib - Win32 LIB Debug"
|
||||
!ELSEIF "$(CFG)" == "libcurl - Win32 LIB Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
@ -112,7 +112,7 @@ 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)" == "curllib - Win32 LIB Release"
|
||||
!ELSEIF "$(CFG)" == "libcurl - Win32 LIB Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
@ -141,7 +141,7 @@ LIB32=link.exe -lib
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "curllib - Win32 DLL Debug"
|
||||
# Name "curllib - Win32 DLL Release"
|
||||
# Name "curllib - Win32 LIB Debug"
|
||||
# Name "curllib - Win32 LIB Release"
|
||||
# Name "libcurl - Win32 DLL Debug"
|
||||
# Name "libcurl - Win32 DLL Release"
|
||||
# Name "libcurl - Win32 LIB Debug"
|
||||
# Name "libcurl - Win32 LIB Release"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="8.00"
|
||||
Name="curllib"
|
||||
Name="libcurl"
|
||||
ProjectGUID="{87EE9DA4-DE1E-4448-8324-183C98DCA588}"
|
||||
>
|
||||
<Platforms>
|
||||
@ -31,9 +31,9 @@
|
||||
/>
|
||||
<Tool Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" TypeLibraryName=".\Release/curllib.tlb" HeaderFileName=""
|
||||
<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/curllib.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" BrowseInformation="1" WarningLevel="0" SuppressStartupBanner="true" DebugInformationFormat="3"
|
||||
<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"
|
||||
/>
|
||||
@ -47,7 +47,7 @@
|
||||
/>
|
||||
<Tool Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool Name="VCBscMakeTool" SuppressStartupBanner="true" OutputFile=".\Release/curllib.bsc"
|
||||
<Tool Name="VCBscMakeTool" SuppressStartupBanner="true" OutputFile=".\Release/libcurl.bsc"
|
||||
/>
|
||||
<Tool Name="VCFxCopTool"
|
||||
/>
|
||||
@ -72,9 +72,9 @@
|
||||
/>
|
||||
<Tool Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="true" SuppressStartupBanner="true" TargetEnvironment="1" TypeLibraryName=".\Debug/curllib.tlb" HeaderFileName=""
|
||||
<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/curllib.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" BrowseInformation="1" WarningLevel="0" SuppressStartupBanner="true" DebugInformationFormat="3"
|
||||
<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"
|
||||
/>
|
||||
@ -88,7 +88,7 @@
|
||||
/>
|
||||
<Tool Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool Name="VCBscMakeTool" SuppressStartupBanner="true" OutputFile=".\Debug/curllib.bsc"
|
||||
<Tool Name="VCBscMakeTool" SuppressStartupBanner="true" OutputFile=".\Debug/libcurl.bsc"
|
||||
/>
|
||||
<Tool Name="VCFxCopTool"
|
||||
/>
|
||||
|
||||
@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "curllib"=".\lib\curllib.dsp" - Package Owner=<4>
|
||||
Project: "libcurl"=".\lib\libcurl.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
@ -24,7 +24,7 @@ Package=<5>
|
||||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name curllib
|
||||
Project_Dep_Name libcurl
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user