summaryrefslogtreecommitdiff
path: root/Library_merged.mk
AgeCommit message (Collapse)AuthorFilesLines
2015-11-28Add i18nlangtag and ucbhelper to libmergedMatúš Kukan1-2/+0
Change-Id: I717d3289d63787cd8148d480783092868a60873b
2015-11-28Add comphelper to libmergedMatúš Kukan1-1/+0
Change-Id: I59af9f5a9d0d3e189280f98bb18e522dc9ebf2fb
2015-06-25tdf#91485 fix cursors not displayed on Windows with mergedlibsChristian Lohmaier1-0/+2
Change-Id: I502d3d2490be5307364dee59c7ee36c0fb7ef55f
2014-12-15gbuild: More automagic for libmergedMatúš Kukan1-65/+0
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 b6be3d3db3ffbc4c1a4528a8dc17aa95084e12ca Change-Id: I2682456f53cb2e8d7ea63eae15f8979a3c828401
2014-12-15gbuild: Do not require gb_Library_use_externals for libmergedMatúš Kukan1-47/+0
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-02fix typo and libmerged buildMatúš Kukan1-10/+1
Change-Id: I76541a960d3b81d1bc44efa323c6f1349a4cb858
2014-12-02 --enabled-mergedlibs, missing setupapi DLL on windowsNoel Grandin1-0/+1
Change-Id: I72c63e26492c575e6b86a23f2c6069ac557ee7da
2014-12-02--enabled-mergedlibs, don't use glxtest on windowsNoel Grandin1-1/+9
Change-Id: I6175bc4d648d3a1d88462f1cf8956c2d95d15210
2014-11-24fix libmerged build: missing glxtestMatúš Kukan1-3/+3
Change-Id: Id40d5d21e4e315a605bd41eac01de5cfa04837d4
2014-07-03fix libmerged: vclplug_svp is inMatúš Kukan1-0/+6
Change-Id: I6ab00275b36725fbb0a446c7e5eb888e034a8989
2014-05-13add externals for libmerged tooMatúš Kukan1-0/+3
Change-Id: I6801745e25d31e951ed9d0dcf1e2d93aa55905e4
2014-04-28prefer makefile-gmake-modeTakeshi Abe1-1/+1
Change-Id: I9cc9bfbddd3a90e00eee3e674994e5d6207f9034
2014-04-08vclopengl needs to be in libmergedMatúš Kukan1-0/+10
Change-Id: I7265aa6f79bcee99bf5c60dc21b61ea95ae85864
2014-03-14add shlwapiMatúš Kukan1-0/+1
Change-Id: Icb7b7d9954a6954b2a34358a49988a10c3ab384a
2014-03-14lpsolve is not used hereMatúš Kukan1-1/+0
Change-Id: I8264104e58e0c6ddb3bea2983754b43908be28be
2014-01-02merged library needs to include eotBjoern Michaelsen1-0/+1
Change-Id: I96a4b4037055f00e7fed9976ca57a897b4a07226
2013-12-03ugly build-fix for libmergedMatúš Kukan1-2/+2
Change-Id: I6c107ea5e780ea1178759e2ee827f9bd6d5ede3a
2013-08-19Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVATor Lillqvist1-1/+1
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
2013-07-16libfbfembed shouldn't be part of libmerged.Andrzej J.R. Hunt1-1/+0
Change-Id: I262b62eb33896c7912685cf3bc78e15b80ce2102
2013-07-16Fix firebird with libmerged.Andrzej J.R. Hunt1-2/+2
Change-Id: I2784700686981c3eb487daae00b9f537658771bd
2013-07-16Build firebird 2.5 internally. Also adds libatomic_ops.Andrzej J.R. Hunt1-0/+2
Change-Id: I44a45e781dfb3624cdebf4530ae44870bf39a82a
2013-06-16Don't build icule library as we no longer use itKhaled Hosny1-1/+0
Change-Id: I25401eee45988bf4d156c11d9a5848c783204c02
2013-05-24Revert "Rename Boost libraries when built internally to match conventions"Fridrich Štrba1-1/+1
This reverts commit 3aeecc525c76797801e9e2b24c2ebff6ac81adac.
2013-05-24Rename Boost libraries when built internally to match conventionsTor Lillqvist1-1/+1
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-23libmerged needs -lrt tooMatúš Kukan1-0/+1
since 9830fd36dbdb72c79703b0c61efc027fba793c5a Change-Id: I2cf7e59676d36fb0fe1a1ea4b70fa96d2a9ba976
2013-04-30Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks1-17/+4
2013-04-25ditch libi18nlangtagicu againEike Rathke1-1/+0
Thanks to Fridrich for finding the real cause for why I thought this was necessary.. Change-Id: I77934b17c2b994a03cae5440253b165704de2fa4
2013-04-24introduced libi18nlangtagicuEike Rathke1-0/+1
Change-Id: Ie80e989d55d465e127ccc20290d654acf222e5bb
2013-04-23libmerged: add harfbuzz externalMatúš Kukan1-0/+1
Change-Id: I7be27b049c4a482be256544c295a7aee89f81f57
2013-04-15add a bunch more libs to libmergedPeter Foley1-0/+5
Change-Id: Iafced50131c0aaf81c07d1e0bc91fd39547e6682
2013-04-15add extensions libs to libmergedPeter Foley1-0/+1
Change-Id: I65a4358c3214c43714bc0d13a05a316799cafb24
2013-04-15libmerged: add more libraries and cleanupMatúš Kukan1-49/+7
Change-Id: I68c6f4d4bae3ae495dd2033c95f47a34a4aba560
2013-04-15libmerged: fix linking against cppunit againMatúš Kukan1-3/+8
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-14add filter libs to libmergedPeter Foley1-1/+2
Change-Id: I1891d1499aae87a87436bc9aaf4f70203dfbb585
2013-04-13add tl and basegfx to libmergedPeter Foley1-2/+0
Change-Id: Ie16a3208dd6cc6f0d4fe8e3017b2bf7abc192ecd
2013-04-13fix mergelibs=allPeter Foley1-0/+2
Change-Id: I267ebf8842ceefdaae3729364dcb75ab66c62e1c
2013-04-12No jvmaccess or jvmfwk library unless SOLAR_JAVATor Lillqvist1-2/+3
Change-Id: I676c1305d997d756456245264e68676666f75c7e
2013-04-09libmerged: remove some of unused externals and static librariesMatúš Kukan1-24/+0
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-09fix linking of libmerged: add jvmaccessMatúš Kukan1-1/+2
Change-Id: I374041bba8ea4f20d22aeea8b486f68b0d7acd7b
2013-04-09Revert "add javavm and jvmfwk to Library_merged"Matúš Kukan1-0/+1
This reverts commit 77169b9ceccfedeadef272f701425430cf1c719d. Conflicts: Library_merged.mk Change-Id: Id7c42457127a622cf71910bafc97f69db545243f
2013-04-09rename expat external to 'expat'David Tardon1-1/+1
expat_utf16 is long gone, so there is no need to fool around with expat_utf8. Change-Id: I0dd4a5c4d78805e98913e645cc83d2ab634bcb89
2013-04-05new module i18nlangtagEike Rathke1-1/+1
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-03-31fix vcl with Library_mergedPeter Foley1-3/+0
Change-Id: Ie85ba53c59eda5586b70527a518e3f80223fc49e
2013-03-28add tl dependent libs to Library_mergedPeter Foley1-0/+4
Change-Id: Idd99db9c6afce3b7713f6262927a0972d16ae418
2013-03-28add pyuno and pythonloader to Library_mergedPeter Foley1-0/+1
Change-Id: Ib2bde93f7f99873c4c2f4d3857bb1ed5e3e7fd8a
2013-03-28add javaloader, java_uno, juh, and jvmaccess to Library_mergedPeter Foley1-6/+0
Change-Id: I9841860d7c7d34310b99ee339d7835e909702d4f
2013-03-28add lingucomponent libs to Library_mergedPeter Foley1-22/+11
Change-Id: Ib34f589b377991b9e2d043d43ecf0360031ddae3
2013-03-28add javavm and jvmfwk to Library_mergedPeter Foley1-1/+0
Change-Id: Ia59027e4eb9909b6afeab6dc6c7f76a6b60cd1c6
2013-03-28add helplinker to Library_mergedPeter Foley1-0/+3
Change-Id: I33073859403edf11576fd88db6a68279f9055139
2013-03-28add basebmp and unotest to Library_mergedPeter Foley1-13/+8
Change-Id: I13dadec895bc67a903956c6a4e6bdbfa9a1b8d84
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-24 22:33:10 +0000