diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-05-05 14:51:35 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-05-05 14:51:35 +0200 |
| commit | cb4f0e685032b29b5db2d4beb5051b66d846273b (patch) | |
| tree | c97485f464c62c97eeb1d957a57c42bbb6b9e099 /sw/prj | |
| parent | 5dfd561343763aad6f204b164ed2547b4ae86424 (diff) | |
CWS gnumake2: fixes for win
Diffstat (limited to 'sw/prj')
| -rw-r--r-- | sw/prj/target_lib_sw.mk | 8 | ||||
| -rw-r--r-- | sw/prj/target_lib_vbaswobj.mk | 11 |
2 files changed, 15 insertions, 4 deletions
diff --git a/sw/prj/target_lib_sw.mk b/sw/prj/target_lib_sw.mk index 95509f0014d3..a3fcc4a5fd80 100644 --- a/sw/prj/target_lib_sw.mk +++ b/sw/prj/target_lib_sw.mk @@ -30,14 +30,14 @@ $(eval $(call gb_Library_Library,sw)) $(eval $(call gb_Library_add_sdi_headers,sw,sw/sdi/swslots)) $(eval $(call gb_Library_set_include,sw,\ - $$(SOLARINC) \ - -I$(WORKDIR)/inc/sw/sdi \ - -I$(WORKDIR)/inc/sw/ \ - -I$(SRCDIR)/sw/inc \ -I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/source/filter/inc \ -I$(SRCDIR)/sw/source/ui/inc \ -I$(SRCDIR)/sw/inc/pch \ + -I$(SRCDIR)/sw/inc \ + -I$(WORKDIR)/inc/sw/sdi \ + -I$(WORKDIR)/inc/sw/ \ + $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) diff --git a/sw/prj/target_lib_vbaswobj.mk b/sw/prj/target_lib_vbaswobj.mk index dc47290491c9..ee8cf2440f40 100644 --- a/sw/prj/target_lib_vbaswobj.mk +++ b/sw/prj/target_lib_vbaswobj.mk @@ -122,3 +122,14 @@ $(eval $(call gb_Library_set_ldflags,vbaswobj,\ )) endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,vbaswobj,\ + advapi32 \ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: |