Commit Graph

46 Commits (431b3b0c6dc4e5ab07ff3cefd9b21de5580f6902)

Author SHA1 Message Date
Zi Ree 45aef2c318 Linux - make it compile on linux, gstreamer 0.1 for now, needs to be moved to 1.0, cef probably fails when compiled with volume catcher enabled 2022-09-20 19:29:39 +02:00
Ansariel 1fc3aaff9b Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	.gitignore
#	autobuild.xml
#	indra/CMakeLists.txt
#	indra/cmake/00-Common.cmake
#	indra/cmake/Boost.cmake
#	indra/cmake/BuildVersion.cmake
#	indra/cmake/CEFPlugin.cmake
#	indra/cmake/CMakeLists.txt
#	indra/cmake/CURL.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/DBusGlib.cmake
#	indra/cmake/DragDrop.cmake
#	indra/cmake/FMODSTUDIO.cmake
#	indra/cmake/FindHUNSPELL.cmake
#	indra/cmake/FindJsonCpp.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/FindURIPARSER.cmake
#	indra/cmake/FreeType.cmake
#	indra/cmake/GLH.cmake
#	indra/cmake/Hunspell.cmake
#	indra/cmake/JsonCpp.cmake
#	indra/cmake/LLKDU.cmake
#	indra/cmake/LLPhysicsExtensions.cmake
#	indra/cmake/LLPlugin.cmake
#	indra/cmake/LLWindow.cmake
#	indra/cmake/Linking.cmake
#	indra/cmake/MESHOPTIMIZER.cmake
#	indra/cmake/MediaPluginBase.cmake
#	indra/cmake/NGHTTP2.cmake
#	indra/cmake/OPENAL.cmake
#	indra/cmake/OpenGL.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/cmake/OpenSSL.cmake
#	indra/cmake/PNG.cmake
#	indra/cmake/Tracy.cmake
#	indra/cmake/UI.cmake
#	indra/cmake/Variables.cmake
#	indra/cmake/ViewerMiscLibs.cmake
#	indra/cmake/ZLIBNG.cmake
#	indra/cmake/bugsplat.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/linux_crash_logger/CMakeLists.txt
#	indra/llaudio/CMakeLists.txt
#	indra/llcommon/CMakeLists.txt
#	indra/llcommon/llapp.cpp
#	indra/llcorehttp/CMakeLists.txt
#	indra/llimagej2coj/CMakeLists.txt
#	indra/llinventory/CMakeLists.txt
#	indra/llmath/CMakeLists.txt
#	indra/llmath/llcalcparser.h
#	indra/llmessage/CMakeLists.txt
#	indra/llprimitive/CMakeLists.txt
#	indra/llrender/CMakeLists.txt
#	indra/llrender/llglslshader.cpp
#	indra/llwindow/CMakeLists.txt
#	indra/media_plugins/CMakeLists.txt
#	indra/media_plugins/base/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llxmlrpclistener.cpp
#	indra/newview/llxmlrpctransaction.cpp
#	indra/newview/viewer_manifest.py
#	indra/test/CMakeLists.txt
2022-09-17 23:12:34 +02:00
Andrey Kleshchev 0da3dd27fc SL-17238 Fix coding policy build issues 2022-09-17 14:03:55 +03:00
Nicky c08a61453b Port new cmake files (Trace/Meshoptimizer) to modern cmake 2022-06-05 16:15:55 +02:00
Nicky 42820f834f Remove unused LL_ARCH/LL_ARCH_DIR 2022-05-07 17:29:16 +02:00
Nicky e5f684f085 Make SDL2 a cmake option, use SDL2 Mixer for audio playback, this might open a good way to a full open source way (no FModStudio needed). But here be dragons still. 2022-04-25 21:24:29 +02:00
Nicky 2b151e0aef Round one to support conan for 3P packages, this allows to build the viewer on Linux again. 2022-04-18 18:11:43 +02:00
Nicky 363f2df4fa Remove function create_target and instead directly use add_library 2022-04-17 18:28:55 +02:00
Nicky e0cf0cdfd4 Switch to target_include_directories
All 3Ps include dirs are treated as SYSTEM, this will stop compilers
stop emitting warnings from those files and greatly helps having high
warning levels and not being swamped by warnings that come from
external libraries.
2022-04-17 18:04:57 +02:00
Nicky 6d0bba9c03 Switch over to standard target_link_libraries (cmake requirements are high enough now). 2022-04-17 17:32:14 +02:00
Nicky 924fa0fa78 create target ll::uilibraries to have one common target that defines what each
operation system needs as dependencies on OS gui libraries.
2022-04-16 17:28:26 +02:00
Nicky 3eec716b24 Do not use ${ARCH}_linux_INCLUDES atm 2022-04-16 17:17:32 +02:00
Nicky d3521b4462 Remove obsolete and unmaintained USE_SYSTEMLIBS 2022-04-13 10:28:46 +02:00
Nicky ba31ac8efe Remove old dbus code and replace it with a glib/gio implementation. 2022-01-27 22:00:35 +01:00
Nicky 0c738bc9d7 Static link to libfreetype.a/libfontconfig.a 2022-01-24 17:45:23 +01:00
Nicky cc5f95c229 Remove gtk/atk dependency by using fltk instead. 2021-09-26 20:38:41 +02:00
Nicky c6af775566 Linux; All the needed link libraries for GTK 2017-02-03 16:07:49 +01:00
Nicky 2b8a91b1c0 Remove gio-2.0, pangocairo-1.0 and ffi from required UI libs (at least for now. They are missing from the LL 3P, but might be required later on). 2017-01-16 15:53:29 +01:00
Nicky 2290d5ed16 Merge with viewer64, first pass. 2017-01-10 19:33:15 +01:00
Nicky 46280740bb Linux/x86; gtk_atk_pango_glib update for gstreamer 1.0 2016-08-03 23:20:59 +02:00
callum_linden 9c4ed8d113 Automated merge with tip of viewer-release to pick up 4.0.5 2016-05-19 11:00:03 -07:00
callum_linden 6b9ceb561c DRTVWR-418 Remove references to gtk-atk-pango-glib from Windows build since it's not used there 2016-04-22 14:34:42 -07:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nicky 512eab05cc All the little things for Linux x64 (note no working plugins as of now). 2015-05-15 18:09:11 +02:00
Nicky 803e7a2571 System wide Xinerama is needed by the current gtk from LL> 2015-05-06 18:03:31 +02:00
Nicky 022fecd861 Do not link against Xinerama. 2015-05-06 13:58:25 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Nicky b5c4487884 Backout 45231/6cd12cf6be5d, 45232/ad4cf15860df and 45233:f8b2e5c2690e to revert to old Linux binaries and resolve incompatibilities with some distributions. 2015-04-05 19:04:44 +02:00
Oz Linden 2714ecea21 adjust cmake not to attempt loads of packages on the wrong platforms 2014-12-17 13:13:41 -05:00
Nicky 0c41d39666 Updated 3P packages for Linux x86 and Linux x64. 2015-03-30 12:39:38 +02:00
Ansariel a45088cb6b Merge LL V3.7.11 2015-01-12 12:54:15 +01:00
Oz Linden 776aadf4ef OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS 2014-03-19 17:30:07 -04:00
Tonya Souther 238eced6ea FIRE-13896: Make sure to use our libpangocairo when building on 64-bit Linux. 2014-05-30 01:05:52 -05:00
Techwolf Lupindo 3c347fd9dd Linux 32-bit autobuild fix. Don't need gio-2.0 for 32-bit builds. 2014-02-17 19:32:11 -05:00
Techwolf Lupindo dfe6e2d4d8 Fix a typo in last commit. 2014-02-16 19:43:35 -05:00
Techwolf Lupindo 28031ba0e6 Linux cmake build fixes/improvments for autobuild builds. (!standalone)
Instead of letting the linker search for libs, use cmake to find the prebuilt libs so that the linker will only link to said
libs and not any system libs it may have found.
TODO: Expand this to other prebuilt libs instead of the UI ones.
2014-02-16 19:00:02 -05:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Andrew A. de Laix b7637e58be mac buiding with autobuild and autobuild style packages (just say no to install.py) 2011-01-13 13:09:27 -08:00
Arrehn f7ca761e02 FIRE-3431, use packaged libfreetype, by Nicky Dasmijn 2011-10-02 18:32:23 -04:00
Jennifer Leech fbf15572d9 svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme 2008-06-12 20:51:41 +00:00
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00