diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-07-29 13:19:07 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-07-29 13:19:07 +0200 |
| commit | 157106b79770cdc0989207acc9600bb3ec3ababd (patch) | |
| tree | 3d4cc289ed97bde6599da3843bc42a5845e13a71 | |
| parent | e401e6846b174c3f5deda3b3e19d89de2e4ac78a (diff) | |
gnumake2: windows build fixes for resync
| -rw-r--r-- | framework/Library_fwe.mk | 1 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 2 | ||||
| -rw-r--r-- | sfx2/Library_sfx2.mk | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 718e9c38ea22..a8bcd7d40bf4 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -90,7 +90,6 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/xml/statusbardocumenthandler \ framework/source/fwe/xml/toolboxconfiguration \ framework/source/fwe/xml/toolboxdocumenthandler \ - framework/source/fwe/xml/toolboxlayoutdocumenthandler \ framework/source/fwe/xml/xmlnamespaces \ )) diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index a7b1f18e9c15..f68d2d9e5517 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -52,7 +52,7 @@ #endif #include <framework/addonsoptions.hxx> #include <uielement/toolbarmerger.hxx> -#include <helper/acceleratorinfo.hxx> +#include <framework/acceleratorinfo.hxx> //_________________________________________________________________________________________________________________ // interface includes diff --git a/sfx2/Library_sfx2.mk b/sfx2/Library_sfx2.mk index 238360da3dd4..40a2064c59f9 100644 --- a/sfx2/Library_sfx2.mk +++ b/sfx2/Library_sfx2.mk @@ -277,6 +277,9 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ )) endif ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_exception_objects,sfx,\ + sfx2/source/doc/syspathw32 \ +)) $(eval $(call gb_Library_add_linked_libs,sfx,\ advapi32 \ gdi32 \ |