mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-13 17:20:55 +00:00
Scons: Remove /TP (force to use C++ compiler) option from scons/msvc. It is not needed after the .C ==> .cpp conversion
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@19709 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
3a5be5a4c1
commit
7009c53dbd
@ -456,11 +456,10 @@ C_COMPILER = env.subst('$CC')
|
||||
C_CCFLAGS = env.subst('$CCFLAGS').split()
|
||||
# if we use ms vc, the commands are fine (cl.exe and link.exe)
|
||||
if use_vc:
|
||||
# /TP treat all source code as C++
|
||||
# C4819: The file contains a character that cannot be represented
|
||||
# in the current code page (number)
|
||||
# C4996: foo was decleared deprecated
|
||||
CCFLAGS_required.extend(['/TP', '/EHsc'])
|
||||
CCFLAGS_required.append('/EHsc')
|
||||
if mode == 'debug':
|
||||
CCFLAGS_default.extend(['/wd4819', '/wd4996', '/nologo', '/MDd'])
|
||||
# the flags are also needed in C mode (for intl lib)
|
||||
|
@ -228,7 +228,7 @@ int main()
|
||||
}
|
||||
'''
|
||||
conf.Message('Checking for the use of global cstd... ')
|
||||
ret = conf.TryLink(check_global_cstd_source, '.c')
|
||||
ret = conf.TryLink(check_global_cstd_source, '.cpp')
|
||||
conf.Result(ret)
|
||||
return ret
|
||||
|
||||
@ -407,7 +407,7 @@ int main() {
|
||||
}
|
||||
'''
|
||||
conf.Message('Checking if the declaration of iconv needs const... ')
|
||||
ret = conf.TryLink(check_iconv_const, '.c')
|
||||
ret = conf.TryLink(check_iconv_const, '.cpp')
|
||||
conf.Result(ret)
|
||||
return ret
|
||||
|
||||
|
@ -95,3 +95,4 @@ What's new
|
||||
|
||||
- Better alignment in the version info output.
|
||||
|
||||
- Remove /TP (force to use C++ compiler) option from scons/msvc.
|
||||
|
Loading…
Reference in New Issue
Block a user