From 7f61d53b97261ed5d2d3f8472810e42176ad44b3 Mon Sep 17 00:00:00 2001
From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Thu, 8 Mar 2007 09:37:45 +0000
Subject: Don't build special x64 version of tapinstall.exe

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1773 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 install-win32/openvpn.nsi | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'install-win32/openvpn.nsi')

diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi
index fc059df..2926ca3 100755
--- a/install-win32/openvpn.nsi
+++ b/install-win32/openvpn.nsi
@@ -322,13 +322,9 @@ 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
@@ -337,15 +333,16 @@ 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:
+tapend:
+
+  ; Use x86 tapinstall for both x86 and x64
+  SetOutPath "$INSTDIR\bin"
+  File "${BIN}\tapinstall\i386\tapinstall.exe"
 
 SectionEnd
 
-- 
cgit