Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git

Author: Shyotl

indra/cmake/Audio.cmake

@@ -1,13 +1,13 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (STANDALONE)
+if (LINUX)
   include(FindPkgConfig)
   pkg_check_modules(OGG REQUIRED ogg)
   pkg_check_modules(VORBIS REQUIRED vorbis)
   pkg_check_modules(VORBISENC REQUIRED vorbisenc)
   pkg_check_modules(VORBISFILE REQUIRED vorbisfile)
-else (STANDALONE)
+else (LINUX)
   use_prebuilt_binary(ogg_vorbis)
   set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
   set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
@@ -32,7 +32,7 @@ else (STANDALONE)
     set(VORBISENC_LIBRARIES vorbisenc)
     set(VORBISFILE_LIBRARIES vorbisfile)
   endif (WINDOWS)
-endif (STANDALONE)
+endif (LINUX)
 
 link_directories(
     ${VORBIS_LIBRARY_DIRS}

indra/cmake/Copy3rdPartyLibs.cmake

@@ -124,10 +124,10 @@ elseif(DARWIN)
         libndofdev.dylib
        )
 
-    if (FMODSTUDIO)
+    if (USE_FMODSTUDIO)
       list(APPEND debug_files libfmodL.dylib)
       list(APPEND release_files libfmod.dylib)
-    endif (FMODSTUDIO)
+    endif (USE_FMODSTUDIO)
 
 elseif(LINUX)
     # linux is weird, multiple side by side configurations aren't supported
@@ -157,12 +157,9 @@ elseif(LINUX)
     set(release_files
         libapr-1.so.0
         libaprutil-1.so.0
-        libatk-1.0.so
         libexpat.so
         libexpat.so.1
         libGLOD.so
-        libgmodule-2.0.so
-        libgobject-2.0.so
         libopenal.so
        )
 

indra/cmake/DBusGlib.cmake

@@ -1,24 +1,11 @@
 # -*- cmake -*-
-include(Prebuilt)
 
-if (STANDALONE)
+if (LINUX)
   include(FindPkgConfig)
 
   pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1)
 
-elseif (LINUX)
-  use_prebuilt_binary(dbus-glib)
-  set(DBUSGLIB_FOUND ON FORCE BOOL)
-  set(DBUSGLIB_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/include/dbus
-      )
-  # 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)
+endif (LINUX)
 
 if (DBUSGLIB_FOUND)
   set(DBUSGLIB ON CACHE BOOL "Build with dbus-glib message bus support.")

indra/cmake/LLAudio.cmake

@@ -7,6 +7,6 @@ set(LLAUDIO_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llaudio
     )
 
-add_definitions(-DOV_EXCLUDE_STATIC_CALLBACKS)
+#add_definitions(-DOV_EXCLUDE_STATIC_CALLBACKS)
 
 set(LLAUDIO_LIBRARIES llaudio ${OPENAL_LIBRARIES})

indra/cmake/UI.cmake

@@ -1,11 +1,9 @@
 # -*- cmake -*-
-include(Prebuilt)
 include(FreeType)
 
-if (STANDALONE)
+if (LINUX)
   include(FindPkgConfig)
-    
-  if (LINUX)
+
     set(PKGCONFIG_PACKAGES
         atk
         cairo
@@ -21,8 +19,8 @@ if (STANDALONE)
         pangox
         pangoxft
         sdl
+        x11
         )
-  endif (LINUX)
 
   foreach(pkg ${PKGCONFIG_PACKAGES})
     pkg_check_modules(${pkg} REQUIRED ${pkg})
@@ -31,39 +29,6 @@ if (STANDALONE)
     list(APPEND UI_LIBRARIES ${${pkg}_LIBRARIES})
     add_definitions(${${pkg}_CFLAGS_OTHERS})
   endforeach(pkg)
-else (STANDALONE)
-  if (LINUX)
-    use_prebuilt_binary(gtk-atk-pango-glib)
-    set(UI_LIBRARIES
-        atk-1.0
-        cairo
-        gdk-x11-2.0
-        gdk_pixbuf-2.0
-        Xinerama
-        glib-2.0
-        gio-2.0
-        gmodule-2.0
-        gobject-2.0
-        gthread-2.0
-        gtk-x11-2.0
-        pango-1.0
-        pangoft2-1.0
-        pangoxft-1.0
-        pangocairo-1.0
-        pixman-1
-        X11
-        ${FREETYPE_LIBRARIES}
-        )
-  endif (LINUX)
 
-  include_directories (
-      ${LIBS_PREBUILT_DIR}/include
-      )
-  foreach(include ${${LL_ARCH}_INCLUDES})
-      include_directories(${LIBS_PREBUILT_DIR}/include/${include})
-  endforeach(include)
-endif (STANDALONE)
-
-if (LINUX)
   add_definitions(-DLL_GTK=1 -DLL_X11=1)
 endif (LINUX)

indra/llcommon/indra_constants.h

@@ -244,7 +244,6 @@ const U8 SIM_ACCESS_DOWN	= 254;
 const U8 SIM_ACCESS_MAX 	= SIM_ACCESS_ADULT;
 
 // attachment constants
-const U32 MAX_AGENT_ATTACHMENTS = 38;
 const U8  ATTACHMENT_ADD = 0x80;
 
 // god levels

indra/llinventory/CMakeLists.txt

@@ -17,7 +17,6 @@ include_directories(
 
 set(llinventory_SOURCE_FILES
     llcategory.cpp
-    lleconomy.cpp
     llfoldertype.cpp
     llinventory.cpp
     llinventorydefines.cpp
@@ -40,7 +39,6 @@ set(llinventory_HEADER_FILES
     CMakeLists.txt
 
     llcategory.h
-    lleconomy.h
     llfoldertype.h
     llinventory.h
     llinventorydefines.h