@@ -6,13 +6,23 @@

 # get version.nsi definitions

 . autodefs/nsidefs.sh

+amdtarget=""

+if [ -z "$TAP_BIN_AMD64" ]; then

+    amdtarget="fre AMD64 WNET"

+fi

+

 if [ -z "$DRVBINSRC" ] ; then

     cd tap-win32

     t=`pwd`

     cd ..

-    for mode in "fre WNET" "fre AMD64 WNET"; do

+    for mode in "fre WNET" "$amdtarget"; do

 	echo '**********' build TAP $mode

 	cmd //c "C:\\WINDDK\\$DDKVER\\bin\\setenv.bat C:\\WINDDK\\$DDKVER $mode && cd `perl install-win32/dosname.pl $t` && build -cef"

     done

 fi

+

+if [ -n "$TAP_BIN_AMD64" ]; then

+    mkdir -p $t/amd64

+    cp "$TAP_BIN_AMD64" $t/amd64

+fi

@@ -8,6 +8,16 @@

 # get version.nsi definitions

 . autodefs/nsidefs.sh

+if ! [ -d "$TISRC" ] ; then

+    echo "$TISRC" NOT INSTALLED

+    exit 1

+fi

+

+amdtarget=""

+if [ -z "$TI_BIN_AMD64" ]; then

+    amdtarget="fre AMD64 WNET"

+fi

+

 if [ -z "$DRVBINSRC" ] ; then

     rm -rf tapinstall

     cp -a "$TISRC" tapinstall

@@ -16,8 +26,15 @@ if [ -z "$DRVBINSRC" ] ; then

     t=`pwd`

     cd ..

-    for mode in "fre WNET" "fre AMD64 WNET"; do

-	echo '**********' build TAPINSTALL $mode

-	cmd //c "C:\\WINDDK\\$DDKVER\\bin\\setenv.bat C:\\WINDDK\\$DDKVER $mode && cd `perl install-win32/dosname.pl $t` && build -cef"

+    for mode in "fre WNET" "$amdtarget"; do

+	if [ -n "$mode" ]; then

+	    echo '**********' build TAPINSTALL $mode

+	    cmd //c "C:\\WINDDK\\$DDKVER\\bin\\setenv.bat C:\\WINDDK\\$DDKVER $mode && cd `perl install-win32/dosname.pl $t` && build -cef"

+	fi

     done

 fi

+

+if [ -n "$TI_BIN_AMD64" ]; then

+    mkdir -p $t/objfre_wnet_amd64/amd64

+    cp "$TI_BIN_AMD64" $t/objfre_wnet_amd64/amd64

+fi

@@ -3,6 +3,10 @@

 !define PRODUCT_VERSION "2.1_rc2c"

+# For now, use prebuilt AMD64 tap/tapinstall

+!define TAP_BIN_AMD64 "../amd64/tap/tap0901.sys"

+!define TI_BIN_AMD64  "../amd64/tapinstall/tapinstall.exe"

+

 # Copy installer to this directory when finished.

 # If undefined, don't copy installer after generation.

 !define INSTALLER_DEST	"/y"