Architecture selection for winbuild and minor makefiles refactoring

1 files changed, 3 insertions, 15 deletions

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index c5450c114..9ba6291f7 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -211,9 +211,6 @@ SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL
 GEN_PDB = true

 !ENDIF

 

-!IFNDEF MACHINE

-MACHINE = X86

-!ENDIF

 

 !IFDEF EMBEND_MANIFEST

 MANIFESTTOOL = mt -manifest $(DIRDIST)\$(PROGRAM_NAME).manifest -outputresource:$(DIRDIST)\$(PROGRAM_NAME);1

@@ -245,7 +242,7 @@ WIN_LIBS    = ws2_32.lib wldap32.lib advapi32.lib
 !ERROR please choose a valid mode

 !ENDIF

 

-CONFIG_NAME_LIB = libcurl

+
 

 # CURL_XX macros are for the curl.exe command

 

@@ -255,14 +252,12 @@ CC              = $(CC_DEBUG) $(RTLIB_DEBUG)
 

 CURL_CC         = $(CC)

 CURL_RC_FLAGS = /i../include /dDEBUGBUILD=1 /Fo $@ $(CURL_SRC_DIR)\curl.rc

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-debug

 !ELSE

 RC_FLAGS = /dDEBUGBUILD=0 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc

 CC              = $(CC_NODEBUG) $(RTLIB)

 

 CURL_CC         = $(CC)

 CURL_RC_FLAGS = /i../include /dDEBUGBUILD=0 /Fo $@ $(CURL_SRC_DIR)\curl.rc

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-release

 !ENDIF

 

 CURL_CC = $(CURL_CC) $(CURL_CFLAGS)

@@ -280,7 +275,6 @@ LNK       = $(LNK)  /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP)
 CURL_LIBS = /IMPLIB:$(LIB_DIROBJ)\$(LIB_NAME_IMP)

 !ENDIF

 RESOURCE = $(LIB_DIROBJ)\libcurl.res

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-dll

 

 # AS_DLL

 !ELSE

@@ -292,7 +286,6 @@ TARGET   = $(LIB_NAME_STATIC)
 !ENDIF

 LNK      = $(LNKLIB) $(WIN_LIBS) /out:$(LIB_DIROBJ)\$(TARGET)

 CC       = $(CC) $(CFLAGS_LIBCURL_STATIC)

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-static

 

 # AS_DLL

 !ENDIF

@@ -300,38 +293,32 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-static
 !IF "$(USE_SSL)"=="true"

 CFLAGS = $(CFLAGS) $(SSL_CFLAGS)

 LFLAGS = $(LFLAGS) $(SSL_LFLAGS) $(SSL_LIBS)

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ssl-$(SSL)

 !ENDIF

 

 !IF "$(USE_ZLIB)"=="true"

 CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS)

 LFLAGS = $(LFLAGS) $(ZLIB_LFLAGS) $(ZLIB_LIBS)

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-zlib-$(ZLIB)

 !ENDIF

 

 !IF "$(USE_SSH2)"=="true"

 CFLAGS = $(CFLAGS) $(SSH2_CFLAGS)

 LFLAGS = $(LFLAGS) $(SSH2_LFLAGS) $(SSH2_LIBS)

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ssh2-$(SSH2)

 !ENDIF

 

 !IF "$(USE_IPV6)"=="true"

 CFLAGS = $(CFLAGS) $(IPV6_CFLAGS)

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6

 !ENDIF

 

 !IF "$(USE_SSPI)"=="true"

 CFLAGS = $(CFLAGS) $(SSPI_CFLAGS)

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi

 !ENDIF

 

 !IF "$(USE_SPNEGO)"=="true"

 CFLAGS = $(CFLAGS) $(SPNEGO_CFLAGS)

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-spnego

 !ENDIF

 

 !IF "$(USE_WINSSL)"=="true"

-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-winssl

+#
 !ENDIF

 

 !IF "$(GEN_PDB)"=="true"

@@ -397,6 +384,7 @@ $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR)
 	@echo LFLAGS:     $(LFLAGS)

 	@echo GenPDB:     $(GEN_PDB)

 	@echo Debug:      $(DEBUG)

+	@echo Machine:    $(MACHINE)
 	$(LNK) $(LFLAGS) $(LIB_OBJS)

 	@echo Copying libs...

 	@if exist $(LIB_DIROBJ)\$(LIB_NAME_DLL) copy $(LIB_DIROBJ)\$(LIB_NAME_DLL)       $(DIRDIST)\bin\ /y >nul 2<&1