From 8964ea91407f5a3822a74439aa80e5cde1416793 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Tue, 14 Aug 2007 05:30:05 +0000 Subject: [PATCH] prepare ground for a hybrid autoconf/qmake build git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19542 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/qmake/app/app.pro | 5 + development/qmake/config.h.template | 638 ---------------------------- development/qmake/config.pri | 27 +- development/qmake/lyx.pro | 6 +- development/qmake/qt4/qt4.pro | 11 +- development/qmake/src/src.pro | 46 +- 6 files changed, 63 insertions(+), 670 deletions(-) delete mode 100644 development/qmake/config.h.template diff --git a/development/qmake/app/app.pro b/development/qmake/app/app.pro index 18d40f1d50..0d6b833807 100644 --- a/development/qmake/app/app.pro +++ b/development/qmake/app/app.pro @@ -7,11 +7,16 @@ DESTDIR = ../bin TARGET = lyx$${DEBUGSUFFIX} +INCLUDEPATH += $${BUILD_BASE_SOURCE_DIR}/src +INCLUDEPATH += $${BUILD_BASE_SOURCE_DIR}/boost + SOURCES += $${BUILD_BASE_SOURCE_DIR}/src/main.cpp CONFIG += link_prl CONFIG += debug_and_release +LIBS += -lAiksaurus + LIBS += -L../lib LIBS += -llyxmathed$${DEBUGSUFFIX} LIBS += -llyxinsets$${DEBUGSUFFIX} diff --git a/development/qmake/config.h.template b/development/qmake/config.h.template deleted file mode 100644 index 9301a8a999..0000000000 --- a/development/qmake/config.h.template +++ /dev/null @@ -1,638 +0,0 @@ -/* src/config.h. Generated from config.h.in by configure. */ -/* src/config.h.in. Generated from configure.ac by autoheader. */ - - -/* -*- C++ -*- */ -/* - * \file config.h - * This file is part of LyX, the document processor. - * Licence details can be found in the file COPYING. - * - * This is the compilation configuration file for LyX. - * It was generated by autoconfs configure. - * You might want to change some of the defaults if something goes wrong - * during the compilation. - */ - -#ifndef _CONFIG_H -#define _CONFIG_H - - -/* Location of Aiksaurus.h */ -#define AIKSAURUS_H_LOCATION - -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define if your C++ compiler puts C library functions in the global - namespace */ -/* #undef CXX_GLOBAL_CSTD */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - -/* Define if you are building a development version of LyX */ -#define DEVEL_VERSION 1 - -/* Define if you want assertions to be enabled in the code */ -#define ENABLE_ASSERTIONS 1 - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#define ENABLE_NLS 1 - -/* Define to 1 if you have `alloca', as a function or macro. */ -#define HAVE_ALLOCA 1 - -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -#define HAVE_ALLOCA_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_ARGZ_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ASPELL_ASPELL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ASPELL_H */ - -/* Define to 1 if you have the `asprintf' function. */ -#define HAVE_ASPRINTF 1 - -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -/* #undef HAVE_CFLOCALECOPYCURRENT */ - -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in - the CoreFoundation framework. */ -/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ - -/* Define to 1 if you have the `chmod' function. */ -#define HAVE_CHMOD 1 - -/* Define to 1 if you have the `close' function. */ -#define HAVE_CLOSE 1 - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -#define HAVE_DCGETTEXT 1 - -/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you - don't. */ -#define HAVE_DECL_FEOF_UNLOCKED 1 - -/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if - you don't. */ -#define HAVE_DECL_FGETS_UNLOCKED 0 - -/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you - don't. */ -#define HAVE_DECL_GETC_UNLOCKED 1 - -/* Define if you have the prototype for function `istreambuf_iterator' */ -#define HAVE_DECL_ISTREAMBUF_ITERATOR 1 - -/* Define if you have the prototype for function `mkstemp' */ -#define HAVE_DECL_MKSTEMP 1 - -/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you - don't. */ -#define HAVE_DECL__SNPRINTF 0 - -/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you - don't. */ -#define HAVE_DECL__SNWPRINTF 0 - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#define HAVE_DIRENT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Define to 1 if you have the `fcntl' function. */ -#define HAVE_FCNTL 1 - -/* Define to 1 if you have the `fork' function. */ -#define HAVE_FORK 1 - -/* Define to 1 if you have the `fwprintf' function. */ -#define HAVE_FWPRINTF 1 - -/* Define to 1 if you have the `getcwd' function. */ -#define HAVE_GETCWD 1 - -/* Define to 1 if you have the `getegid' function. */ -#define HAVE_GETEGID 1 - -/* Define to 1 if you have the `geteuid' function. */ -#define HAVE_GETEUID 1 - -/* Define to 1 if you have the `getgid' function. */ -#define HAVE_GETGID 1 - -/* Define to 1 if you have the `getpagesize' function. */ -#define HAVE_GETPAGESIZE 1 - -/* Define to 1 if you have the `getpid' function. */ -#define HAVE_GETPID 1 - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#define HAVE_GETTEXT 1 - -/* Define to 1 if you have the `getuid' function. */ -#define HAVE_GETUID 1 - -/* Define if you have the iconv() function. */ -#define HAVE_ICONV 1 - -/* Define if you have the 'intmax_t' type in or . */ -#define HAVE_INTMAX_T 1 - -/* Define if exists and doesn't clash with . */ -#define HAVE_INTTYPES_H 1 - -/* Define if exists, doesn't clash with , and - declares uintmax_t. */ -#define HAVE_INTTYPES_H_WITH_UINTMAX 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_IOS 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_IO_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_ISTREAM 1 - -/* Define this if you have the kpsewhich program working on your system. */ -#define HAVE_KPSEWHICH 1 - -/* Define if you have and nl_langinfo(CODESET). */ -#define HAVE_LANGINFO_CODESET 1 - -/* Define if your file defines LC_MESSAGES. */ -#define HAVE_LC_MESSAGES 1 - -/* Define this if you have the AikSaurus library */ -/* #undef HAVE_LIBAIKSAURUS */ - -/* Define to 1 if you have the `gdi32' library (-lgdi32). */ -/* #undef HAVE_LIBGDI32 */ - -/* Define to 1 if you have the `m' library (-lm). */ -#define HAVE_LIBM 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LOCALE 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LOCALE_H 1 - -/* Define if you have the 'long double' type. */ -#define HAVE_LONG_DOUBLE 1 - -/* Define if you have the 'long long' type. */ -#define HAVE_LONG_LONG 1 - -/* Define to 1 if you have the `lstat' function. */ -#define HAVE_LSTAT 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MALLOC_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mempcpy' function. */ -#define HAVE_MEMPCPY 1 - -/* Define to 1 if you have the `mkdir' function. */ -#define HAVE_MKDIR 1 - -/* Define to 1 if you have the `mkfifo' function. */ -#define HAVE_MKFIFO 1 - -/* Define to 1 if you have the `mkstemp' function. */ -#define HAVE_MKSTEMP 1 - -/* Define to 1 if you have the `mktemp' function. */ -#define HAVE_MKTEMP 1 - -/* Define to 1 if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 - -/* Define this to 1 if your compiler supports the mode_t type. */ -#define HAVE_MODE_T 1 - -/* Define to 1 if you have the `munmap' function. */ -#define HAVE_MUNMAP 1 - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef HAVE_NDIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_NEWAPIS_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_NL_TYPES_H 1 - -/* Define to 1 if you have the `open' function. */ -#define HAVE_OPEN 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_OSTREAM 1 - -/* Define to 1 if you have the `pclose' function. */ -#define HAVE_PCLOSE 1 - -/* Define to 1 if you have the `popen' function. */ -#define HAVE_POPEN 1 - -/* Define if your printf() function supports format strings with positions. */ -#define HAVE_POSIX_PRINTF 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_PROCESS_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_PSPELL_PSPELL_H */ - -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define to 1 if you have the `readlink' function. */ -#define HAVE_READLINK 1 - -/* Define to 1 if you have the `setenv' function. */ -#define HAVE_SETENV 1 - -/* Define to 1 if you have the `setlocale' function. */ -#define HAVE_SETLOCALE 1 - -/* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SSTREAM 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDDEF_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define if exists, doesn't clash with , and declares - uintmax_t. */ -#define HAVE_STDINT_H_WITH_UINTMAX 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define if you have a conforming std::count template, otherwise HP version - of count template is assumed. */ -#define HAVE_STD_COUNT 1 - -/* Define to 1 if you have the `stpcpy' function. */ -#define HAVE_STPCPY 1 - -/* Define to 1 if you have the `strcasecmp' function. */ -#define HAVE_STRCASECMP 1 - -/* Define to 1 if you have the `strdup' function. */ -#define HAVE_STRDUP 1 - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strtoul' function. */ -#define HAVE_STRTOUL 1 - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_DIR_H */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_NDIR_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_SELECT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_SOCKET_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_UTIME_H */ - -/* Define to 1 if you have the `tsearch' function. */ -#define HAVE_TSEARCH 1 - -/* Define if you have the 'uintmax_t' type in or . */ -#define HAVE_UINTMAX_T 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define if you have the 'unsigned long long' type. */ -#define HAVE_UNSIGNED_LONG_LONG 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UTIME_H 1 - -/* Define if you have the 'wchar_t' type. */ -#define HAVE_WCHAR_T 1 - -/* Define to 1 if you have the `wcslen' function. */ -#define HAVE_WCSLEN 1 - -/* Define if you have the 'wint_t' type. */ -#define HAVE_WINT_T 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_ZLIB_H 1 - -/* Define to 1 if you have the `_close' function. */ -/* #undef HAVE__CLOSE */ - -/* Define to 1 if you have the `_getpid' function. */ -/* #undef HAVE__GETPID */ - -/* Define to 1 if you have the `_mkdir' function. */ -/* #undef HAVE__MKDIR */ - -/* Define to 1 if you have the `_open' function. */ -/* #undef HAVE__OPEN */ - -/* Define to 1 if you have the `_pclose' function. */ -/* #undef HAVE__PCLOSE */ - -/* Define to 1 if you have the `_popen' function. */ -/* #undef HAVE__POPEN */ - -/* Define to 1 if you have the `__argz_count' function. */ -#define HAVE___ARGZ_COUNT 1 - -/* Define to 1 if you have the `__argz_next' function. */ -#define HAVE___ARGZ_NEXT 1 - -/* Define to 1 if you have the `__argz_stringify' function. */ -#define HAVE___ARGZ_STRINGIFY 1 - -/* Define to 1 if you have the `__fsetlocking' function. */ -#define HAVE___FSETLOCKING 1 - -/* Define as const if the declaration of iconv() needs const. */ -#define ICONV_CONST - -/* Define if integer division by zero raises signal SIGFPE. */ -#define INTDIV0_RAISES_SIGFPE 1 - -/* Define to 1 if `major', `minor', and `makedev' are declared in . - */ -/* #undef MAJOR_IN_MKDEV */ - -/* Define to 1 if `major', `minor', and `makedev' are declared in - . */ -/* #undef MAJOR_IN_SYSMACROS */ - -/* Define if mkdir takes only one argument. */ -/* #undef MKDIR_TAKES_ONE_ARG */ - -/* Define if you have modern standard-compliant STL streams */ -#define MODERN_STL_STREAMS 1 - -/* Name of package */ -#define PACKAGE "lyx" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "lyx-devel@lists.lyx.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "LyX" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LyX 1.6.0svn" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "lyx" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "1.6.0svn" - -/* Define if exists and defines unusable PRI* macros. */ -/* #undef PRI_MACROS_BROKEN */ - -/* Define as the return type of signal handlers (`int' or `void'). */ -#define RETSIGTYPE void - -/* Define to the type of arg 1 for `select'. */ -#define SELECT_TYPE_ARG1 int - -/* Define to the type of args 2, 3 and 4 for `select'. */ -#define SELECT_TYPE_ARG234 (fd_set *) - -/* Define to the type of arg 5 for `select'. */ -#define SELECT_TYPE_ARG5 (struct timeval *) - -/* The size of `wchar_t', as computed by sizeof. */ -#define SIZEOF_WCHAR_T 4 - -/* Define as the maximum value of type 'size_t', if the system doesn't define - it. */ -/* #undef SIZE_MAX */ - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at runtime. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -/* #undef STACK_DIRECTION */ - -/* Define to 1 if the `S_IS*' macros in do not work properly. */ -/* #undef STAT_MACROS_BROKEN */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if you can safely include both and . */ -#define TIME_WITH_SYS_TIME 1 - -/* Define as 1 to use the aspell library */ -/* #undef USE_ASPELL */ - -/* Define as 1 to use an external ispell process to check spelling */ -#define USE_ISPELL 1 - -/* Define to 1 if LyX should use a MacOS X application bundle file layout */ -/* #undef USE_MACOSX_PACKAGING */ - -/* Define to 1 if LyX should use a POSIX-style file layout */ -#define USE_POSIX_PACKAGING 1 - -/* Define as 1 to use the pspell library */ -/* #undef USE_PSPELL */ - -/* Define to 1 if LyX should use a Windows-style file layout */ -/* #undef USE_WINDOWS_PACKAGING */ - -/* Define this if you want to see the warning directives put here and there by - the developpers to get attention */ -#define WITH_WARNINGS 1 - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ - -/* Define to 1 if the X Window System is missing or not being used. */ -/* #undef X_DISPLAY_MISSING */ - -/* Define to 1 if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -/* # undef _ALL_SOURCE */ -#endif - -/* libstdc++ concept checking */ -/* #undef _GLIBCPP_CONCEPT_CHECKS */ - -/* libstdc++ concept checking */ -#define _GLIBCXX_CONCEPT_CHECKS 1 - -/* libstdc++ debug mode */ -/* #undef _GLIBCXX_DEBUG */ - -/* libstdc++ pedantic debug mode */ -/* #undef _GLIBCXX_DEBUG_PEDANTIC */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to nothing if your compiler does not understand the 'explicit' - directive */ -/* #undef explicit */ - -/* Define to `int' if doesn't define. */ -/* #undef gid_t */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - -/* Define to `long int' if does not define. */ -/* #undef off_t */ - -/* Define to `int' if does not define. */ -/* #undef pid_t */ - -/* Define as the type of the result of subtracting two pointers, if the system - doesn't define it. */ -/* #undef ptrdiff_t */ - -/* Define to empty if the C compiler doesn't support this keyword. */ -/* #undef signed */ - -/* Define to `unsigned int' if does not define. */ -/* #undef size_t */ - -/* Define to `int' if doesn't define. */ -/* #undef uid_t */ - -/* Define to unsigned long or unsigned long long if and - don't define. */ -/* #undef uintmax_t */ - - -/************************************************************ - ** You should not need to change anything beyond this point */ - -#ifndef HAVE_STRERROR -#if defined(__cplusplus) -extern "C" -#endif -char * strerror(int n); -#endif - -#ifdef HAVE_MKSTEMP -#ifndef HAVE_DECL_MKSTEMP -#if defined(__cplusplus) -extern "C" -#endif -int mkstemp(char*); -#endif -#endif - -#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM) -# define USE_BOOST_FORMAT 1 -#else -# define USE_BOOST_FORMAT 0 -#endif - -#define BOOST_USER_CONFIG - -#if !defined(ENABLE_ASSERTIONS) -# define BOOST_DISABLE_ASSERTS 1 -#endif -#define BOOST_ENABLE_ASSERT_HANDLER 1 - -#define BOOST_DISABLE_THREADS 1 -#define BOOST_NO_WREGEX 1 -#define BOOST_NO_WSTRING 1 - -#ifdef __CYGWIN__ -# define BOOST_POSIX 1 -# define BOOST_POSIX_API 1 -# define BOOST_POSIX_PATH 1 -#endif - -#if defined(HAVE_NEWAPIS_H) -# define WANT_GETFILEATTRIBUTESEX_WRAPPER 1 -#endif - -/* - * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t - * support compiled in: - * http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#3_9 - * And we are not interested at all what libc - * does: What we need is a 32bit wide wchar_t, and a libstdc++ that - * has the needed wchar_t support and uses UCS4. Whether it - * implements this with the help of libc, or whether it has own code - * does not matter for us, because we don't use libc directly (Georg) -*/ -#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) -# define USE_WCHAR_T -#endif - -#endif - diff --git a/development/qmake/config.pri b/development/qmake/config.pri index bf4a3dcb01..3e813ea2d4 100644 --- a/development/qmake/config.pri +++ b/development/qmake/config.pri @@ -2,20 +2,39 @@ TEMPLATE = lib CONFIG += debug_and_release +#CONFIG += no_include_pwd #CONFIG += create_prl -CONFIG += precompile_header -DEFINE += QT_NO_KEYWORDS +DEFINES += QT_NO_KEYWORDS DESTDIR = ../lib +QT = + 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] -PRECOMPILED_HEADER = $${BUILD_BASE_SOURCE_DIR}/src/pch.h - # for INCLUDEPATH += $${BUILD_BASE_TARGET_DIR}/src + +#QMAKE_CXXFLAGS += -include $${BUILD_BASE_SOURCE_DIR}/src/pch.h +#QMAKE_CXXFLAGS += -include $${BUILD_BASE_TARGET_DIR}/src/pch.h.gch +#QMAKE_CXXFLAGS_USE_PRECOMPILE = -include ${QMAKE_PCH_OUTPUT_BASE}/ + +#QMAKE_CXXFLAGS_USE_PRECOMPILE = -include $${BUILD_BASE_TARGET_DIR}/src/pch.h.gch +#QMAKE_CXXFLAGS_USE_PRECOMPILE += -Winvalid-pch +#QMAKE_CXXFLAGS_USE_PRECOMPILE += -Wmissing-include-dirs + + + +#CONFIG += precompile_header + +#PRECOMPILED_HEADER = $${BUILD_BASE_SOURCE_DIR}/src/pch.h + +#QMAKE_CXXFLAGS = -include $${BUILD_BASE_SOURCE_DIR}/src/pch.h +#QMAKE_CXXFLAGS += -Winvalid-pch +#QMAKE_CXXFLAGS += -Wmissing-include-dirs + diff --git a/development/qmake/lyx.pro b/development/qmake/lyx.pro index 6a8c1129d4..3fb1689aa5 100644 --- a/development/qmake/lyx.pro +++ b/development/qmake/lyx.pro @@ -5,8 +5,8 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += src/src.pro SUBDIRS += boost/boost.pro +SUBDIRS += src/src.pro SUBDIRS += support/support.pro SUBDIRS += graphics/graphics.pro SUBDIRS += mathed/mathed.pro @@ -17,6 +17,6 @@ SUBDIRS += insets/insets.pro SUBDIRS += app/app.pro -SUBDIRS += tex2lyx/tex2lyx.pro +#SUBDIRS += tex2lyx/tex2lyx.pro -SUBDIRS += client/client.pro +#SUBDIRS += client/client.pro diff --git a/development/qmake/qt4/qt4.pro b/development/qmake/qt4/qt4.pro index 994fb5bc52..e0eb1eb845 100644 --- a/development/qmake/qt4/qt4.pro +++ b/development/qmake/qt4/qt4.pro @@ -3,7 +3,10 @@ include(../config.pri) TARGET = lyxqt4$${DEBUGSUFFIX} +QT = core gui + INC += boost +INC += . INC += src INC += src/frontends INC += src/frontends/controllers @@ -183,8 +186,6 @@ CPP += QWrap.cpp UI += PrefLanguageUi.ui UI += PrefKeyboardUi.ui -UI += PrefIdentityUi.ui -UI += ExternalUi.ui UI += PrefsUi.ui UI += MarginsUi.ui UI += BibitemUi.ui @@ -255,13 +256,17 @@ UI += SendtoUi.ui BASE = $${BUILD_BASE_SOURCE_DIR}/src/frontends/qt4 +# This is only there because we name our stuff *_moc instead of moc_* for(FILE,HPP) { XHPP += $${BASE}/$${FILE} } moc1.output = ${QMAKE_FILE_BASE}_moc.cpp moc1.commands = moc ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_OUT} -moc1.depend_command = g++ -E -M ${QMAKE_FILE_NAME} | sed "s,^.*: ,," +#moc1.depend_command = g++ -E -M ${QMAKE_FILE_NAME} | sed "s,^.*: ,," +moc1.dependency_type = TYPE_C moc1.input = XHPP +moc1.CONFIG += no_link QMAKE_EXTRA_COMPILERS += moc1 + for(FILE,CPP) { SOURCES += $${BASE}/$${FILE} } #for(FILE,HPP) { HEADERS += $${BASE}/$${FILE} } for(FILE,UI) { FORMS += $${BASE}/ui/$${FILE} } diff --git a/development/qmake/src/src.pro b/development/qmake/src/src.pro index d95b7aca4f..1cb3c099c0 100644 --- a/development/qmake/src/src.pro +++ b/development/qmake/src/src.pro @@ -196,7 +196,6 @@ CPP += Text3.cpp CPP += TextClass.cpp CPP += TextClassList.cpp CPP += TextMetrics.cpp -CPP += Thesaurus.cpp CPP += TocBackend.cpp CPP += ToolbarBackend.cpp CPP += Trans.cpp @@ -223,34 +222,37 @@ CPP += sgml.cpp CPP += toc.cpp CPP += version.cpp -for(FILE,CPP) { SOURCES += $${BUILD_BASE_SOURCE_DIR}/src/$${FILE} } -for(FILE,HPP) { HEADERS += $${BUILD_BASE_SOURCE_DIR}/src/$${FILE} } -for(PATH,INC) { INCLUDEPATH += $${BUILD_BASE_SOURCE_DIR}/$${PATH} } +CPP += Thesaurus.cpp +BASE = $${BUILD_BASE_SOURCE_DIR}/src/frontends/qt4 -QMAKE_RUN_CXX1 = $(CXX) -c $(CXXFLAGS) $(INCPATH) -configtarget.target = $${BUILD_BASE_TARGET_DIR}/src/config.h -configtarget.commands = \ - cp $${BUILD_BASE_SOURCE_DIR}/development/qmake/config.h.template config.h +QMAKE_RUN_CXX1 = $(CXX) -c $(CXXFLAGS) $(INCPATH) -packagetarget.target = Package.cpp +packagetarget.target = $${BUILD_BASE_TARGET_DIR}/src/Package.cpp packagetarget.commands = \ - cp $${BUILD_BASE_SOURCE_DIR}/src/support/Package.cpp.in Package.cpp + @rm -f tmp_package ;\ + sed \'s,@LYX_DIR@,$(LYX_ABS_INSTALLED_DATADIR),;\ +s,@LOCALEDIR@,$(LYX_ABS_INSTALLED_LOCALEDIR),;\ +s,@TOP_SRCDIR@,$(LYX_ABS_TOP_SRCDIR),;\ +s,@PROGRAM_SUFFIX@,$(program_suffix),\' \ + $${BUILD_BASE_SOURCE_DIR}/src/support/Package.cpp.in > tmp_package ;\ + if cmp -s tmp_package Package.cpp ; then \ + rm -f tmp_package ;\ + else \ + rm -f Package.cpp ;\ + cp tmp_package Package.cpp ;\ + fi packagetarget.depends = config.h +packagetarget.CONFIG = no_link +#SOURCES += $${BUILD_BASE_TARGET_DIR}/src/Package.cpp +QMAKE_EXTRA_TARGETS += packagetarget -packagetarget2.target = Package.o -packagetarget2.commands = $${QMAKE_RUN_CXX1} -c Package.cpp -o Package.o -packagetarget2.depends = Package.cpp config.h +#OBJECTS += $(OBJECTS_DIR)/Package.o +POST_TARGETDEPS += $(OBJECTS_DIR)/Package.o +for(FILE,CPP) { SOURCES += $${BUILD_BASE_SOURCE_DIR}/src/$${FILE} } +for(FILE,HPP) { HEADERS += $${BUILD_BASE_SOURCE_DIR}/src/$${FILE} } +for(PATH,INC) { INCLUDEPATH += $${BUILD_BASE_SOURCE_DIR}/$${PATH} } -QMAKE_EXTRA_TARGETS += configtarget -QMAKE_EXTRA_TARGETS += packagetarget packagetarget2 - -QMAKE_CLEAN += Package.o Package.cpp config.h - -PRE_TARGETDEPS += $${BUILD_BASE_TARGET_DIR}/src/config.h -PRE_TARGETDEPS += Package.o - -LIBS += Package.o -- 2.39.2