From 2cee2b94165fbd5df4369a31b15ea05a68699fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Fri, 10 Aug 2007 16:55:53 +0000 Subject: [PATCH] add client and tex2lyx support; add support for debug and release builds git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19402 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/qmake/app/app.pro | 22 +++---- development/qmake/boost/boost.pro | 2 + development/qmake/config.pri | 3 + development/qmake/controllers/controllers.pro | 2 + development/qmake/frontends/frontends.pro | 2 + development/qmake/graphics/graphics.pro | 2 + development/qmake/insets/insets.pro | 2 +- development/qmake/lyx.pro | 4 ++ development/qmake/mathed/mathed.pro | 3 + development/qmake/qt4/qt4.pro | 2 + development/qmake/src/src.pro | 2 + development/qmake/support/support.pro | 2 + development/qmake/tex2lyx/tex2lyx.pro | 57 +++++++++++++++++++ 13 files changed, 93 insertions(+), 12 deletions(-) create mode 100644 development/qmake/tex2lyx/tex2lyx.pro diff --git a/development/qmake/app/app.pro b/development/qmake/app/app.pro index 0dd0f1233b..18d40f1d50 100644 --- a/development/qmake/app/app.pro +++ b/development/qmake/app/app.pro @@ -5,20 +5,20 @@ TEMPLATE = app DESTDIR = ../bin -TARGET = lyx +TARGET = lyx$${DEBUGSUFFIX} SOURCES += $${BUILD_BASE_SOURCE_DIR}/src/main.cpp CONFIG += link_prl CONFIG += debug_and_release -LIBS += -L../lib -lsrc -LIBS += -lsrc -LIBS += -lmathed -LIBS += -lfrontends -LIBS += -lgraphics -LIBS += -linsets -LIBS += -lcontrollers -LIBS += -lqt4 -LIBS += -lsupport -LIBS += -lboost +LIBS += -L../lib +LIBS += -llyxmathed$${DEBUGSUFFIX} +LIBS += -llyxinsets$${DEBUGSUFFIX} +LIBS += -llyxgraphics$${DEBUGSUFFIX} +LIBS += -llyxsupport$${DEBUGSUFFIX} +LIBS += -llyxfrontends$${DEBUGSUFFIX} +LIBS += -llyxcontrollers$${DEBUGSUFFIX} +LIBS += -llyxqt4$${DEBUGSUFFIX} +LIBS += -llyxboost$${DEBUGSUFFIX} +LIBS += -llyxsrc$${DEBUGSUFFIX} diff --git a/development/qmake/boost/boost.pro b/development/qmake/boost/boost.pro index e256e76def..4f70f7dcca 100644 --- a/development/qmake/boost/boost.pro +++ b/development/qmake/boost/boost.pro @@ -1,6 +1,8 @@ include(../config.pri) +TARGET = lyxboost$${DEBUGSUFFIX} + DEFINES += BOOST_DISABLE_THREADS=1 DEFINES += BOOST_NO_WREGEX=1 DEFINES += BOOST_NO_WSTRING=1 diff --git a/development/qmake/config.pri b/development/qmake/config.pri index 1b08686b31..2e77f38433 100644 --- a/development/qmake/config.pri +++ b/development/qmake/config.pri @@ -6,6 +6,9 @@ CONFIG += create_prl DESTDIR = ../lib +CONFIG(release, debug|release) DEBUGSUFFIX = +CONFIG(debug, debug|release) DEBUGSUFFIX = d + BUILD_BASE_SOURCE_DIR = $$[BUILD_BASE_SOURCE_DIR] BUILD_BASE_TARGET_DIR = $$[BUILD_BASE_TARGET_DIR] diff --git a/development/qmake/controllers/controllers.pro b/development/qmake/controllers/controllers.pro index ffe472ce8b..4ce37f1967 100644 --- a/development/qmake/controllers/controllers.pro +++ b/development/qmake/controllers/controllers.pro @@ -1,6 +1,8 @@ include(../config.pri) +TARGET = lyxcontrollers$${DEBUGSUFFIX} + INC += boost INC += src diff --git a/development/qmake/frontends/frontends.pro b/development/qmake/frontends/frontends.pro index 31d95c2bec..1493e0b4cc 100644 --- a/development/qmake/frontends/frontends.pro +++ b/development/qmake/frontends/frontends.pro @@ -1,6 +1,8 @@ include(../config.pri) +TARGET = lyxfrontends$${DEBUGSUFFIX} + DEFINES += QT_NO_KEYWORDS INC += boost diff --git a/development/qmake/graphics/graphics.pro b/development/qmake/graphics/graphics.pro index 980b992f3f..ed635ff451 100644 --- a/development/qmake/graphics/graphics.pro +++ b/development/qmake/graphics/graphics.pro @@ -1,6 +1,8 @@ include(../config.pri) +TARGET = lyxgraphics$${DEBUGSUFFIX} + QT = INC += boost diff --git a/development/qmake/insets/insets.pro b/development/qmake/insets/insets.pro index 272a6fb9c2..8238b12abd 100644 --- a/development/qmake/insets/insets.pro +++ b/development/qmake/insets/insets.pro @@ -1,7 +1,7 @@ include(../config.pri) -#DEFINES += QT_NO_KEYWORDS +TARGET = lyxinsets$${DEBUGSUFFIX} QT = diff --git a/development/qmake/lyx.pro b/development/qmake/lyx.pro index c2a9190e93..6a8c1129d4 100644 --- a/development/qmake/lyx.pro +++ b/development/qmake/lyx.pro @@ -16,3 +16,7 @@ SUBDIRS += qt4/qt4.pro SUBDIRS += insets/insets.pro SUBDIRS += app/app.pro + +SUBDIRS += tex2lyx/tex2lyx.pro + +SUBDIRS += client/client.pro diff --git a/development/qmake/mathed/mathed.pro b/development/qmake/mathed/mathed.pro index fd71078488..06bd86f222 100644 --- a/development/qmake/mathed/mathed.pro +++ b/development/qmake/mathed/mathed.pro @@ -1,5 +1,8 @@ + include(../config.pri) +TARGET = lyxmathed$${DEBUGSUFFIX} + QT = INC += src diff --git a/development/qmake/qt4/qt4.pro b/development/qmake/qt4/qt4.pro index 61f7b02bfc..8703b683ac 100644 --- a/development/qmake/qt4/qt4.pro +++ b/development/qmake/qt4/qt4.pro @@ -1,6 +1,8 @@ include(../config.pri) +TARGET = lyxqt4$${DEBUGSUFFIX} + DEFINES += QT_NO_KEYWORDS INC += boost diff --git a/development/qmake/src/src.pro b/development/qmake/src/src.pro index 4f8f89200f..0df177d099 100644 --- a/development/qmake/src/src.pro +++ b/development/qmake/src/src.pro @@ -1,6 +1,8 @@ include(../config.pri) +TARGET = lyxsrc$${DEBUGSUFFIX} + TEMPLATE = lib QT = diff --git a/development/qmake/support/support.pro b/development/qmake/support/support.pro index 3971cbea56..4d6d074e7d 100644 --- a/development/qmake/support/support.pro +++ b/development/qmake/support/support.pro @@ -1,6 +1,8 @@ include(../config.pri) +TARGET = lyxsupport$${DEBUGSUFFIX} + QT = core INC += boost diff --git a/development/qmake/tex2lyx/tex2lyx.pro b/development/qmake/tex2lyx/tex2lyx.pro new file mode 100644 index 0000000000..5fbb4ab56b --- /dev/null +++ b/development/qmake/tex2lyx/tex2lyx.pro @@ -0,0 +1,57 @@ + +include(../config.pri) + +TEMPLATE = app + +TARGET = ../bin/tex2lyx$${DEBUGSUFFIX} + +QT = + +LIBS += -L../lib +LIBS += -llyxmathed$${DEBUGSUFFIX} +LIBS += -llyxinsets$${DEBUGSUFFIX} +LIBS += -llyxgraphics$${DEBUGSUFFIX} +LIBS += -llyxsupport$${DEBUGSUFFIX} +LIBS += -llyxfrontends$${DEBUGSUFFIX} +LIBS += -llyxcontrollers$${DEBUGSUFFIX} +LIBS += -llyxqt4$${DEBUGSUFFIX} +LIBS += -llyxboost$${DEBUGSUFFIX} +LIBS += -llyxsrc$${DEBUGSUFFIX} + +INC += src +INC += boost + +HPP += Context.h +HPP += Font.h +HPP += Parser.h +HPP += Spacing.h +HPP += pch.h +HPP += tex2lyx.h + +CPP += Context.cpp +CPP += Font.cpp +CPP += Parser.cpp +CPP += boost.cpp +CPP += gettext.cpp +CPP += lengthcommon.cpp +CPP += math.cpp +CPP += preamble.cpp +CPP += table.cpp +CPP += tex2lyx.cpp +CPP += text.cpp + +# linked files +HPP += ../Layout.h +HPP += ../TextClass.h + +CPP += ../FloatList.cpp +CPP += ../Floating.cpp +CPP += ../Counters.cpp +CPP += ../Layout.cpp +CPP += ../TextClass.cpp +CPP += ../Lexer.cpp + + +for(FILE,CPP) { SOURCES += $${BUILD_BASE_SOURCE_DIR}/src/tex2lyx/$${FILE} } +for(FILE,HPP) { HEADERS += $${BUILD_BASE_SOURCE_DIR}/src/tex2lyx/$${FILE} } +for(PATH,INC) { INCLUDEPATH += $${BUILD_BASE_SOURCE_DIR}/$${PATH} }