diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:07:18 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:07:18 +0200 |
| commit | fc1e9f253dd07362065f2be9691be89fb9b3f84f (patch) | |
| tree | 89ff0b4e6733af107e34d1513df55479951b5221 /RepositoryFixes.mk | |
| parent | fix L10N_MODULE path on Windows (diff) | |
| parent | Spaces to tabs in solenv/gbuild. (diff) | |
| download | core-fc1e9f253dd07362065f2be9691be89fb9b3f84f.tar.gz core-fc1e9f253dd07362065f2be9691be89fb9b3f84f.zip | |
Merge branch 'DEV300_m106' into libreoffice-3-4
Conflicts:
Module_ooo.mk
Repository.mk
configure
configure.in
ooo.lst
scp2/source/ooo/file_library_ooo.scp
scp2/source/ooo/makefile.mk
scp2/source/ooo/module_hidden_ooo.scp
solenv/config/sdev300.ini
solenv/config/ssolar.cmn
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/ComponentTarget.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/Deliver.mk
solenv/gbuild/JavaClassSet.mk
solenv/gbuild/JunitTest.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/Module.mk
solenv/gbuild/Output.mk
solenv/gbuild/SdiTarget.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/windows.mk
solenv/gbuild/platform/winmingw.mk
solenv/inc/minor.mk
Diffstat (limited to 'RepositoryFixes.mk')
| -rwxr-xr-x[-rw-r--r--] | RepositoryFixes.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 15a0f878f8b4..f7aff979958b 100644..100755 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -111,9 +111,14 @@ gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES)) gb_Library_NOILIBFILENAMES:=\ advapi32 \ gdi32 \ + gdiplus \ + graphite_dll \ gnu_getopt \ icuuc \ + icule \ + imm32\ kernel32 \ + msimg32 \ msvcrt \ msvcprt \ mpr \ @@ -126,6 +131,7 @@ gb_Library_NOILIBFILENAMES:=\ user32 \ uuid \ uwinapi \ + winspool \ gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES)) gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT)) |