diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-11-03 21:06:33 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-11-03 21:07:04 +0100 |
| commit | 9d65c893cd68bdf0d4ac2f78a6ad2c5ff820d342 (patch) | |
| tree | 0bbe50243c1d92f9ff1bdc1d13527b142d8dbffd | |
| parent | a1c23a44b90caf3d0360070c78b0cd05775b99b7 (diff) | |
Introduce LibreOfficeMinGW distro-config.
| -rw-r--r-- | README.cross | 51 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeMinGW.conf | 30 |
2 files changed, 41 insertions, 40 deletions
diff --git a/README.cross b/README.cross index 6aec90bbc549..816d7ab2bd7f 100644 --- a/README.cross +++ b/README.cross @@ -122,7 +122,17 @@ for MinGW inside the OOo-originated code in LibreOffice actually are. What I have noticed of it seems a bit randomish, with copy-pasting having been preferred to factoring out differences. -The autogen.lastrun I use for my MinGW cross-compilation experimentation is: +Most of the configuration settings are maintained in the LibreOfficeMinGW +distro-config, so in your autogen.lastrun, you can use: + +CC=ccache i686-w64-mingw32-gcc +CXX=ccache i686-w64-mingw32-g++ +CC_FOR_BUILD=ccache gcc +CXX_FOR_BUILD=ccache g++ +--with-distro=LibreOfficeMinGW + +Alternatively, you can use something like the following; but the preferred way +is to keep LibreOfficeMinGW distro up-to-date. CC=ccache i686-w64-mingw32-gcc CXX=ccache i686-w64-mingw32-g++ @@ -177,45 +187,6 @@ CXX_FOR_BUILD=ccache g++ --without-helppack-integration --without-myspell-dicts -For reference, Kendy's autogen.lastrun is: - -CC=ccache i686-w64-mingw32-gcc -CXX=ccache i686-w64-mingw32-g++ -CC_FOR_BUILD=ccache gcc -CXX_FOR_BUILD=ccache g++ ---build=x86_64-unknown-linux-gnu ---host=i686-w64-mingw32 ---with-num-cpus=4 ---with-max-jobs=8 ---without-junit ---disable-binfilter ---disable-build-mozilla ---disable-mozilla ---disable-nss-module ---with-system-altlinuxhyph ---with-system-boost ---with-system-cairo ---with-system-cppunit ---with-system-curl ---with-system-db ---with-system-expat ---with-system-gettext ---with-system-graphite ---with-system-hunspell ---with-system-icu ---with-system-libpng ---with-system-libxml ---with-system-libxslt ---with-system-lpsolve ---with-system-mythes ---with-system-neon ---with-system-openssl ---with-system-redland ---without-myspell-dicts ---disable-directx ---disable-activex ---disable-extension-integration - Once you have compiled it, you may want to try to run it: $ cd /tmp diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf new file mode 100644 index 000000000000..aad9039d85d9 --- /dev/null +++ b/distro-configs/LibreOfficeMinGW.conf @@ -0,0 +1,30 @@ +--build=x86_64-unknown-linux-gnu +--host=i686-w64-mingw32 +--with-system-altlinuxhyph +--with-system-boost +--with-system-cairo +--with-system-cppunit +--with-system-curl +--with-system-db +--with-system-expat +--with-system-gettext +--with-system-graphite +--with-system-hunspell +--with-system-icu +--with-system-libpng +--with-system-libxml +--with-system-libxslt +--with-system-lpsolve +--with-system-mythes +--with-system-neon +--with-system-openssl +--with-system-redland +--without-junit +--without-myspell-dicts +--disable-activex +--disable-binfilter +--disable-build-mozilla +--disable-directx +--disable-extension-integration +--disable-mozilla +--disable-xmlsec |