summaryrefslogtreecommitdiff
path: root/winbuild
diff options
context:
space:
mode:
authorMarc Hoersken <info@marc-hoersken.de>2012-09-10 21:56:39 +0200
committerMarc Hoersken <info@marc-hoersken.de>2012-09-10 21:56:39 +0200
commitf665e5d1303262045580ac72989e17a1db94f356 (patch)
treefc4310dc1217fcaa500841235ea47c9c4d59614e /winbuild
parentfa4b4d2033bd79bcc40e754b19ca50849e2e0e69 (diff)
downloadcurl-f665e5d1303262045580ac72989e17a1db94f356.tar.gz
winbuild: Adjusted order of options to generated config name
Cleaned up order of handled build options by ordering them nearly alphabetically by using the order of the generated config name. Preparation for future/more build options.
Diffstat (limited to 'winbuild')
-rw-r--r--winbuild/Makefile.vc32
-rw-r--r--winbuild/MakefileBuild.vc30
2 files changed, 31 insertions, 31 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index be93381f4..e61ee92eb 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -23,11 +23,11 @@ CFGSET=true
!MESSAGE WITH_SSL=<dll or static> - Enable OpenSSL support, DLL or static
!MESSAGE WITH_ZLIB=<dll or static> - Enable zlib support, DLL or static
!MESSAGE WITH_SSH2=<dll or static> - Enable libSSH2 support, DLL or static
-!MESSAGE ENABLE_SSPI=<yes or no> - Enable SSPI support, defaults to yes
-!MESSAGE ENABLE_IPV6=<yes or no> - Enable IPv6, defaults to yes
!MESSAGE ENABLE_IDN=<yes or no> - Enable use of Windows IDN APIs, defaults to yes
!MESSAGE Requires Windows Vista or later, or installation from:
!MESSAGE http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815
+!MESSAGE ENABLE_IPV6=<yes or no> - Enable IPv6, defaults to yes
+!MESSAGE ENABLE_SSPI=<yes or no> - Enable SSPI support, defaults to yes
!MESSAGE ENABLE_WINSSL=<yes or no> - Enable native Windows SSL support, defaults to yes
!MESSAGE GEN_PDB=<yes or no> - Generate Program Database (debug symbols for release build)
!MESSAGE DEBUG=<yes or no> - Debug builds
@@ -53,12 +53,12 @@ ENABLE_SSPI = $(USE_SSPI)
!ENDIF
# default options
-!IFNDEF ENABLE_SSPI
-USE_SSPI = true
-!ELSEIF "$(ENABLE_SSPI)"=="yes"
-USE_SSPI = true
-!ELSEIF "$(ENABLE_SSPI)"=="no"
-USE_SSPI = false
+!IFNDEF ENABLE_IDN
+USE_IDN = true
+!ELSEIF "$(ENABLE_IDN)"=="yes"
+USE_IDN = true
+!ELSEIF "$(ENABLE_IDN)"=="no"
+USE_IDN = false
!ENDIF
!IFNDEF ENABLE_IPV6
@@ -69,12 +69,12 @@ USE_IPV6 = true
USE_IPV6 = false
!ENDIF
-!IFNDEF ENABLE_IDN
-USE_IDN = true
-!ELSEIF "$(ENABLE_IDN)"=="yes"
-USE_IDN = true
-!ELSEIF "$(ENABLE_IDN)"=="no"
-USE_IDN = false
+!IFNDEF ENABLE_SSPI
+USE_SSPI = true
+!ELSEIF "$(ENABLE_SSPI)"=="yes"
+USE_SSPI = true
+!ELSEIF "$(ENABLE_SSPI)"=="no"
+USE_SSPI = false
!ENDIF
!IFNDEF ENABLE_WINSSL
@@ -163,9 +163,9 @@ $(MODE):
@SET MACRO_NAME=CURL_OBJS
@SET OUTFILE=CURL_OBJS.inc
@gen_resp_file.bat $(CURL_OBJS)
- @SET USE_SSPI=$(USE_SSPI)
- @SET USE_IPV6=$(USE_IPV6)
@SET USE_IDN=$(USE_IDN)
+ @SET USE_IPV6=$(USE_IPV6)
+ @SET USE_SSPI=$(USE_SSPI)
@SET USE_WINSSL=$(USE_WINSSL)
@$(MAKE) /NOLOGO /F MakefileBuild.vc
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 800bebcce..218b7c9c6 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -143,14 +143,15 @@ SSH2_CFLAGS = $(SSH2_CFLAGS) /I$(WITH_DEVEL)/include/libssh2
!ENDIF
-!IFNDEF USE_SSPI
-USE_SSPI = true
-!ELSEIF "$(USE_SSPI)"=="yes"
-USE_SSPI = true
+!IFNDEF USE_IDN
+USE_IDN = true
+!ELSEIF "$(USE_IDN)"=="yes"
+USE_IDN = true
!ENDIF
-!IF "$(USE_SSPI)"=="true"
-SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI
+!IF "$(USE_IDN)"=="true"
+CFLAGS = $(CFLAGS) /DUSE_WIN32_IDN /DWANT_IDN_PROTOTYPES
+LFLAGS = $(LFLAGS) Normaliz.lib
!ENDIF
@@ -165,15 +166,14 @@ IPV6_CFLAGS = $(IPV6_CFLAGS) /DUSE_IPV6
!ENDIF
-!IFNDEF USE_IDN
-USE_IDN = true
-!ELSEIF "$(USE_IDN)"=="yes"
-USE_IDN = true
+!IFNDEF USE_SSPI
+USE_SSPI = true
+!ELSEIF "$(USE_SSPI)"=="yes"
+USE_SSPI = true
!ENDIF
-!IF "$(USE_IDN)"=="true"
-CFLAGS = $(CFLAGS) /DUSE_WIN32_IDN /DWANT_IDN_PROTOTYPES
-LFLAGS = $(LFLAGS) Normaliz.lib
+!IF "$(USE_SSPI)"=="true"
+SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI
!ENDIF
@@ -372,9 +372,9 @@ $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR)
@echo Using SSL: $(USE_SSL)
@echo Using SSH2: $(USE_SSH2)
@echo Using ZLIB: $(USE_ZLIB)
- @echo Using SSPI: $(USE_SSPI)
- @echo Using IPv6: $(USE_IPV6)
@echo Using IDN: $(USE_IDN)
+ @echo Using IPv6: $(USE_IPV6)
+ @echo Using SSPI: $(USE_SSPI)
@echo Using WinSSL: $(USE_WINSSL)
@echo CFLAGS: $(CFLAGS)
@echo LFLAGS: $(LFLAGS)