diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-25 16:51:24 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-16 12:40:20 +0200 |
| commit | 89b2fa80738bfdc148661fa0f2621265d86b6a01 (patch) | |
| tree | fe7217ec1ed8584bce77b02fafd4850e075505a6 /RepositoryFixes.mk | |
| parent | c13010c2612afdaad58fbbf89286dcf0f02f75e5 (diff) | |
CWS gnumake4: convert canvas to new build system
Diffstat (limited to 'RepositoryFixes.mk')
| -rwxr-xr-x | RepositoryFixes.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index f5776f7949d4..53399565c5e5 100755 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -94,6 +94,7 @@ gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib gb_Library_ILIBFILENAMES:=\ unicows \ uuid \ + winmm \ gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT)) @@ -132,6 +133,9 @@ gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Lib endif gb_Library_NOILIBFILENAMES:=\ advapi32 \ + d3d9 \ + d3dx \ + ddraw \ gdi32 \ gdiplus \ graphite_dll \ @@ -152,6 +156,7 @@ gb_Library_NOILIBFILENAMES:=\ user32 \ uuid \ uwinapi \ + winmm \ winspool \ gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES)) @@ -201,4 +206,9 @@ ifeq ($(SYSTEM_ICU),YES) gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS)) endif +ifeq ($(SYSTEM_CAIRO),YES) +gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS)) +gb_Library_TARGETS := $(filter-out pixman-1,$(gb_Library_TARGETS)) +endif + # vim: set noet sw=4 ts=4: |