Commit graph

76 commits

Author SHA1 Message Date
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
Tor Lillqvist
3beeaf0725 Add the Win32 "version" library 2011-05-30 18:01:40 +03:00
Tor Lillqvist
240c1266d8 chmod -x 2011-05-30 17:54:38 +03:00
Tor Lillqvist
32805760a2 The graphite2 library is called graphite2_off 2011-05-30 17:54:35 +03:00
Jan Holesovsky
ca907e0220 Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
	Makefile.in
	Repository.mk
	autogen.sh
	bin/lo-commit-stat
	configure.in
	distro-configs/LibreOfficeOpenBSD.conf
	distro-configs/LibreOfficeWin32.conf
	instsetoo_native/util/openoffice.lst
	ooo.lst.in
	scp2/source/ooo/module_langpack.ulf
	set_soenv.in
	solenv/bin/ooinstall
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/unxgcc.mk
	solenv/gbuild/platform/windows.mk
	solenv/inc/minor.mk
	solenv/inc/settings.mk
	tail_build/prj/makefile.mk
2011-05-27 20:39:04 +02:00
Tor Lillqvist
699d119f78 Use current terminology and socket library
It's called the Windows SDK, not the Platform SDK. Link only with the
ws2_32 library, not the wsock32 one.
2011-05-16 16:01:30 +03:00
Norbert Thiebaud
364dbc666a harmonize OGLTrans.uno library name on MacOs with the rest of the world 2011-04-23 15:25:20 -05:00
Norbert Thiebaud
d27e7801fa tweak the delivered MacOS's name of OGLTrans to make instsetoo_native happy 2011-04-23 10:50:20 -05:00
Jan Holesovsky
fc1e9f253d 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
2011-04-22 15:07:18 +02:00
Caolán McNamara
c0c30966c5 seem to need shlwapi here too 2011-04-18 20:01:07 +01:00
David Tardon
b3387395a2 transform ssl lib names on WNT correctly (I hope .-) 2011-04-18 12:41:15 +02:00
David Tardon
373b55a7d9 move to better location 2011-04-18 12:41:14 +02:00
David Tardon
c2c0f1d51e register dynamic libs for openssl as well 2011-04-15 19:14:08 +02:00
David Tardon
9633fb712b mangle openssl lib names on WNT with GCC
I hope I got it right...
2011-04-15 16:16:38 +02:00
David Tardon
62b2fea57e gbuildize writerfilter 2011-04-14 16:16:08 +02:00
Bjoern Michaelsen
3f7ed4ed3f remove duplicate and pointless lib renames 2011-04-06 19:30:38 +02:00
David Tardon
c8d6be537b filter out the rest of ICU libs for SYSTEM_ICU 2011-04-05 14:06:43 +02:00
Robert Nagy
9294d02f03 filter some library names on *BSD too just like on LINUX 2011-04-03 22:15:57 +02:00
Robert Nagy
bc2bee8fdc filter some library names on *BSD too just like on LINUX 2011-04-03 22:10:37 +02:00
Philipp Lohmann [pl]
961edfc01d vcl2gnumake: rebase to DEV300m103 2011-03-23 18:06:39 +01:00