anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Scons cleanup 4: stop forcing the use of c++ compiler because of the .C ==> .cpp conversion

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19820 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2007-08-27 03:28:08 +00:00
parent 640125e0ed
commit d44f8f84ad
1 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
development/scons/SConstruct
View File

@ -458,13 +458,6 @@ if use_vc:
else: else:
CCFLAGS_default.extend(['/wd4819', '/wd4996', '/nologo', '/MD']) CCFLAGS_default.extend(['/wd4819', '/wd4996', '/nologo', '/MD'])
C_CCFLAGS.extend(['/wd4819', '/wd4996', '/nologo', '/MD']) C_CCFLAGS.extend(['/wd4819', '/wd4996', '/nologo', '/MD'])
else:
if env.has_key('CXX') and env['CXX']:
env['CC'] = env.subst('$CXX')
env['LINK'] = env.subst('$CXX')
else:
env['CC'] = 'g++'
env['LINK'] = 'g++'
# for debug/release mode # for debug/release mode
if env.has_key('optimization') and env['optimization'] is not None: if env.has_key('optimization') and env['optimization'] is not None:
@ -1465,6 +1458,7 @@ env.SConsignFile(os.path.join(Dir(env['BUILDDIR']).abspath, '.sconsign'))
# this usage needs further investigation. # this usage needs further investigation.
#env.CacheDir('%s/Cache/%s' % (env['BUILDDIR'], frontend)) #env.CacheDir('%s/Cache/%s' % (env['BUILDDIR'], frontend))
env.BuildDir('$BUILDDIR/boost', '$TOP_SRCDIR/boost/libs', duplicate = 0) env.BuildDir('$BUILDDIR/boost', '$TOP_SRCDIR/boost/libs', duplicate = 0)
env.BuildDir('$BUILDDIR/intl', '$TOP_SRCDIR/intl', duplicate = 0)
env.BuildDir('$BUILDDIR/src', '$TOP_SRCDIR/src', duplicate = 0) env.BuildDir('$BUILDDIR/src', '$TOP_SRCDIR/src', duplicate = 0)
frontend_env.BuildDir('$BUILDDIR/src', '$TOP_SRCDIR/src', duplicate = 0) frontend_env.BuildDir('$BUILDDIR/src', '$TOP_SRCDIR/src', duplicate = 0)
@ -1477,18 +1471,15 @@ def libExists(libname):
if (included_boost and not libExists('included_boost_regex')) or 'boost' in BUILD_TARGETS: if (included_boost and not libExists('included_boost_regex')) or 'boost' in BUILD_TARGETS:
# #
# boost libraries # boost/libs
boostenv = env.Copy()
# #
# boost use its own config.h
boostenv['CPPPATH'] = ['$BUILDDIR/boost'] + extra_inc_paths
boostenv['CCFLAGS'] = ['$INCPREFIX$TOP_SRCDIR/boost']
boostenv.AppendUnique(CCFLAGS = ['-DBOOST_USER_CONFIG="<config.h>"'])
for lib in boost_libs: for lib in boost_libs:
boostlib = boostenv.StaticLibrary( boostlib = env.StaticLibrary(
target = '$LOCALLIBPATH/included_boost_%s' % lib, target = '$LOCALLIBPATH/included_boost_%s' % lib,
source = ['$BUILDDIR/boost/%s/src/%s' % (lib, x) for x in eval('boost_libs_%s_src_files' % lib)] source = ['$BUILDDIR/boost/%s/src/%s' % (lib, x) for x in eval('boost_libs_%s_src_files' % lib)],
# do not use global CPPPATH because src/config.h will mess up with boost/config.h
CPPPATH = ['$BUILDDIR/boost'] + extra_inc_paths,
CCFLAGS = ['$CCFLAGS', '$INCPREFIX$TOP_SRCDIR/boost', '-DBOOST_USER_CONFIG="<config.h>"']
) )
Alias('boost', boostlib) Alias('boost', boostlib)
@ -1497,17 +1488,7 @@ if (included_gettext and not libExists('included_intl')) or 'intl' in BUILD_TARG
# #
# intl # intl
# #
intlenv = env.Copy() INTL_CCFLAGS = [
# we need the original C compiler for these files
intlenv['CC'] = C_COMPILER
intlenv['CCFLAGS'] = C_CCFLAGS
if use_vc:
intlenv.Append(CCFLAGS=['/Dinline#', '/D__attribute__(x)#', '/Duintmax_t=UINT_MAX'])
# intl does not use global config.h
intlenv['CPPPATH'] = ['$BUILDDIR/intl'] + extra_inc_paths
intlenv.Append(CCFLAGS = [
r'-DLOCALEDIR=\"' + env['LOCALEDIR'].replace('\\', '\\\\') + r'\"', r'-DLOCALEDIR=\"' + env['LOCALEDIR'].replace('\\', '\\\\') + r'\"',
r'-DLOCALE_ALIAS_PATH=\"' + env['LOCALEDIR'].replace('\\', '\\\\') + r'\"', r'-DLOCALE_ALIAS_PATH=\"' + env['LOCALEDIR'].replace('\\', '\\\\') + r'\"',
r'-DLIBDIR=\"' + env['TOP_SRCDIR'].replace('\\', '\\\\') + r'/lib\"', r'-DLIBDIR=\"' + env['TOP_SRCDIR'].replace('\\', '\\\\') + r'/lib\"',
@ -1521,11 +1502,15 @@ if (included_gettext and not libExists('included_intl')) or 'intl' in BUILD_TARG
'-DDEPENDS_ON_LIBICONV=1', '-DDEPENDS_ON_LIBICONV=1',
'-DHAVE_CONFIG_H' '-DHAVE_CONFIG_H'
] ]
) if use_vc:
INTL_CCFLAGS.extend(['/Dinline#', '/D__attribute__(x)#', '/Duintmax_t=UINT_MAX'])
intl = intlenv.StaticLibrary( intl = env.StaticLibrary(
target = '$LOCALLIBPATH/included_intl', target = '$LOCALLIBPATH/included_intl',
LIBS = ['c'], LIBS = ['c'],
CCFLAGS = INTL_CCFLAGS,
# do not use global CPPPATH because src/config.h will mess up with intl/config.h
CPPPATH = ['$BUILDDIR/intl'] + extra_inc_paths,
source = ['$BUILDDIR/intl/%s' % x for x in intl_files] source = ['$BUILDDIR/intl/%s' % x for x in intl_files]
) )
Alias('intl', intl) Alias('intl', intl)