diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-18 16:46:39 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-18 16:51:32 +0300 |
| commit | 394e81876e10e01069f0c0e3004d9ea58a435349 (patch) | |
| tree | 09ae947bf2f0b35fa238bd3f5a5634c6232163a1 /RepositoryFixes.mk | |
| parent | e17aac891e999265cbd34d81d963a57fe12c794a (diff) | |
Use the slightly different library names for MinGW, too
Diffstat (limited to 'RepositoryFixes.mk')
| -rw-r--r-- | RepositoryFixes.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 5155f5055f0e..8cdfc17f7725 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -30,7 +30,8 @@ # Make has no support for 'or' clauses in conditionals, # we use a filter expression instead. -ifneq (,$(filter LINUX MACOSX DRAGONFLY OPENBSD FREEBSD NETBSD IOS ANDROID, $(OS))) +ifneq (,$(filter LINUX-GCC MACOSX-GCC WNT-GCC DRAGONFLY-GCC OPENBSD-GCC FREEBSD-GCC NETBSD-GCC IOS-GCC ANDROID-GCC, $(OS)-$(COM))) +# Could we in fact just check for $(COM) == "GCC" here? gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) @@ -42,6 +43,11 @@ endif ifeq ($(OS),WNT) + +# USE_MINGW refers to the OOo idea of using MinGW natively on Windows, +# which we don't want to bother with in LibreOffice, I think. If you +# want to build natively on Windows, use MSVC. + ifneq ($(USE_MINGW),) gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:libcppunit.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) |