diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2007-03-05 22:30:52 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2007-03-05 22:30:52 +0000 |
| commit | c833aa11d268b7cb0fbe62abc05b0b759b2c3311 (patch) | |
| tree | 3dcbee4ff89d5c87a1cd3b052c6c4e11c17ee0a5 | |
| parent | TAP driver fix for Vista x64 BSOD. (diff) | |
| download | openvpn-c833aa11d268b7cb0fbe62abc05b0b759b2c3311.tar.xz | |
Allow installation of TAP-Win64
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1755 e7ae566f-a301-0410-adde-c780ea21d3b5
| -rw-r--r-- | configure.ac | 2 | ||||
| -rwxr-xr-x | install-win32/openvpn.nsi.in | 14 | ||||
| -rwxr-xr-x | install-win32/prebuild | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 64789cf..12e11e3 100644 --- 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 bcb142a..298046e 100755 --- 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 a15a6fd..7aec69a 100755 --- 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 |