Commit graph

94 commits

Author SHA1 Message Date
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
Takashi Ono
771989ed92 CWS gnumake3: adapt mingw port to new features in cws 2011-02-03 10:02:58 +01:00
Hans-Joachim Lankenau
db66b65ad8 gnumake3: remove comphelper version; fix including extract.hxx 2011-01-28 12:49:53 +01:00
Philipp Lohmann [pl]
31f889825e vcl2gnumake: #i116588# move vcl to gbuild (step 4, windows) 2011-01-27 12:31:21 +01:00
Mathias Bauer
69aaa3c57f CWS gnumake3: resync to m98 2011-01-25 18:35:57 +01:00
Mathias Bauer
368bae7662 CWS gnumake3: fix cppunittest on Windows 2011-01-20 19:32:26 +01:00
tono
087e912a2d mingwport33: i#116264: gbuild for MinGW 2011-01-05 22:55:15 +09:00
tono
488b233c90 Backed out changeset: e84942bd0aca 2011-01-05 21:38:47 +09:00
tono
9ce8c4f0dc i#116264: gbuild for MinGW 2010-12-31 00:35:16 +09:00
Hans-Joachim Lankenau
1c0e2bbfc4 link debug runtime in non-pro; should be moved to platform makefile 2010-12-03 13:51:55 +01:00
Bjoern Michaelsen
5eca715cdc gnumake2: fixes for solaris 2010-11-15 13:19:43 +01:00
Bjoern Michaelsen
56070c6a6b gnumake2: fixing comphelper lib name for solaris 2010-11-13 09:41:56 +01:00
Bjoern Michaelsen
21ee80adaf gnumake2: simpified repository setup 2010-11-11 15:36:05 +01:00
Bjoern Michaelsen
3dbc4afa69 gnumake2: simpified repository setup 2010-11-11 12:19:55 +01:00
Renamed from Platformfixes.mk (Browse further)