upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-06-13 10:56:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert r1773

Browse source 
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1776 e7ae566f-a301-0410-adde-c780ea21d3b5
This commit is contained in:
james 2007-03-16 20:39:04 +00:00
parent 7f61d53b97
commit 464d33ae42
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
install-win32/makebin
View file

@ -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

3
install-win32/maketapinstall
View file

@ -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

15
install-win32/openvpn.nsi
View file

@ -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

2
install-win32/version.nsi
View file

@ -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.