diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-20 23:52:40 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-21 00:40:19 +0300 |
commit | 1780e957d64f8dc2cc80adec86ae96a6131e4626 (patch) | |
tree | 487b8143e1d08715a14a7205e243fe36de08dc28 /RepositoryFixes.mk | |
parent | Just use the same JVMFWKLIB for MinGW as on Unix (diff) | |
download | core-1780e957d64f8dc2cc80adec86ae96a6131e4626.tar.gz core-1780e957d64f8dc2cc80adec86ae96a6131e4626.zip |
gbuild changes for MinGW cross-compilation
Intermediate commit. But now at least comphelper will build
successfully. In the build order, comphelper is the first gbuildified
module where C++ code is compiled and linked .
Diffstat (limited to 'RepositoryFixes.mk')
-rw-r--r-- | RepositoryFixes.mk | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 8cdfc17f7725..0aa4467c7e56 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -44,15 +44,7 @@ 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)) -gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES)) +ifeq ($(COM),GCC) gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES)) @@ -62,23 +54,20 @@ gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT) gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES)) -gb_Library_NOILIBFILENAMES:=\ - icuuc \ - sot \ - uwinapi \ -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)) +# Libraries not provided by mingw(-w64), available only in the Windows +# SDK. So if these actually are liked with somewhere, we can't +# cross-compile that module then using MinGW. That needs to be fixed +# then, and we need to use these libraries through run-time lookup of +# APIs. Or something. -gb_Library_ILIBFILENAMES:=\ +gb_Library_SDKLIBFILENAMES:=\ unicows \ - uuid \ -gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES)) -gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT)) +gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES)) +gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib).lib) gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES)) -gb_Library_DLLFILENAMES := $(patsubst cppunit:cppunit%,cppunit:cygcppunit-1-12-1%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst crypto:crypto%,crypto:libeay32%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst ssl:ssl%,ssl:ssleay32%,$(gb_Library_DLLFILENAMES)) |