diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2014-12-22 19:10:59 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-07 00:01:41 +0000 |
| commit | b9a847b78ceaa3b5840429dab1bc50d35c7ef3de (patch) | |
| tree | 1bcd505077a08a8f24362e35362a0fad54bc9684 /desktop | |
| parent | 7ce1e0e1ecbb1b3ec5e3cc15306a9df7e786c564 (diff) | |
Fixup --without-x build
Accept gl linkage in hope of future offscreen mesa support.
Avoid linking with GLX though.
Change-Id: I4e666f60e74fe34075a8da9eeba95807cf8fe38c
Signed-off-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/13452
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 8 | ||||
| -rw-r--r-- | desktop/inc/app.hxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/sofficemain.cxx | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 1f4eb1f015b9..f674d6b06631 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -91,6 +91,13 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/migration/migration \ )) +ifeq ($(ENABLE_HEADLESS),TRUE) +$(eval $(call gb_Library_add_libs,sofficeapp,\ + -lm \ + -ldl \ + -lpthread \ +)) +else ifeq ($(OS),LINUX) $(eval $(call gb_Library_use_static_libraries,sofficeapp,\ glxtest \ @@ -105,6 +112,7 @@ $(eval $(call gb_Library_add_libs,sofficeapp,\ -lX11 \ )) endif +endif # LibreOfficeKit bits ifneq ($(filter $(OS),ANDROID IOS),) diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 2ed33c8f258c..22c40f804180 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -193,7 +193,7 @@ OUString ReplaceStringHookProc(const OUString& rStr); } -#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID +#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS bool fire_glxtest_process(); #endif diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 0597a4f0d395..4f7dec977577 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -51,7 +51,7 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main() { -#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID +#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS) /* Run test for OpenGL support in own process to avoid crash with broken * OpenGL drivers. Start process as early as possible. */ |