mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-12 22:14:35 +00:00
Fix scons (moc src/support/*.h)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22048 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
dc9dcc9c1f
commit
0e2ec55add
@ -1499,6 +1499,11 @@ if (included_gettext and not libExists('included_intl')) or 'intl' in BUILD_TARG
|
|||||||
#
|
#
|
||||||
# src/support
|
# src/support
|
||||||
#
|
#
|
||||||
|
frontend_env['QT4_MOCHPREFIX'] = ''
|
||||||
|
frontend_env['QT4_MOCHSUFFIX'] = '_moc.cpp'
|
||||||
|
|
||||||
|
support_moced_files = [frontend_env.Moc4('$BUILDDIR/src/support/%s' % x)
|
||||||
|
for x in src_support_header_files ]
|
||||||
support = frontend_env.StaticLibrary(
|
support = frontend_env.StaticLibrary(
|
||||||
target = '$LOCALLIBPATH/support',
|
target = '$LOCALLIBPATH/support',
|
||||||
source = ['$BUILDDIR/src/support/%s' % x for x in src_support_files] + \
|
source = ['$BUILDDIR/src/support/%s' % x for x in src_support_files] + \
|
||||||
@ -1511,7 +1516,7 @@ support = frontend_env.StaticLibrary(
|
|||||||
'-DQT_NO_STL',
|
'-DQT_NO_STL',
|
||||||
'-DQT_NO_KEYWORDS',
|
'-DQT_NO_KEYWORDS',
|
||||||
],
|
],
|
||||||
CPPPATH = ['$CPPPATH', '$TOP_SRCDIR/src/support/minizip']
|
CPPPATH = ['$CPPPATH', '$BUILDDIR/src/support', '$TOP_SRCDIR/src/support/minizip']
|
||||||
)
|
)
|
||||||
Alias('support', support)
|
Alias('support', support)
|
||||||
|
|
||||||
@ -1559,9 +1564,6 @@ Alias('graphics', graphics)
|
|||||||
#
|
#
|
||||||
# src/frontend/qt4
|
# src/frontend/qt4
|
||||||
#
|
#
|
||||||
frontend_env['QT4_MOCHPREFIX'] = ''
|
|
||||||
frontend_env['QT4_MOCHSUFFIX'] = '_moc.cpp'
|
|
||||||
|
|
||||||
# tells scons how to get these moced files, although not all moced files are needed
|
# tells scons how to get these moced files, although not all moced files are needed
|
||||||
# (or are actually generated).
|
# (or are actually generated).
|
||||||
qt4_moced_files = [frontend_env.Moc4('$BUILDDIR/src/frontends/qt4/%s' % x)
|
qt4_moced_files = [frontend_env.Moc4('$BUILDDIR/src/frontends/qt4/%s' % x)
|
||||||
|
Loading…
Reference in New Issue
Block a user