dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added -Wno-non-virtual-dtor for 7zip files on gnu configuration for bug #1676243

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5051 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-04-11 20:54:00 +00:00
parent f6e58f133a
commit 3608995944
4 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
SCons/Config/default
View file

@ -13,6 +13,7 @@ defenv['CPP_FLAG'] = ''
defenv['CPP_REQUIRES_STDLIB'] = 0
defenv['SUBSYS_CON'] = ''
defenv['MSVCRT_FLAG'] = ''
defenv['IGNORE_VDTOR_WARN'] = ''
### stub environment

1
SCons/Config/gnu
View file

@ -31,6 +31,7 @@ defenv['ALIGN_FLAG'] = '-Wl,--file-alignment,512'
defenv['CPP_REQUIRES_STDLIB'] = 1
defenv['SUBSYS_CON'] = '-Wl,--subsystem,console'
defenv['MSVCRT_FLAG'] = ''
defenv['IGNORE_VDTOR_WARN'] = '-Wno-non-virtual-dtor'
### helper functions

1
SCons/Config/ms
View file

@ -12,6 +12,7 @@ defenv['CPP_FLAG'] = '/TP'
defenv['CPP_REQUIRES_STDLIB'] = 0
defenv['SUBSYS_CON'] = '/subsystem:console'
defenv['MSVCRT_FLAG'] = '/MD'
defenv['IGNORE_VDTOR_WARN'] = ''
if float(defenv['MSVS_VERSION'].replace('Exp','')) >= 8.0:
defenv['EXCEPTION_FLAG'] = '/EHsc'

1
Source/SConscript
View file

@ -83,6 +83,7 @@ env.Append(CPPDEFINES = ['_WIN32_IE=0x0500'])
lzma_env = env.Clone()
lzma_env.Append(CPPDEFINES = ['COMPRESS_MF_BT'])
lzma_env.Append(CCFLAGS = ['$IGNORE_VDTOR_WARN'])
lzma_files = lzma_env.Object(lzma_files)
##### Compile makensis