diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-03 10:24:18 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-02-03 10:24:18 +0100 |
| commit | 1851104998e0996874dbebccbfbd4778848f1f17 (patch) | |
| tree | 5d92a8e6727674e590ee147a2908bd74ec4e4bca /sfx2/Library_sfx.mk | |
| parent | ab451ff91e394a5f756558a9b27b39b55c43f075 (diff) | |
CWS gnumake3: clean up mingw stuff after adding STDLIBS
Diffstat (limited to 'sfx2/Library_sfx.mk')
| -rwxr-xr-x | sfx2/Library_sfx.mk | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 4cfd5da93bb6..4bb343e316d6 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -267,7 +267,9 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ Cocoa \ )) 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,\ @@ -277,24 +279,6 @@ $(eval $(call gb_Library_add_cxxobjects,sfx,\ , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS) -nologo -UPRECOMPILED_HEADERS \ )) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,sfx,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - advapi32 \ - gdi32 \ - kernel32 \ - msvcrt \ - ole32 \ - shell32 \ - user32 \ - uuid \ -)) -else $(eval $(call gb_Library_add_linked_libs,sfx,\ gdi32 \ advapi32 \ @@ -303,8 +287,9 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ user32 \ uuid \ )) -endif + else + $(eval $(call gb_Library_add_cxxobjects,sfx,\ sfx2/source/appl/shutdowniconw32 \ sfx2/source/doc/sfxacldetect \ |