Commit graph

94 commits

Author SHA1 Message Date
Caolán McNamara
6eb8a76040 add mtfrenderer (following cppcanvas pattern) 2011-07-27 09:52:09 +01:00
David Tardon
1a852392ba add icui18n to external libs 2011-07-26 09:59:33 +02:00
David Tardon
785e1d9205 cppunit can be system 2011-07-25 10:34:22 +02:00
Bjoern Michaelsen
e59fbb0cb9 adaptions to dbaccess revert-to-master-gbuilidization 2011-07-23 10:17:18 +02:00
Bjoern Michaelsen
c29e370d22 readd rtftok because we postpone gnumake4 for writerfilter
* gnumake4's writerfilter gbuildization got pushed in a seperate branch
* it might or might not be merged to master later
2011-07-23 02:39:24 +02:00
Bjoern Michaelsen
66dee9cd69 postmerge fixes for gnumake4 2011-07-22 21:02:42 +02:00
Bjoern Michaelsen
5012e466ce resyncing to master 2011-07-21 18:27:57 +02:00
Miklos Vajna
d1ed8366af Merge remote-tracking branch 'feature/gsoc2011_rtfimport' 2011-07-02 00:21:16 +02:00
Caolán McNamara
4e674ab45b make cairo an unconditional requirement for text rendering 2011-06-30 11:32:27 +01:00
Miklos Vajna
fdb6813861 Merge remote-tracking branch 'origin/master' 2011-06-25 01:51:04 +02:00
Bjoern Michaelsen
ac064a1230 gnumake4: postmerge fixes 2011-06-21 12:41:58 +02: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
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
a5b9de1949 writerfilter10: convert writerfilter to gbuild [hg:1013d9bf5d0a] 2011-06-17 15:18:28 +02:00
Ocke Janssen [oj]
45d2a90c76 gnumake4: added dbaccess and reportdesign [hg:a75d5667430f] 2011-06-17 14:40:38 +02:00
Michael Stahl
e1999381b3 gnumake4: #i117610#: move icule to RepositoryExternal.mk [hg:e86f5a26e982] 2011-06-17 14:13:00 +02:00
Michael Stahl
87e4433cdc gnumake4: #i117610#: move graphite to RepositoryExternal.mk [hg:ca1349af0566] 2011-06-17 14:10:46 +02:00
Michael Stahl
44f359776c gnumake4: merge ooo34gsl01 [hg:6470e79f0039] 2011-06-17 13:48:56 +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
Michael Stahl
2997d8a899 gnumake4: expat libraries are static [hg:3daa2bed1277] 2011-06-17 01:28:57 +02:00
Mathias Bauer
38c1ab867b CWS gnumake4: convert xmlreader to new build system [hg:751b4a1bff7b] 2011-06-17 01:07:41 +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
505cbe329f CWS gnumake4: reimplement basegfx_s hack for new build system [hg:c943ed591aff] 2011-06-17 00:49:38 +02:00
Mathias Bauer
93b6f9cf29 CWS gnumake4: convert regexp to new build system [hg:56e4316f8d74] 2011-06-16 13:40:39 +02:00
Mathias Bauer
2a6fc707c1 CWS gnumake4: convert basebmp to new build system [hg:a0f3dc4a5f5a] 2011-06-16 13:02:37 +02:00
Mathias Bauer
71e008c9bd CWS gnumake4: convert cppcanvas to new build system [hg:a93ffc180db8] 2011-06-16 12:53:14 +02:00
Mathias Bauer
89b2fa8073 CWS gnumake4: convert canvas to new build system 2011-06-16 12:40:20 +02:00
Mathias Bauer
e2174c65d2 CWS gnumake4: convert starmath to new build system 2011-06-16 10:58:42 +02:00
Michael Meeks
5ad60c5d69 more configure, and scp2 pieces for gtk3 integration 2011-06-14 16:30:20 +01:00
Caolán McNamara
ac41a4d5f2 gbuildize hwpfilter 2011-06-14 09:53:54 +01: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
Miklos Vajna
f30f032d41 Add rtftok library to Repository.mk 2011-05-24 13:28:40 +02:00
Jan Holesovsky
7667fa2e3c Updates to make vcl building. 2011-04-29 19:14:29 +02:00
Tor Lillqvist
b923fa2536 Fix crypto stuff when building on Windows 2011-04-29 15:35:17 +03: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
David Tardon
ab77c99818 gbuildize reportdesign 2011-04-21 20:50:28 +02:00
David Tardon
ad773c4cc3 gbuildize slideshow 2011-04-21 20:50:28 +02:00
David Tardon
98d8b2b999 gbuildize sd 2011-04-21 20:50:27 +02:00
David Tardon
11430c7074 gbuildize dbaccess 2011-04-19 07:05:11 +02:00
Bjoern Michaelsen
2f44506669 introduce toolshelpers static lib to avoid duplicate linking errors 2011-04-16 15:51:41 +02:00
Bjoern Michaelsen
7c5fe761d3 remove ssprety 2011-04-16 15:37:04 +02:00
David Tardon
c2c0f1d51e register dynamic libs for openssl as well 2011-04-15 19:14:08 +02:00
David Tardon
3feaa80ebe declare internal static openssl libs 2011-04-15 16:16:37 +02:00
David Tardon
1b7717c242 gbuildize chart2 2011-04-15 10:42:17 +02:00