From 14c528c88c9c72443ccf344aedc8a2d2b8d8f0cd Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 11 Jan 2009 14:49:14 -0600 Subject: Removed references to unused dbusglib. --- ChangeLog.txt | 8 ++++++++ linden/indra/cmake/DBusGlib.cmake | 29 ----------------------------- linden/indra/newview/CMakeLists.txt | 3 --- 3 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 linden/indra/cmake/DBusGlib.cmake diff --git a/ChangeLog.txt b/ChangeLog.txt index 7c1e841..6851b4c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,11 @@ +2009-01-11 Jacek Antonelli + + * cmake/DBusGlib.cmake: + Removed references to unused dbusglib. + * newview/CMakeLists.txt: + Ditto. + + 2009-01-08 McCabe Maxsted * linden/indra/cmake/CopyWinLibs.cmake: diff --git a/linden/indra/cmake/DBusGlib.cmake b/linden/indra/cmake/DBusGlib.cmake deleted file mode 100644 index cfc4ccd..0000000 --- a/linden/indra/cmake/DBusGlib.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# -*- cmake -*- -include(Prebuilt) - -if (STANDALONE) - include(FindPkgConfig) - - pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1) - -elseif (LINUX) - use_prebuilt_binary(dbusglib) - set(DBUSGLIB_FOUND ON FORCE BOOL) - set(DBUSGLIB_INCLUDE_DIRS - ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 - ) - # We don't need to explicitly link against dbus-glib itself, because - # the viewer probes for the system's copy at runtime. - set(DBUSGLIB_LIBRARIES - gobject-2.0 - glib-2.0 - ) -endif (STANDALONE) - -if (DBUSGLIB_FOUND) - set(DBUSGLIB ON CACHE BOOL "Build with dbus-glib message bus support.") -endif (DBUSGLIB_FOUND) - -if (DBUSGLIB) - add_definitions(-DLL_DBUS_ENABLED=1) -endif (DBUSGLIB) diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 8d70751..4871e05 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt @@ -5,7 +5,6 @@ project(viewer) include(00-Common) include(Boost) include(BuildVersion) -include(DBusGlib) include(DirectX) include(ELFIO) include(FMOD) @@ -876,7 +875,6 @@ endif (DARWIN) if (LINUX) LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp) - LIST(APPEND viewer_SOURCE_FILES llappviewerlinux_api_dbus.cpp) LIST(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed) set(viewer_LIBRARIES @@ -1388,7 +1386,6 @@ target_link_libraries(imprudence-bin ${viewer_LIBRARIES} ${BOOST_PROGRAM_OPTIONS_LIBRARY} ${BOOST_REGEX_LIBRARY} - ${DBUSGLIB_LIBRARIES} ${OPENGL_LIBRARIES} ${FMODWRAPPER_LIBRARY} ${OPENGL_LIBRARIES} -- cgit v1.1 From e7b262eb88db36ea72e1d6e2d3861b8708d587a2 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 11 Jan 2009 15:17:54 -0600 Subject: Added newline at end of llmediaimplgstreamer.cpp Newline at end of file is needed for Linux compile. --- linden/indra/llmedia/llmediaimplgstreamer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp index 6fdaf43..d889f6f 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp @@ -666,4 +666,4 @@ bool LLMediaImplGStreamer::setVolume(float volume) -///#endif // LL_GSTREAMER_ENABLED \ No newline at end of file +///#endif // LL_GSTREAMER_ENABLED -- cgit v1.1 From cdd993283c8da5b3e8831a111e6b360347ea6f2a Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 11 Jan 2009 18:39:11 -0600 Subject: Use BOOST_SIGNALS_LIB in newview/CMakeLists. --- ChangeLog.txt | 4 ++++ linden/indra/newview/CMakeLists.txt | 1 + 2 files changed, 5 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 6851b4c..da1e1d7 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,9 @@ 2009-01-11 Jacek Antonelli + * linden/indra/newview/CMakeLists.txt: + Use BOOST_SIGNALS_LIB in newview/CMakeLists. + + * cmake/DBusGlib.cmake: Removed references to unused dbusglib. * newview/CMakeLists.txt: diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 4871e05..0205ceb 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt @@ -1386,6 +1386,7 @@ target_link_libraries(imprudence-bin ${viewer_LIBRARIES} ${BOOST_PROGRAM_OPTIONS_LIBRARY} ${BOOST_REGEX_LIBRARY} + ${BOOST_SIGNALS_LIBRARY} ${OPENGL_LIBRARIES} ${FMODWRAPPER_LIBRARY} ${OPENGL_LIBRARIES} -- cgit v1.1 From 3de88985954fb57012e8206c14b242c09dab9930 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 11 Jan 2009 18:42:44 -0600 Subject: Added glib package to install.xml. --- ChangeLog.txt | 4 ++++ linden/install.xml | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index da1e1d7..e98abaf 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,9 @@ 2009-01-11 Jacek Antonelli + * linden/install.xml: + Added glib package to install.xml. + + * linden/indra/newview/CMakeLists.txt: Use BOOST_SIGNALS_LIB in newview/CMakeLists. diff --git a/linden/install.xml b/linden/install.xml index f764a5e..4d2b5d0 100644 --- a/linden/install.xml +++ b/linden/install.xml @@ -368,6 +368,37 @@ + glib + + description + GLib is a library containing many useful C routines for things such as trees, hashes, and lists. + license + gpl + packages + + darwin + + md5sum + 6cc5ce1fafd10299fdb890b3d4c3cf53 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glib-2.0-darwin-20080817.tar.bz2 + + linux + + md5sum + 2f1a9e14f9213c2c9564c1c1cfdd6d47 + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glib-2.0-linux-20080817.tar.bz2 + + windows + + md5sum + 3d5e29d444dde4815b36082eedfc775a + url + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glib-2.0-windows-20080817.tar.bz2 + + + google license -- cgit v1.1 From d971dae8333841de1d4392f046d304917f9e31c1 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 11 Jan 2009 18:43:40 -0600 Subject: Added more gstreamer include paths. --- ChangeLog.txt | 4 ++++ linden/indra/cmake/GStreamer.cmake | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index e98abaf..ca8db85 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,9 @@ 2009-01-11 Jacek Antonelli + * linden/indra/cmake/GStreamer.cmake: + Added more gstreamer include paths. + + * linden/install.xml: Added glib package to install.xml. diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake index 10d5207..4369445 100644 --- a/linden/indra/cmake/GStreamer.cmake +++ b/linden/indra/cmake/GStreamer.cmake @@ -15,6 +15,8 @@ elseif (LINUX) set(GSTREAMER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10 ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0 + ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0/glib + ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0/gobject ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2 ) # We don't need to explicitly link against gstreamer itself, because -- cgit v1.1