aboutsummaryrefslogtreecommitdiff
path: root/install-win32
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2009-01-21 16:59:41 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2009-01-21 16:59:41 +0000
commit63c9b4973cf7b3e437ab92b4c8b7cea7c8630932 (patch)
tree69f3e681e5bf3de48b4c54876decb98831b59ce2 /install-win32
parentIn Windows installer generator, don't sign the installer .exe (diff)
downloadopenvpn-63c9b4973cf7b3e437ab92b4c8b7cea7c8630932.tar.xz
Version 2.1_rc15e
Windows installer changes: * ifdefed out the check Windows version code which is causing problems on Windows 7 * don't define SF_SELECTED if it is already defined git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3855 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'install-win32')
-rwxr-xr-xinstall-win32/openvpn.nsi5
1 files changed, 5 insertions, 0 deletions
diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi
index c1a1710..10e5291 100755
--- a/install-win32/openvpn.nsi
+++ b/install-win32/openvpn.nsi
@@ -234,6 +234,7 @@ Function .onInit
# Delete previous start menu
RMDir /r $SMPROGRAMS\${PRODUCT_NAME}
+!ifdef CHECK_WINDOWS_VERSION
# Check windows version
Call GetWindowsVersion
Pop $1
@@ -263,9 +264,13 @@ vista64bummer:
init32bits:
+!endif
+
FunctionEnd
+!ifndef SF_SELECTED
!define SF_SELECTED 1
+!endif
;--------------------
;Pre-install section