diff options
| author | Marc Hoersken <info@marc-hoersken.de> | 2012-07-05 08:39:40 +0200 |
|---|---|---|
| committer | Marc Hoersken <info@marc-hoersken.de> | 2012-07-07 23:30:36 +0200 |
| commit | aeca33f96c7928eab38eddfe8eead3acbd99f83f (patch) | |
| tree | 511b580d9eef512241fde16f8159c61caf1c8e98 /winbuild | |
| parent | 825fff880e4ac3f5ed1e8d089baa33fee227a792 (diff) | |
winbuild: Clean up formatting and variable naming
- 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
Diffstat (limited to 'winbuild')
| -rw-r--r-- | winbuild/Makefile.vc | 2 | ||||
| -rw-r--r-- | winbuild/MakefileBuild.vc | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index 59e29d6c1..0bccc9801 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -106,7 +106,7 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-debug CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-release
!ENDIF
-!IF "$(AS_DLL)" == "true"
+!IF "$(AS_DLL)"=="true"
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-dll
!ELSE
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-static
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 277ea5533..442e3c578 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -154,7 +154,7 @@ USE_WINSSL = true !ENDIF
!IF "$(USE_WINSSL)"=="true"
-CFLAGS_SSPI = /DUSE_SCHANNEL
+SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL
USE_SCHANNEL = true
USE_SSPI = yes
!ENDIF
@@ -165,8 +165,8 @@ USE_SSPI = yes !ENDIF
!IF "$(USE_SSPI)"=="yes"
-CFLAGS_SSPI = $(CFLAGS_SSPI) /DUSE_WINDOWS_SSPI
USE_SSPI = true
+SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI
!ENDIF
@@ -177,7 +177,7 @@ USE_IPV6 = true !ENDIF
!IF "$(USE_IPV6)"=="true"
-CFLAGS = $(CFLAGS) /DUSE_IPV6
+IPV6_CFLAGS = $(IPV6_CFLAGS) /DUSE_IPV6
!ENDIF
@@ -195,7 +195,7 @@ LFLAGS = $(LFLAGS) Normaliz.lib !IF "$(GEN_PDB)"=="yes"
-GEN_PDB=true
+GEN_PDB = true
!ENDIF
!IFNDEF MACHINE
@@ -207,11 +207,11 @@ MANIFESTTOOL = mt -manifest $(DIRDIST)\$(PROGRAM_NAME).manifest -outputresource: !ENDIF
# Runtime library configuration
-!IF "$(RTLIBCFG)" == "static"
-RTLIB = /MT
+!IF "$(RTLIBCFG)"=="static"
+RTLIB = /MT
RTLIB_DEBUG = /MTd
!ELSE
-RTLIB = /MD
+RTLIB = /MD
RTLIB_DEBUG = /MDd
!ENDIF
@@ -219,12 +219,12 @@ RTLIB_DEBUG = /MDd TARGET = $(LIB_NAME_STATIC)
CURL_LIBCURL_LIBNAME=$(LIB_NAME_STATIC)
AS_DLL = false
-CFGSET=true
+CFGSET = true
!ELSEIF "$(MODE)"=="dll"
TARGET = $(LIB_NAME_DLL)
CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP)
AS_DLL = true
-CFGSET=true
+CFGSET = true
!ENDIF
WIN_LIBS = ws2_32.lib wldap32.lib
@@ -303,12 +303,12 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ssh2-$(SSH2) !ENDIF
!IF "$(USE_IPV6)"=="true"
-CFLAGS = $(CFLAGS) $(CFLAGS_IPV6)
+CFLAGS = $(CFLAGS) $(IPV6_CFLAGS)
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6
!ENDIF
!IF "$(USE_SSPI)"=="true"
-CFLAGS = $(CFLAGS) $(CFLAGS_SSPI)
+CFLAGS = $(CFLAGS) $(SSPI_CFLAGS)
CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi
!ENDIF
@@ -356,8 +356,8 @@ clean: !include CURL_OBJS.inc
!include LIBCURL_OBJS.inc
-LIB_OBJS= $(LIBCURL_OBJS)
-EXE_OBJS= $(CURL_OBJS)
+LIB_OBJS = $(LIBCURL_OBJS)
+EXE_OBJS = $(CURL_OBJS)
all : $(TARGET) $(PROGRAM_NAME)
|