Looks good to me. Reviewed-by: Zhang, Lubo <[email protected]>
-----Original Message----- From: edk2-devel [mailto:[email protected]] On Behalf Of Jiaxin Wu Sent: Wednesday, March 09, 2016 3:45 PM To: [email protected] Cc: Zhang, Lubo <[email protected]>; Fu, Siyuan <[email protected]> Subject: [edk2] [Patch] Makefile: Enable arch X64 build This patch is used to support arch X64 build. The ARCH can be either IA32 or X64. Adapt these two directives to your need. Cc: Fu Siyuan <[email protected]> Cc: Zhang Lubo <[email protected]> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiaxin Wu <[email protected]> --- Makefile | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index ea567ba..85a68ec 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ #/*++ # -# Copyright (c) 2006, Intel Corporation +# Copyright (c) 2006 - 2016, Intel Corporation # All rights reserved. This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php # @@ -20,36 +20,47 @@ # #WINPCAP_DIR is the directory that contains the WinPcap developer's package #The TARGET can be either DEBUG or RELEASE. Adapt these two directives to your need +#The ARCH can be either IA32 or X64. Adapt these two directives to your +need # WINPCAP_DIR = ".\WpdPack" TARGET = DEBUG +ARCH = IA32 + +# +#WINPCAP_LIBPATH is the directory that contains the WinPcap developer's +library # !IF "$(ARCH)" == "IA32" +WINPCAP_LIB = ".\WpdPack\Lib" +!ELSE +WINPCAP_LIB = ".\WpdPack\Lib\x64" +!ENDIF # #Change the output directory and compile parameters according to the TARGET. # !IF "$(TARGET)" == "DEBUG" -OUTPUT_DIR = Debug +OUTPUT_DIR = Debug_$(ARCH) C_DEFINES = /D "WIN32" /D "SNPNT32IO_EXPORTS" -C_FLAGS = /Od /FD /MTd /Fo"Debug/" /Fd"Debug/vc70" /W3 /c /Wp64 /ZI /TC -LINK_FLAGS = /DLL /DEBUG /PDB:"Debug/SnpNt32Io.pdb" +C_FLAGS = /Od /FD /MTd /Fo"$(OUTPUT_DIR)/" /Fd"$(OUTPUT_DIR)/vc70" /W3 /c /Wp64 /ZI /TC +LINK_FLAGS = /DLL /DEBUG /PDB:"$(OUTPUT_DIR)/SnpNt32Io.pdb" !ELSE -OUTPUT_DIR = Release +OUTPUT_DIR = Release_$(ARCH) C_DEFINES = /D "WIN32" /D "NDEBUG" /D "SNPNT32IO_EXPORTS" -C_FLAGS = /O2 /FD /MT /GS /Fo"Release/" /Fd"Release/vc70" /W3 /c /Wp64 /Zi /TC +C_FLAGS = /O2 /FD /MT /GS /Fo"$(OUTPUT_DIR)/" /Fd"$(OUTPUT_DIR)/vc70" /W3 /c /Wp64 /Zi /TC LINK_FLAGS = /DLL !ENDIF # #Main section to build the SnpNt32Io.DLL. The "-" before command prevents the #nmake to exit when the command returns an error # SnpNt32Io.DLL : SnpNt32Io.obj - link $(LINK_FLAGS) /IMPLIB:"$(OUTPUT_DIR)/SnpNt32Io.lib" /LIBPATH:$(WINPCAP_DIR)\Lib\ + link $(LINK_FLAGS) /IMPLIB:"$(OUTPUT_DIR)/SnpNt32Io.lib" + /LIBPATH:$(WINPCAP_LIB)\ /OUT:"$(OUTPUT_DIR)/SnpNt32Io.dll" wpcap.lib packet.lib $(OUTPUT_DIR)/SnpNt32Io.obj SnpNt32Io.obj : src\SnpNt32Io.c - md $(OUTPUT_DIR) cl /I $(WINPCAP_DIR)\Include $(C_DEFINES) $(C_FLAGS) src\SnpNt32Io.c -- 1.9.5.msysgit.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
