Allow installation of TAP-Win64

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1755 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/configure.ac b/configure.ac
index 64789cf433bb06d4a0ab2cc0c66e7903b582227f..12e11e31e93f44766b518faf9f051ac9fa22e72d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
 
-AC_INIT([OpenVPN], [2.1_rc2a], [openvpn-users@lists.sourceforge.net], [openvpn])
+AC_INIT([OpenVPN], [2.1_rc2b], [openvpn-users@lists.sourceforge.net], [openvpn])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR(syshead.h)
 

diff --git a/install-win32/openvpn.nsi.in b/install-win32/openvpn.nsi.in
index bcb142a1669022a0ed4835055834e02b88a2158d..298046efbea1414d2dc0a1de2ee30a98bc5339c8 100755 (executable)
--- a/install-win32/openvpn.nsi.in
+++ b/install-win32/openvpn.nsi.in
@@ -199,13 +199,13 @@ goodwinver:
   ; we are running on 64-bit windows
   StrCmp $1 "VISTA" vista64bummer
 
-  Messagebox MB_OK "Sorry, OpenVPN doesn't currently support 64-bit Windows."
-  Abort
+#  Messagebox MB_OK "Sorry, OpenVPN doesn't currently support 64-bit Windows."
+#  Abort
 
 vista64bummer:
 
-  Messagebox MB_OK "Sorry, OpenVPN doesn't currently support 64-bit Vista because Microsoft doesn't allow the installation of 64 bit unsigned drivers."
-  Abort
+#  Messagebox MB_OK "Sorry, OpenVPN doesn't currently support 64-bit Vista because Microsoft doesn't allow the installation of 64 bit unsigned drivers."
+#  Abort
 
 init32bits:
 
@@ -323,12 +323,12 @@ Section "TAP-Win32 Virtual Ethernet Adapter" SecTAP
 
   SetOutPath "$INSTDIR\bin"
 
-;  File "${BIN}\ti3790-amd64\tapinstall.exe"
+  File "${BIN}\ti3790-amd64\tapinstall.exe"
 
   SetOutPath "$INSTDIR\driver"
 
-;  File "${HOME}\tap-win32\amd64\OemWin2k.inf"
-;  File "${HOME}\tap-win32\amd64\${TAPDRV}"
+  File "${HOME}\tap-win32\amd64\OemWin2k.inf"
+  File "${HOME}\tap-win32\amd64\${TAPDRV}"
 
 goto tapend
 

diff --git a/install-win32/prebuild b/install-win32/prebuild
index a15a6fdd8d1dd3c4c3213928603939f795d0326a..7aec69a9b1ea5ef096f2d274fdb0cb964f690e4a 100755 (executable)
--- a/install-win32/prebuild
+++ b/install-win32/prebuild
@@ -31,7 +31,7 @@ DMALLOC=$H/dmalloc-5.4.2
 # TAP binaries should be here: tap0901.sys and tapinstall.exe
 # These must be built with MS DDK.
 TAPBIN=$H/tapbin-0901
-#TAPBIN64=$H/tapbin64-0901
+TAPBIN64=$H/tapbin64-0901
 
 # u2d.c should exist here.
 SCRIPTS=$IN/install-win32
@@ -109,15 +109,15 @@ cp $TAPBIN/OemWin2k.inf $OUT/tap-win32/i386
 cp $TAPBIN/tap.cat $OUT/tap-win32/i386
 cp $TAPBIN/tap0901.sys $OUT/tap-win32/i386
 
-#mkdir $OUT/tap-win32/amd64
-#cp $TAPBIN64/OemWin2k.inf $OUT/tap-win32/amd64
-#cp $IN/tap-win32/amd64/tap.cat $OUT/tap-win32/amd64
-#cp $TAPBIN64/tap0901.sys $OUT/tap-win32/amd64
+mkdir $OUT/tap-win32/amd64
+cp $TAPBIN64/OemWin2k.inf $OUT/tap-win32/amd64
+cp $TAPBIN64/tap.cat $OUT/tap-win32/amd64
+cp $TAPBIN64/tap0901.sys $OUT/tap-win32/amd64
 
 mkdir $OUT/bin/ti3790-i386
 cp $TAPBIN/tapinstall.exe $OUT/bin/ti3790-i386
-#mkdir $OUT/bin/ti3790-amd64
-#cp $TAPBIN64/tapinstall.exe $OUT/bin/ti3790-amd64
+mkdir $OUT/bin/ti3790-amd64
+cp $TAPBIN64/tapinstall.exe $OUT/bin/ti3790-amd64
 
 echo BUILD service-win32