mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
356,287 Commits 1 Branch 0 Tags
Commit Graph

163 Commits

Author SHA1 Message Date
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
Jan Holesovsky
5f08d6e5a4 Merge commit 'ooo/DEV300_m103' 
Conflicts:
	configure
	configure.in
	instsetoo_native/util/openoffice.lst
	set_soenv.in
	solenv/bin/cws.pl
	solenv/bin/modules/installer/simplepackage.pm
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/extensions/post_PackModule.mk
	solenv/gbuild/platform/linux.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/windows.mk
	solenv/inc/installationtest.mk
	solenv/inc/minor.mk
	soltools/cpp/_eval.c
 2011-03-23 16:58:44 +01:00
Francois Tigeot
faae793ae8 Treat DragonFly as Linux. 
The new build system has introduced some new operating system
conditionals. Use the same path as Linux on DragonFly for now.
 2011-03-21 23:27:06 +01:00
David Tardon
6cb2495999 do not build cppunit if not needed 
Suggested by Bjoern Michaelsen.
 2011-03-19 16:58:49 +01:00
Bjoern Michaelsen
35701ddafd killing off stl in gbuild 2011-03-17 13:42:24 +01:00
Tor Lillqvist
8dc2c3e75e No stlport used any more on Windows 2011-03-17 14:23:37 +02:00
Tor Lillqvist
6bc46f3446 Add msvcprt, too, wherever msvcrt is mentioned 2011-03-16 12:55:07 +02:00
Norbert Thiebaud
a2f3a5ef76 mis-merge: issue with stl. this may no be the right resolution 2011-03-12 18:49:52 -06:00
Norbert Thiebaud
03db38c4d1 mis-merge: no more vos3 2011-03-12 18:48:33 -06:00
Ivo Hinkelmann
6983ae5750 masterfix DEV300: #i10000# mingw fix 2011-03-07 13:11:41 +01:00
Philipp Lohmann [pl]
121d025d6a rebase to DEV300_m100 2011-02-14 18:20:23 +01:00
Michael Stahl
cbc756f34b xmlfix3: fix unoxml build: add windows stuff to RepositoryFixes, add gb_STDLIBS 2011-02-14 14:19:23 +01:00
Michael Stahl
766e4079d8 xmlfix3: merge to-be-m100 DEV300_next 2011-02-11 15:35:40 +01:00
Michael Stahl
1ef780d9f5 xmlfix3: convert unoxml to gbuild 2011-02-10 18:37:54 +01:00