strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
369620 commits 9 branches 795 tags 2.1 GiB
Commit graph

90 commits

Author SHA1 Message Date
Matúš Kukan
8cc1e7a7c3 gbuild: More automagic for libmerged 
Only gb_Library_use_libraries stays because I think it's a good idea to see
dependent libraries (potential candidates for merging) and hopefully the
list does not change often anyway.
This commit extends b6be3d3db3

Change-Id: I2682456f53cb2e8d7ea63eae15f8979a3c828401
 2014-12-15 14:48:02 +01:00
Matúš Kukan
b6be3d3db3 gbuild: Do not require gb_Library_use_externals for libmerged 
Instead, automatically get the externals when parsing other makefiles.
This commit fixes the build and hopefully avoids problems in future
because people didn't know they had to add externals for libmerged too.
Similar should be done for other functions like add_libs...

Change-Id: I5aea4c43f4b6838092ada81c310ef1100f241108
 2014-12-15 14:42:59 +01:00
Matúš Kukan
bb6774a2bd fix typo and libmerged build 
Change-Id: I76541a960d3b81d1bc44efa323c6f1349a4cb858
 2014-12-02 10:31:08 +01:00
Noel Grandin
0f3438c26d --enabled-mergedlibs, missing setupapi DLL on windows 
Change-Id: I72c63e26492c575e6b86a23f2c6069ac557ee7da
 2014-12-02 08:58:51 +02:00
Noel Grandin
c870721fcb --enabled-mergedlibs, don't use glxtest on windows 
Change-Id: I6175bc4d648d3a1d88462f1cf8956c2d95d15210
 2014-12-02 08:58:48 +02:00
Matúš Kukan
b144f0ac86 fix libmerged build: missing glxtest 
Change-Id: Id40d5d21e4e315a605bd41eac01de5cfa04837d4
 2014-11-24 23:14:54 +01:00
Matúš Kukan
9dd152107c fix libmerged: vclplug_svp is in 
Change-Id: I6ab00275b36725fbb0a446c7e5eb888e034a8989
 2014-07-03 20:48:32 +02:00
Matúš Kukan
12ddc6d01b add externals for libmerged too 
Change-Id: I6801745e25d31e951ed9d0dcf1e2d93aa55905e4
 2014-05-13 17:17:52 +02:00
Takeshi Abe
541761d7b8 prefer makefile-gmake-mode 
Change-Id: I9cc9bfbddd3a90e00eee3e674994e5d6207f9034
 2014-04-28 23:35:42 +09:00
Matúš Kukan
e67f8ecfd5 vclopengl needs to be in libmerged 
Change-Id: I7265aa6f79bcee99bf5c60dc21b61ea95ae85864
 2014-04-08 10:31:14 +02:00
Matúš Kukan
bee9ea584c add shlwapi 
Change-Id: Icb7b7d9954a6954b2a34358a49988a10c3ab384a
 2014-03-14 09:31:42 +01:00
Matúš Kukan
2b7a148379 lpsolve is not used here 
Change-Id: I8264104e58e0c6ddb3bea2983754b43908be28be
 2014-03-14 09:31:41 +01:00
Bjoern Michaelsen
4261ccb307 merged library needs to include eot 
Change-Id: I96a4b4037055f00e7fed9976ca57a897b4a07226
 2014-01-02 17:07:40 +01:00
Matúš Kukan
5b03bc8a4d ugly build-fix for libmerged 
Change-Id: I6c107ea5e780ea1178759e2ee827f9bd6d5ede3a
 2013-12-03 08:31:17 +01:00
Tor Lillqvist
08452f1208 Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA 
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
 2013-08-19 10:29:04 +03:00
Andrzej J.R. Hunt
8c9f41f2e6 libfbfembed shouldn't be part of libmerged. 
Change-Id: I262b62eb33896c7912685cf3bc78e15b80ce2102
 2013-07-16 17:29:36 +01:00
Andrzej J.R. Hunt
9a9bf62c4c Fix firebird with libmerged. 
Change-Id: I2784700686981c3eb487daae00b9f537658771bd
 2013-07-16 17:07:07 +02:00
Andrzej J.R. Hunt
0f16fa0fa5 Build firebird 2.5 internally. Also adds libatomic_ops. 
Change-Id: I44a45e781dfb3624cdebf4530ae44870bf39a82a
 2013-07-16 16:40:09 +02:00
Khaled Hosny
1733e4ad1c Don't build icule library as we no longer use it 
Change-Id: I25401eee45988bf4d156c11d9a5848c783204c02
 2013-06-16 22:17:05 +02:00
Fridrich Štrba
cdabc886f6 Revert "Rename Boost libraries when built internally to match conventions" 
This reverts commit 3aeecc525c.
 2013-05-24 14:46:28 +02:00
Tor Lillqvist
3aeecc525c Rename Boost libraries when built internally to match conventions 
The standard Boost convention is for them to be called libboost_date_time and
libboost_system (with apropriate suffix then depending on type).

Did not touch the libboostthread library we build for Windows.

Add the ax_boost_thread.m4 file for completeness and possible use.

Document where the ax_boost*.m4 files come from.

Change-Id: Ib49bee71398d62c9760a1f8fd5c46be9f3400430
 2013-05-24 15:03:45 +03:00
Matúš Kukan
e146578775 libmerged needs -lrt too 
since 9830fd36db

Change-Id: I2cf7e59676d36fb0fe1a1ea4b70fa96d2a9ba976
 2013-05-23 12:21:11 +02:00
Michael Meeks
72e5d0c8fb Move to MPLv2 license headers, with ESC decision and author's permission. 2013-04-30 13:34:06 +01:00
Eike Rathke
f5752e9846 ditch libi18nlangtagicu again 
Thanks to Fridrich for finding the real cause for why I thought this was
necessary..

Change-Id: I77934b17c2b994a03cae5440253b165704de2fa4
 2013-04-25 13:55:17 +02:00
Eike Rathke
095f3dde42 introduced libi18nlangtagicu 
Change-Id: Ie80e989d55d465e127ccc20290d654acf222e5bb
 2013-04-24 23:10:31 +02:00
Matúš Kukan
88b325aac5 libmerged: add harfbuzz external 
Change-Id: I7be27b049c4a482be256544c295a7aee89f81f57
 2013-04-23 16:24:17 +02:00
Peter Foley
99ff52443e add a bunch more libs to libmerged 
Change-Id: Iafced50131c0aaf81c07d1e0bc91fd39547e6682
 2013-04-15 19:00:53 -04:00
Peter Foley
bf9a782935 add extensions libs to libmerged 
Change-Id: I65a4358c3214c43714bc0d13a05a316799cafb24
 2013-04-15 19:00:53 -04:00
Matúš Kukan
3df1af355d libmerged: add more libraries and cleanup 
Change-Id: I68c6f4d4bae3ae495dd2033c95f47a34a4aba560
 2013-04-15 14:22:08 +02:00
Matúš Kukan
645f327ec4 libmerged: fix linking against cppunit again 
Fix for: ./program/soffice.bin: error while loading shared libraries:
libcppunit-1.13.so.0: cannot open shared object file: No such file or
directory

Change-Id: Ib73010f69c7fcab0e5759df9e77e0848aa80579f
 2013-04-15 10:10:44 +02:00
Peter Foley
1472c5ed16 add filter libs to libmerged 
Change-Id: I1891d1499aae87a87436bc9aaf4f70203dfbb585
 2013-04-14 18:50:23 -04:00
Peter Foley
e7d4e62105 add tl and basegfx to libmerged 
Change-Id: Ie16a3208dd6cc6f0d4fe8e3017b2bf7abc192ecd
 2013-04-13 20:17:42 -04:00
Peter Foley
54ad562ff5 fix mergelibs=all 
Change-Id: I267ebf8842ceefdaae3729364dcb75ab66c62e1c
 2013-04-13 20:17:42 -04:00
Tor Lillqvist
ebb09ee4f0 No jvmaccess or jvmfwk library unless SOLAR_JAVA 
Change-Id: I676c1305d997d756456245264e68676666f75c7e
 2013-04-12 02:32:42 +03:00
Matúš Kukan
2705fc72df libmerged: remove some of unused externals and static libraries 
Because cppunit was causing troubles. It's not in installation, to be
used at run-time, so we can't link against it.

Change-Id: I133feb0c3dab50bacbe96775a28dd1a61f09882e
 2013-04-09 15:32:32 +02:00
Matúš Kukan
57cbe8d485 fix linking of libmerged: add jvmaccess 
Change-Id: I374041bba8ea4f20d22aeea8b486f68b0d7acd7b
 2013-04-09 15:32:32 +02:00
Matúš Kukan
47832f6b48 Revert "add javavm and jvmfwk to Library_merged" 
This reverts commit 77169b9cec.

Conflicts:
	Library_merged.mk

Change-Id: Id7c42457127a622cf71910bafc97f69db545243f
 2013-04-09 15:32:31 +02:00
David Tardon
51149806f8 rename expat external to 'expat' 
expat_utf16 is long gone, so there is no need to fool around with
expat_utf8.

Change-Id: I0dd4a5c4d78805e98913e645cc83d2ab634bcb89
 2013-04-09 09:46:38 +02:00
Eike Rathke
876c619b94 new module i18nlangtag 
Moved portions from module i18npool, all of former i18nisolang1 library
that now is i18nlangtag. Included are languagetag, isolang and mslangid.

This i18nlangtag code is now even used by module comphelper, so
disentangling i18npool and making this an own module was needed to not
create circular module dependencies.

Change-Id: Ib887c3d6dde667403fd22d382310ba5f1a9b0015
 2013-04-05 19:10:48 +02:00
Peter Foley
a2747d0721 fix vcl with Library_merged 
Change-Id: Ie85ba53c59eda5586b70527a518e3f80223fc49e
 2013-03-31 11:34:28 -04:00
Peter Foley
a93f651c34 add tl dependent libs to Library_merged 
Change-Id: Idd99db9c6afce3b7713f6262927a0972d16ae418
 2013-03-28 09:58:21 -04:00
Peter Foley
b49c71ff29 add pyuno and pythonloader to Library_merged 
Change-Id: Ib2bde93f7f99873c4c2f4d3857bb1ed5e3e7fd8a
 2013-03-28 09:58:18 -04:00
Peter Foley
b270066390 add javaloader, java_uno, juh, and jvmaccess to Library_merged 
Change-Id: I9841860d7c7d34310b99ee339d7835e909702d4f
 2013-03-28 09:58:17 -04:00
Peter Foley
c74f2edfce add lingucomponent libs to Library_merged 
Change-Id: Ib34f589b377991b9e2d043d43ecf0360031ddae3
 2013-03-28 09:58:15 -04:00
Peter Foley
77169b9cec add javavm and jvmfwk to Library_merged 
Change-Id: Ia59027e4eb9909b6afeab6dc6c7f76a6b60cd1c6
 2013-03-28 09:58:14 -04:00
Peter Foley
679ab71438 add helplinker to Library_merged 
Change-Id: I33073859403edf11576fd88db6a68279f9055139
 2013-03-28 09:58:13 -04:00
Peter Foley
470c5fefa5 add basebmp and unotest to Library_merged 
Change-Id: I13dadec895bc67a903956c6a4e6bdbfa9a1b8d84
 2013-03-28 09:58:11 -04:00
Peter Foley
3c8f17930e add desktop_detector, subsequenttest, test, and vclplug_svp to Library_merged 
Change-Id: Ic2201436d1e4fe01670e2086e7dd1c6c525c9e91
 2013-03-28 09:58:04 -04:00
Peter Foley
53ca5cd993 add scfilt to Library_merged 
Change-Id: Icebffb82b35ae383b97b0ef4b3419b1fe74ce858
 2013-03-24 08:55:53 -04:00
Peter Foley
81728bed9b cleanup Library_merged 
Change-Id: Iedd2a60ab6287ed661de7a88daf182cf2af4fe86
 2013-03-23 16:28:02 -04:00