aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2007-04-19 22:03:54 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2007-04-19 22:03:54 +0000
commit7e90ca24c05c5b8fb35a1aff78291125d5d7150b (patch)
tree44a9c659ab91d0b236bbe7f5fca2595f1625fda7
parentUpdated build system and tap driver to work with (diff)
downloadopenvpn-7e90ca24c05c5b8fb35a1aff78291125d5d7150b.tar.xz
Use Server 2003 rather than Vista as x64 target for tap/tapinstall.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1853 e7ae566f-a301-0410-adde-c780ea21d3b5
-rw-r--r--install-win32/makebin2
-rw-r--r--install-win32/maketap2
-rw-r--r--install-win32/maketapinstall2
-rw-r--r--install-win32/version.nsi6
4 files changed, 4 insertions, 8 deletions
diff --git a/install-win32/makebin b/install-win32/makebin
index 66691a9..7547ee1 100644
--- a/install-win32/makebin
+++ b/install-win32/makebin
@@ -33,7 +33,7 @@ if [ -z "$DRVBINSRC" ] ; then
mkdir bin/tapinstall/i386
mkdir bin/tapinstall/amd64
cp tapinstall/objfre_w2k_x86/i386/tapinstall.exe bin/tapinstall/i386
- cp tapinstall/objfre_wlh_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/maketap b/install-win32/maketap
index 728bb85..1ee4ed5 100644
--- a/install-win32/maketap
+++ b/install-win32/maketap
@@ -8,7 +8,7 @@
amdtarget=""
if [ -z "$TAP_BIN_AMD64" ]; then
- amdtarget="fre AMD64 WLH"
+ amdtarget="fre AMD64 WNET"
fi
if [ -z "$DRVBINSRC" ] ; then
diff --git a/install-win32/maketapinstall b/install-win32/maketapinstall
index 72b81b7..96fd14a 100644
--- a/install-win32/maketapinstall
+++ b/install-win32/maketapinstall
@@ -15,7 +15,7 @@ fi
amdtarget=""
if [ -z "$TI_BIN_AMD64" ]; then
- amdtarget="fre AMD64 WLH"
+ amdtarget="fre AMD64 WNET"
fi
if [ -z "$DRVBINSRC" ] ; then
diff --git a/install-win32/version.nsi b/install-win32/version.nsi
index 9e9d4e2..f399cb5 100644
--- a/install-win32/version.nsi
+++ b/install-win32/version.nsi
@@ -1,16 +1,12 @@
# Version numbers, settings, and dependencies
# for Windows OpenVPN installer.
-!define PRODUCT_VERSION "2.1_rc2d"
+!define PRODUCT_VERSION "2.1_rc2e"
# 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"
-
# Prebuilt libraries. DMALLOC is optional.
!define OPENSSL_DIR "../openssl-0.9.7l"
!define LZO_DIR "../lzo-2.02"