moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

Even more winbuild refactoring

Browse Source
This commit is contained in:
Sapien2 2012-10-25 14:54:07 +04:00 committed by Marc Hoersken
parent 0cb5650386
commit 3be96564a8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
winbuild/MakefileBuild.vc
View File

@ -66,6 +66,7 @@ LFLAGS_PDB = /incremental:no /opt:ref,icf
CFLAGS_LIBCURL_STATIC = /DCURL_STATICLIB CFLAGS_LIBCURL_STATIC = /DCURL_STATICLIB
WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib
LIB_NAME_STATIC = libcurl_a.lib LIB_NAME_STATIC = libcurl_a.lib
LIB_NAME_STATIC_DEBUG = libcurl_a_debug.lib LIB_NAME_STATIC_DEBUG = libcurl_a_debug.lib
LIB_NAME_DLL = libcurl.dll LIB_NAME_DLL = libcurl.dll
@ -148,8 +149,8 @@ USE_IDN = true
!ENDIF !ENDIF
!IF "$(USE_IDN)"=="true" !IF "$(USE_IDN)"=="true"
CFLAGS = $(CFLAGS) /DUSE_WIN32_IDN /DWANT_IDN_PROTOTYPES IDN_CFLAGS = $(IDN_CFLAGS) /DUSE_WIN32_IDN /DWANT_IDN_PROTOTYPES
LFLAGS = $(LFLAGS) Normaliz.lib WIN_LIBS = $(WIN_LIBS) Normaliz.lib
!ENDIF !ENDIF
@ -196,6 +197,7 @@ USE_WINSSL = $(USE_SSPI)
USE_WINSSL = true USE_WINSSL = true
!ENDIF !ENDIF
!IF "$(USE_WINSSL)"=="true" !IF "$(USE_WINSSL)"=="true"
!IF "$(USE_SSPI)"!="true" !IF "$(USE_SSPI)"!="true"
!ERROR cannot build with WinSSL without SSPI !ERROR cannot build with WinSSL without SSPI
@ -204,7 +206,6 @@ SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL
!ENDIF !ENDIF
!IF "$(GEN_PDB)"=="yes" !IF "$(GEN_PDB)"=="yes"
GEN_PDB = true GEN_PDB = true
!ENDIF !ENDIF
@ -235,7 +236,6 @@ AS_DLL = true
CFGSET = true CFGSET = true
!ENDIF !ENDIF
WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib
!IF "$(CFGSET)" == "FALSE" !IF "$(CFGSET)" == "FALSE"
!ERROR please choose a valid mode !ERROR please choose a valid mode
!ENDIF !ENDIF
@ -303,6 +303,10 @@ CFLAGS = $(CFLAGS) $(SSH2_CFLAGS)
LFLAGS = $(LFLAGS) $(SSH2_LFLAGS) $(SSH2_LIBS) LFLAGS = $(LFLAGS) $(SSH2_LFLAGS) $(SSH2_LIBS)
!ENDIF !ENDIF
!IF "$(USE_IDN)"=="true"
CFLAGS = $(CFLAGS) $(IDN_CFLAGS)
!ENDIF
!IF "$(USE_IPV6)"=="true" !IF "$(USE_IPV6)"=="true"
CFLAGS = $(CFLAGS) $(IPV6_CFLAGS) CFLAGS = $(CFLAGS) $(IPV6_CFLAGS)
!ENDIF !ENDIF