more of bug #1676243 - compiler warnings on Linux
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5066 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
85c529d0f0
commit
bebb041789
4 changed files with 1 additions and 4 deletions
|
@ -13,7 +13,6 @@ defenv['CPP_FLAG'] = ''
|
||||||
defenv['CPP_REQUIRES_STDLIB'] = 0
|
defenv['CPP_REQUIRES_STDLIB'] = 0
|
||||||
defenv['SUBSYS_CON'] = ''
|
defenv['SUBSYS_CON'] = ''
|
||||||
defenv['MSVCRT_FLAG'] = ''
|
defenv['MSVCRT_FLAG'] = ''
|
||||||
defenv['IGNORE_VDTOR_WARN'] = ''
|
|
||||||
|
|
||||||
### stub environment
|
### stub environment
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,6 @@ defenv['ALIGN_FLAG'] = '-Wl,--file-alignment,512'
|
||||||
defenv['CPP_REQUIRES_STDLIB'] = 1
|
defenv['CPP_REQUIRES_STDLIB'] = 1
|
||||||
defenv['SUBSYS_CON'] = '-Wl,--subsystem,console'
|
defenv['SUBSYS_CON'] = '-Wl,--subsystem,console'
|
||||||
defenv['MSVCRT_FLAG'] = ''
|
defenv['MSVCRT_FLAG'] = ''
|
||||||
defenv['IGNORE_VDTOR_WARN'] = '-Wno-non-virtual-dtor'
|
|
||||||
|
|
||||||
### helper functions
|
### helper functions
|
||||||
|
|
||||||
|
@ -83,6 +82,7 @@ makensis_env = defenv.Clone()
|
||||||
if not defenv['DEBUG']:
|
if not defenv['DEBUG']:
|
||||||
makensis_env.Append(CCFLAGS = '-O2') # optimize
|
makensis_env.Append(CCFLAGS = '-O2') # optimize
|
||||||
makensis_env.Append(CCFLAGS = '-Wall') # all warnings
|
makensis_env.Append(CCFLAGS = '-Wall') # all warnings
|
||||||
|
makensis_env.Append(CCFLAGS = '-Wno-non-virtual-dtor') # ignore virtual dtor warnings
|
||||||
|
|
||||||
conf = FlagsConfigure(makensis_env)
|
conf = FlagsConfigure(makensis_env)
|
||||||
conf.CheckLinkFlag('-m32') #
|
conf.CheckLinkFlag('-m32') #
|
||||||
|
|
|
@ -12,7 +12,6 @@ defenv['CPP_FLAG'] = '/TP'
|
||||||
defenv['CPP_REQUIRES_STDLIB'] = 0
|
defenv['CPP_REQUIRES_STDLIB'] = 0
|
||||||
defenv['SUBSYS_CON'] = '/subsystem:console'
|
defenv['SUBSYS_CON'] = '/subsystem:console'
|
||||||
defenv['MSVCRT_FLAG'] = '/MD'
|
defenv['MSVCRT_FLAG'] = '/MD'
|
||||||
defenv['IGNORE_VDTOR_WARN'] = ''
|
|
||||||
|
|
||||||
if float(defenv['MSVS_VERSION'].replace('Exp','')) >= 8.0:
|
if float(defenv['MSVS_VERSION'].replace('Exp','')) >= 8.0:
|
||||||
defenv['EXCEPTION_FLAG'] = '/EHsc'
|
defenv['EXCEPTION_FLAG'] = '/EHsc'
|
||||||
|
|
|
@ -83,7 +83,6 @@ env.Append(CPPDEFINES = ['_WIN32_IE=0x0500'])
|
||||||
|
|
||||||
lzma_env = env.Clone()
|
lzma_env = env.Clone()
|
||||||
lzma_env.Append(CPPDEFINES = ['COMPRESS_MF_BT'])
|
lzma_env.Append(CPPDEFINES = ['COMPRESS_MF_BT'])
|
||||||
lzma_env.Append(CCFLAGS = ['$IGNORE_VDTOR_WARN'])
|
|
||||||
lzma_files = lzma_env.Object(lzma_files)
|
lzma_files = lzma_env.Object(lzma_files)
|
||||||
|
|
||||||
##### Compile makensis
|
##### Compile makensis
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue