diff options
| -rwxr-xr-x[-rw-r--r--] | sfx2/Library_qstart.mk | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | sfx2/Module_sfx2.mk | 14 | ||||
| -rwxr-xr-x[-rw-r--r--] | sfx2/source/appl/appbaslib.cxx | 3 | ||||
| -rwxr-xr-x | sfx2/source/doc/sfxacldetect.cxx | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | sfx2/source/doc/syspathw32.cxx | 4 |
5 files changed, 19 insertions, 11 deletions
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 94c5d83b594d..e6a6bc900201 100644..100755 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -25,8 +25,6 @@ # #************************************************************************* -ifeq ($(OS),LINUX) -ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) $(eval $(call gb_Library_Library,qstart_gtk)) @@ -91,5 +89,4 @@ $(eval $(call gb_Library_add_exception_objects,qstart_gtk,\ sfx2/source/appl/shutdowniconunx \ )) -endif -endif +# vim: set noet sw=4 ts=4: diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index 6ff0e06474f5..b0c026c3732d 100644..100755 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -30,17 +30,17 @@ $(eval $(call gb_Module_Module,sfx2)) $(eval $(call gb_Module_add_targets,sfx2,\ AllLangResTarget_sfx2 \ Library_sfx2 \ - Library_qstart \ Package_inc \ Package_sdi \ )) - -# HACK to create a dummy quickstart lib -#$(call gb_Module_get_target,sfx2) : $(call gb_Library_get_target,qstart_gtk) - -#$(call gb_Library_get_target,qstart_gtk) : -# touch $@ +ifeq ($(OS),LINUX) +ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) +$(eval $(call gb_Module_add_targets,sfx2,\ + Library_qstart \ +)) +endif +endif #todo: map file? #todo: source/appl ohne Optimierung? diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx index 96c998b2674d..7f4e8cedb637 100644..100755 --- a/sfx2/source/appl/appbaslib.cxx +++ b/sfx2/source/appl/appbaslib.cxx @@ -25,6 +25,9 @@ * ************************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_sfx2.hxx" + #include "appbaslib.hxx" #include <sfx2/sfxuno.hxx> diff --git a/sfx2/source/doc/sfxacldetect.cxx b/sfx2/source/doc/sfxacldetect.cxx index de6528794e20..ded9d3000fc8 100755 --- a/sfx2/source/doc/sfxacldetect.cxx +++ b/sfx2/source/doc/sfxacldetect.cxx @@ -25,6 +25,10 @@ * ************************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_sfx2.hxx" + + #ifdef WNT // necessary to include system headers without warnings diff --git a/sfx2/source/doc/syspathw32.cxx b/sfx2/source/doc/syspathw32.cxx index 73bd84f5249a..1bba3f3e9cf3 100644..100755 --- a/sfx2/source/doc/syspathw32.cxx +++ b/sfx2/source/doc/syspathw32.cxx @@ -28,6 +28,10 @@ * ************************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_sfx2.hxx" + + #ifdef WNT #ifdef _MSC_VER #pragma warning(disable:4917) |