diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-12-10 18:21:08 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-12-10 18:21:08 +0100 |
| commit | 9e1e9a66aeddf0874f9fc3e4bdcdff374bd23586 (patch) | |
| tree | a1ab3dabd8da39522c96d45ccb96137e2f2c146b /sfx2/Library_sfx.mk | |
| parent | 44aec49b2cdaffa72e7ece2b71c25a95ff935601 (diff) | |
gnumake2: temporary disable PCH for some objects
Diffstat (limited to 'sfx2/Library_sfx.mk')
| -rwxr-xr-x[-rw-r--r--] | sfx2/Library_sfx.mk | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index fb88cd015029..6a8a23095377 100644..100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -119,7 +119,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/appl/sfxhelp \ sfx2/source/appl/sfxpicklist \ sfx2/source/appl/shutdownicon \ - sfx2/source/appl/shutdowniconw32 \ sfx2/source/appl/workwin \ sfx2/source/appl/xpackcreator \ sfx2/source/bastyp/bitset \ @@ -216,7 +215,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/doc/plugin \ sfx2/source/doc/printhelper \ sfx2/source/doc/querytemplate \ - sfx2/source/doc/sfxacldetect \ sfx2/source/doc/sfxbasemodel \ sfx2/source/doc/sfxmodelfactory \ sfx2/source/doc/syspath \ @@ -278,9 +276,16 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ )) endif ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_exception_objects,sfx,\ + +# workaround: disable PCH for these objects to avoid redeclaration +# errors - needs to be fixed in module tools +$(eval $(call gb_Library_add_cxxobjects,sfx,\ + sfx2/source/appl/shutdowniconw32 \ + sfx2/source/doc/sfxacldetect \ sfx2/source/doc/syspathw32 \ + , $(gb_LinkTarget_EXCEPTIONFLAGS) -nologo -UPRECOMPILED_HEADERS \ )) + $(eval $(call gb_Library_add_linked_libs,sfx,\ advapi32 \ gdi32 \ @@ -293,6 +298,13 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ uuid \ uwinapi \ )) +else +$(eval $(call gb_Library_add_cxxobjects,sfx,\ + sfx2/source/appl/shutdowniconw32 \ + sfx2/source/doc/sfxacldetect \ + , $(gb_LinkTarget_EXCEPTIONFLAGS) \ +)) + endif # vim: set noet sw=4 ts=4: |