diff --git a/Contrib/NSIS Menu/SConscript b/Contrib/NSIS Menu/SConscript index 5f797692..b89ee339 100644 --- a/Contrib/NSIS Menu/SConscript +++ b/Contrib/NSIS Menu/SConscript @@ -64,6 +64,13 @@ if env['PLATFORM'] != 'win32' or os.environ.has_key('WXWIN'): cross_platform = True ) + # manifest + + if env.has_key('MSVS_VERSION'): + if float(env['MSVS_VERSION'].replace('Exp','')) >= 8.0: + manifest = env.SideEffect('%s.exe.manifest' % target, nsis_menu) + env.DistributeBin(manifest, alias='install-utils') + # set directories if nsis_menu[0].env['PLATFORM'] == 'win32': diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi index 98d3f160..5175c920 100644 --- a/Examples/makensis.nsi +++ b/Examples/makensis.nsi @@ -117,8 +117,9 @@ ${MementoSection} "NSIS Core Files (required)" SecCore File ..\makensisw.exe File ..\COPYING File ..\NSIS.chm - File ..\NSIS.exe + File /nonfatal ..\NSIS.exe.manifest + IfFileExists $INSTDIR\nsisconf.nsi "" +2 Rename $INSTDIR\nsisconf.nsi $INSTDIR\nsisconf.nsh SetOverwrite off