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

winbuild: Clean up formatting and variable naming

Browse Source 
- Changed space usage to line up with the whole file
- Renamed CFLAGS_SSPI/IPV6 to SSPI/IPV6_CFLAGS to be
  consistent with the other CFLAGS_x variables
- Make use of existing CFLAGS_IPV6 (previously IPV6_CFLAGS)
  instead of appending directly to CFLAGS
This commit is contained in:
Marc Hoersken 2012-07-05 08:39:40 +02:00
parent 825fff880e
commit aeca33f96c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winbuild/Makefile.vc
View File

@ -106,7 +106,7 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-debug
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-release CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-release
!ENDIF !ENDIF
!IF "$(AS_DLL)" == "true" !IF "$(AS_DLL)"=="true"
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-dll CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-dll
!ELSE !ELSE
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-static CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-static

26
winbuild/MakefileBuild.vc
View File

@ -154,7 +154,7 @@ USE_WINSSL = true
!ENDIF !ENDIF
!IF "$(USE_WINSSL)"=="true" !IF "$(USE_WINSSL)"=="true"
CFLAGS_SSPI = /DUSE_SCHANNEL SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL
USE_SCHANNEL = true USE_SCHANNEL = true
USE_SSPI = yes USE_SSPI = yes
!ENDIF !ENDIF
@ -165,8 +165,8 @@ USE_SSPI = yes
!ENDIF !ENDIF
!IF "$(USE_SSPI)"=="yes" !IF "$(USE_SSPI)"=="yes"
CFLAGS_SSPI = $(CFLAGS_SSPI) /DUSE_WINDOWS_SSPI
USE_SSPI = true USE_SSPI = true
SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI
!ENDIF !ENDIF
@ -177,7 +177,7 @@ USE_IPV6 = true
!ENDIF !ENDIF
!IF "$(USE_IPV6)"=="true" !IF "$(USE_IPV6)"=="true"
CFLAGS = $(CFLAGS) /DUSE_IPV6 IPV6_CFLAGS = $(IPV6_CFLAGS) /DUSE_IPV6
!ENDIF !ENDIF
@ -195,7 +195,7 @@ LFLAGS = $(LFLAGS) Normaliz.lib
!IF "$(GEN_PDB)"=="yes" !IF "$(GEN_PDB)"=="yes"
GEN_PDB=true GEN_PDB = true
!ENDIF !ENDIF
!IFNDEF MACHINE !IFNDEF MACHINE
@ -207,11 +207,11 @@ MANIFESTTOOL = mt -manifest $(DIRDIST)\$(PROGRAM_NAME).manifest -outputresource:
!ENDIF !ENDIF
# Runtime library configuration # Runtime library configuration
!IF "$(RTLIBCFG)" == "static" !IF "$(RTLIBCFG)"=="static"
RTLIB = /MT RTLIB = /MT
RTLIB_DEBUG = /MTd RTLIB_DEBUG = /MTd
!ELSE !ELSE
RTLIB = /MD RTLIB = /MD
RTLIB_DEBUG = /MDd RTLIB_DEBUG = /MDd
!ENDIF !ENDIF
@ -219,12 +219,12 @@ RTLIB_DEBUG = /MDd
TARGET = $(LIB_NAME_STATIC) TARGET = $(LIB_NAME_STATIC)
CURL_LIBCURL_LIBNAME=$(LIB_NAME_STATIC) CURL_LIBCURL_LIBNAME=$(LIB_NAME_STATIC)
AS_DLL = false AS_DLL = false
CFGSET=true CFGSET = true
!ELSEIF "$(MODE)"=="dll" !ELSEIF "$(MODE)"=="dll"
TARGET = $(LIB_NAME_DLL) TARGET = $(LIB_NAME_DLL)
CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP) CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP)
AS_DLL = true AS_DLL = true
CFGSET=true CFGSET = true
!ENDIF !ENDIF
WIN_LIBS = ws2_32.lib wldap32.lib WIN_LIBS = ws2_32.lib wldap32.lib
@ -303,12 +303,12 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ssh2-$(SSH2)
!ENDIF !ENDIF
!IF "$(USE_IPV6)"=="true" !IF "$(USE_IPV6)"=="true"
CFLAGS = $(CFLAGS) $(CFLAGS_IPV6) CFLAGS = $(CFLAGS) $(IPV6_CFLAGS)
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6
!ENDIF !ENDIF
!IF "$(USE_SSPI)"=="true" !IF "$(USE_SSPI)"=="true"
CFLAGS = $(CFLAGS) $(CFLAGS_SSPI) CFLAGS = $(CFLAGS) $(SSPI_CFLAGS)
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi
!ENDIF !ENDIF
@ -356,8 +356,8 @@ clean:
!include CURL_OBJS.inc !include CURL_OBJS.inc
!include LIBCURL_OBJS.inc !include LIBCURL_OBJS.inc
LIB_OBJS= $(LIBCURL_OBJS) LIB_OBJS = $(LIBCURL_OBJS)
EXE_OBJS= $(CURL_OBJS) EXE_OBJS = $(CURL_OBJS)
all : $(TARGET) $(PROGRAM_NAME) all : $(TARGET) $(PROGRAM_NAME)