summaryrefslogtreecommitdiff
path: root/sfx2/Library_sfx.mk
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-07-15 11:49:45 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-07-16 07:28:31 +0200
commita5ae5d95f4e2ca1591126937cb650c871894dc64 (patch)
tree3418f3bb24b19716e8f9c16cfb4f301d5ea88886 /sfx2/Library_sfx.mk
parentb85a2af72e3ce0a4111972d51c8f1d43599dee5e (diff)
PRECOMPILED_HEADERS not defined
Change-Id: I9292f45585243ef0244b75df030421111e1ca0ae
Diffstat (limited to 'sfx2/Library_sfx.mk')
-rw-r--r--sfx2/Library_sfx.mk15
1 files changed, 2 insertions, 13 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index a7689dcdf314..96d79dfe7be4 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -210,6 +210,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/doc/printhelper \
sfx2/source/doc/querytemplate \
sfx2/source/doc/docundomanager \
+ sfx2/source/doc/sfxacldetect \
sfx2/source/doc/sfxbasemodel \
sfx2/source/doc/sfxmodelfactory \
sfx2/source/doc/syspath \
@@ -283,13 +284,9 @@ endif
ifeq ($(OS),WNT)
-# workaround: disable PCH for these objects to avoid redeclaration
-# errors - needs to be fixed in module tools
-$(eval $(call gb_Library_add_cxxobjects,sfx,\
+$(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/appl/shutdowniconw32 \
- sfx2/source/doc/sfxacldetect \
sfx2/source/doc/syspathw32 \
- , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS) -UPRECOMPILED_HEADERS \
))
$(eval $(call gb_Library_use_libraries,sfx,\
@@ -300,14 +297,6 @@ $(eval $(call gb_Library_use_libraries,sfx,\
uuid \
))
-else
-
-$(eval $(call gb_Library_add_cxxobjects,sfx,\
- sfx2/source/appl/shutdowniconw32 \
- sfx2/source/doc/sfxacldetect \
- , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS) \
-))
-
endif
# vim: set noet sw=4 ts=4: