secondlife-standalone-maint-svn/use-llmozlib2.patch

   1 diff -Naur maint-viewer/indra/cmake/Mozlib.cmake maint-viewer-c/indra/cmake/Mozlib.cmake
   2 --- maint-viewer/indra/cmake/Mozlib.cmake       2009-02-01 03:14:58.000000000 +0100
   3 +++ maint-viewer-c/indra/cmake/Mozlib.cmake     2009-02-09 14:56:52.421831396 +0100
   4 @@ -26,6 +26,16 @@
   5              xul
   6              profdirserviceprovider_s
   7              )
   8 +       set(MOZLIB_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
   9 +       set(MOZLIB_LIBRARIES ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client/libllmozlib2.a
  10 +                            ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client/libmozjs.so
  11 +                            ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client/libnspr4.so
  12 +                            ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client/libplc4.so
  13 +                            ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client/libplds4.so
  14 +                            ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client/libprofdirserviceprovider_s.a
  15 +                            ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client/libxul.so)
  16 +
  17 +
  18      elseif (WINDOWS)
  19          if (MSVC71)
  20              set(MOZLIB_LIBRARIES
  21 diff -Naur maint-viewer/indra/llmedia/CMakeLists.txt maint-viewer-c/indra/llmedia/CMakeLists.txt
  22 --- maint-viewer/indra/llmedia/CMakeLists.txt   2009-02-01 03:17:26.000000000 +0100
  23 +++ maint-viewer-c/indra/llmedia/CMakeLists.txt 2009-02-09 14:55:53.000000000 +0100
  24 @@ -22,6 +22,7 @@
  25      ${LLMATH_INCLUDE_DIRS}
  26      ${LLMESSAGE_INCLUDE_DIRS}
  27      ${LLWINDOW_INCLUDE_DIRS}
  28 +    ${MOZLIB_INCLUDE_DIR}
  29      )
  30
  31  set(llmedia_SOURCE_FILES