Commit graph

95 commits

Author SHA1 Message Date
Norbert Thiebaud
ddc28b8ad6 clean-up ghost traces of unicow 2011-09-30 08:11:31 -05:00
Thorsten Behrens
f0149fe6ea Android now builds up to instsetoo_native
Last fixes - remove kludge from RepositoryFixes.mk, have redland
build w/o threads for the while, and some hackery to exclude
pointless code like oosplash from android build.
2011-09-28 16:47:49 +02:00
Jan Holesovsky
f62a449a53 Kill the explicit linking to salmain.o, use vclmain instead. 2011-09-20 00:51:38 +02:00
Caolán McNamara
375fc2d5ec windows berkleydb libname fixup 2011-09-19 09:59:26 +01:00
Michael Stahl
538fd2b166 Repository.mk: fix conflicing filterconfig changes 2011-09-15 15:19:26 +02:00
David Tardon
6df9c479f5 gbuildize desktop 2011-09-15 14:49:34 +02:00
David Tardon
8081794d91 use correct static lib. name for windows 2011-09-15 10:14:09 +02:00
David Tardon
45589f1f27 gbuildize automation 2011-09-15 07:10:22 +02:00
Matúš Kukan
436179148b Clean, sort and change RepositoryFixes a little. 2011-08-26 16:45:43 +02:00
Matúš Kukan
d0c301bba0 convert package to gbuild 2011-08-26 14:33:51 +02:00
Caolán McNamara
79a2a32ede fix windows xmlsecurity link 2011-08-23 10:35:45 +01:00
Matúš Kukan
0c2876b7f4 no reason for changing name of cui library on windows 2011-08-20 16:54:45 +02:00
Jan Holesovsky
534b3bccfd Fix i18npool build on Windows. 2011-08-19 09:37:47 +02:00
Tor Lillqvist
c77e44481a Sort a block of lines that was almost sorted already 2011-08-18 17:36:58 +03:00
Caolán McNamara
22ba66e403 fix typo 2011-08-16 14:32:34 +01:00
Caolán McNamara
cebaf5903e this seems to be the normal pattern 2011-08-16 13:32:51 +01:00
Caolán McNamara
37d34ff4ba get these names right for windows (I think) 2011-08-16 13:10:29 +01:00
Matúš Kukan
8b0e9caca9 convert xmlsecurity to gbuild 2011-08-09 23:28:06 +02:00
Takeshi Abe
b2bd33ea25 prefer makefile-gmake-mode to plain makefile-mode 2011-08-10 02:12:48 +09:00
Caolán McNamara
79adf1784e get sccomp to link under windows 2011-08-05 08:59:58 +01:00
Tor Lillqvist
3549107333 Add Emacs mode lines 2011-08-02 21:22:35 +03:00
Tor Lillqvist
1a316d26d6 Remove superfluous empty line
The comment for gb_Library_ILIBFILENAMES in the WNTGCC case doesn't
make much sense for us, though, as I think we want to support WNTGCC
only for cross-compilation, and thus we don't have access to the PSDK
("Platform" SDK, with which they mean the Windows SDK). I don't see
any point in using MinGW natively on Windows to build LibreOffice. If
you build locally, use MSVC.
2011-07-26 08:50:56 +03:00
Bjoern Michaelsen
5012e466ce resyncing to master 2011-07-21 18:27:57 +02:00
Tor Lillqvist
f455474e7a Bin OLDNAMESLIB which duplicates the existing gb_Library_win32_OLDNAMES 2011-07-15 16:09:19 +03:00
Tor Lillqvist
4eb9a47a4b The graphite2 library gets built statically with WNTGCC at least 2011-07-15 01:56:36 +03:00
Tor Lillqvist
61d56ec09e Factor out the oldnames/moldname difference between WNTMSC and WNTGCC 2011-07-14 15:55:32 +03:00
Tor Lillqvist
65b7804dc1 Add more libs that semi-unintentionally get built statically for Android 2011-07-05 10:10:18 +03:00
Tor Lillqvist
bf1b84d0fc Some libraries get built as static archives for Android
We haven't bothered fixing their configury to recognize that shared
libraries can be built for the platform. So for them use the .a names
in gb_Library_FILENAMES for Android.
2011-07-04 21:16:30 +03:00
Caolán McNamara
3039db3b6b get cairo import lib name right for windows 2011-07-04 12:42:28 +01:00
Caolán McNamara
4e674ab45b make cairo an unconditional requirement for text rendering 2011-06-30 11:32:27 +01:00
Tor Lillqvist
1780e957d6 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 .
2011-06-21 00:40:19 +03:00
Bjoern Michaelsen
902f9da3e5 gnumake4: fix buildbreakers from merge 2011-06-20 13:24:08 +02:00
Bjoern Michaelsen
81a1c065fd Merge branch 'master' into feature/gnumake4
Conflicts:
	Repository.mk
	RepositoryFixes.mk
	configure
	configure.in
	set_soenv.in
	solenv/config/sdev300.ini
	solenv/gbuild/ComponentTarget.mk
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/CustomTarget.mk
	solenv/gbuild/Deliver.mk
	solenv/gbuild/Executable.mk
	solenv/gbuild/JavaClassSet.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/StaticLibrary.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/gbuild/templates/Executable.mk
	solenv/gbuild/templates/Library.mk
	solenv/inc/libs.mk
	solenv/inc/unxobsd.mk
2011-06-19 11:36:52 +02:00
Tor Lillqvist
394e81876e Use the slightly different library names for MinGW, too 2011-06-18 16:51:32 +03:00
Tor Lillqvist
19aef0d443 Avoid duplication 2011-06-18 16:51:31 +03:00
Bjoern Michaelsen
6f0d3f2a5b fixing rebase errors 2011-06-18 14:12:16 +02:00
Daniel Rentz [dr]
493b594915 [mq]: oox_gmake.patch [hg:d0beb4a8aa40] 2011-06-17 16:14:09 +02:00
Michael Stahl
d78b18f1c5 gnumake4: merge parts of ooo34fixes [hg:ca410a15b7e1] 2011-06-17 14:01:14 +02:00
Michael Stahl
44f359776c gnumake4: merge ooo34gsl01 [hg:6470e79f0039] 2011-06-17 13:48:56 +02:00
Philipp Lohmann [pl]
407dbac9fb ooo34gsl01: #i117680# add graphite_dll fix for MINGW, too [hg:6461ee21fbbb] 2011-06-17 13:30:45 +02:00
Philipp Lohmann [pl]
2eccffac60 ooo34gsl01: #i117680# fixup graphite_dll as static library [hg:859f1dffdb89] 2011-06-17 13:26:42 +02:00
Michael Stahl
ed2ee34743 gnumake4: merge DEV300_m106 [hg:5102137bfe1e] 2011-06-17 11:11:47 +02:00
Michael Stahl
c74af0d73c gnumake4: #i117610#: add RepositoryExternal.mk, and use it. [hg:62e2f8dc95a7] 2011-06-17 09:55:38 +02:00
Mathias Bauer
90485912fc CWS gnumake4: some fixes for mingw and windows libs [hg:ebe3fa7a4ce7] 2011-06-17 01:38:14 +02:00
Mathias Bauer
0b443af107 CWS gnumake4: some fixes for Windows [hg:9eb9b5d5181e] 2011-06-17 01:02:37 +02:00
Mathias Bauer
7fce16f0ff CWS gnumake4: convert sax to new build system [hg:389d236eb6b2] 2011-06-17 01:01:09 +02:00
Mathias Bauer
e83bed8101 CWS gnumake4: fixes for building with ENABLE_CAIRO on windows [hg:824c8caeaf61] 2011-06-17 00:51:06 +02:00
Mathias Bauer
89b2fa8073 CWS gnumake4: convert canvas to new build system 2011-06-16 12:40:20 +02:00
Tor Lillqvist
9f0af81b02 Add IOS to those OSes for which we use the "creative" library names 2011-06-13 21:08:17 +03:00
Tor Lillqvist
d7c928503e Add Android 2011-06-11 23:55:06 +03:00