aboutsummaryrefslogtreecommitdiff
path: root/install-win32
diff options
context:
space:
mode:
Diffstat (limited to 'install-win32')
-rw-r--r--install-win32/makebin4
-rw-r--r--install-win32/maketapinstall3
-rwxr-xr-xinstall-win32/openvpn.nsi15
-rw-r--r--install-win32/version.nsi2
4 files changed, 13 insertions, 11 deletions
diff --git a/install-win32/makebin b/install-win32/makebin
index 308ec5c..671fb3b 100644
--- a/install-win32/makebin
+++ b/install-win32/makebin
@@ -31,9 +31,9 @@ if [ -z "$DRVBINSRC" ] ; then
# Get tapinstall
mkdir bin/tapinstall
mkdir bin/tapinstall/i386
+ mkdir bin/tapinstall/amd64
cp tapinstall/objfre_wnet_x86/i386/tapinstall.exe bin/tapinstall/i386
- #mkdir bin/tapinstall/amd64
- #cp tapinstall/objfre_wnet_amd64/amd64/tapinstall.exe bin/tapinstall/amd64
+ cp tapinstall/objfre_wnet_amd64/amd64/tapinstall.exe bin/tapinstall/amd64
else
cp -a $DRVBINSRC/driver bin/driver
cp -a $DRVBINSRC/tapinstall bin/tapinstall
diff --git a/install-win32/maketapinstall b/install-win32/maketapinstall
index cbbfeaa..e10f25c 100644
--- a/install-win32/maketapinstall
+++ b/install-win32/maketapinstall
@@ -16,8 +16,7 @@ if [ -z "$DRVBINSRC" ] ; then
t=`pwd`
cd ..
- # Add "fre AMD64 WNET" to below line to also build X64 version
- for mode in "fre WNET" ; do
+ 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"
done
diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi
index 2926ca3..fc059df 100755
--- a/install-win32/openvpn.nsi
+++ b/install-win32/openvpn.nsi
@@ -322,9 +322,13 @@ Section "TAP-Win32 Virtual Ethernet Adapter" SecTAP
DetailPrint "We are running on a 64-bit system."
+ SetOutPath "$INSTDIR\bin"
+
+ File "${BIN}\tapinstall\amd64\tapinstall.exe"
+
SetOutPath "$INSTDIR\driver"
+
File "${BIN}\driver\amd64\OemWin2k.inf"
- File "${BIN}\driver\amd64\tap.cat"
File "${BIN}\driver\amd64\${TAPDRV}"
goto tapend
@@ -333,16 +337,15 @@ tap-32bit:
DetailPrint "We are running on a 32-bit system."
+ SetOutPath "$INSTDIR\bin"
+ File "${BIN}\tapinstall\i386\tapinstall.exe"
+
SetOutPath "$INSTDIR\driver"
File "${BIN}\driver\i386\OemWin2k.inf"
File "${BIN}\driver\i386\tap.cat"
File "${BIN}\driver\i386\${TAPDRV}"
-tapend:
-
- ; Use x86 tapinstall for both x86 and x64
- SetOutPath "$INSTDIR\bin"
- File "${BIN}\tapinstall\i386\tapinstall.exe"
+ tapend:
SectionEnd
diff --git a/install-win32/version.nsi b/install-win32/version.nsi
index 9976ad7..164dc19 100644
--- a/install-win32/version.nsi
+++ b/install-win32/version.nsi
@@ -1,7 +1,7 @@
# Version numbers, settings, and dependencies
# for Windows OpenVPN installer.
-!define PRODUCT_VERSION "2.1_rc2e"
+!define PRODUCT_VERSION "2.1_rc2c"
# Copy installer to this directory when finished.
# If undefined, don't copy installer after generation.