From 125fe3ac425d38c04f97bd84b86812521f973982 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 8 Nov 2009 14:25:25 -0600
Subject: Finally packaged up Mac libraries.

flac, glib, gstreamer, gstreamer-plugins, jpeg-6b, liboil,
libpng, libxml, neon, ogg-vorbis, openal, thoera.
---
 linden/indra/cmake/GStreamer.cmake | 5 +++++
 linden/indra/cmake/JPEG.cmake      | 5 +----
 linden/indra/cmake/OPENAL.cmake    | 4 ++--
 linden/indra/cmake/PNG.cmake       | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 51e1550..992b61e 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -66,6 +66,11 @@ else (WINDOWS)
 
   if (DARWIN) # Mac
 
+    use_prebuilt_binary(flac)
+    use_prebuilt_binary(liboil)
+    use_prebuilt_binary(neon)
+    use_prebuilt_binary(theora)
+
     find_library( XML2_LIB
       NAMES xml2.2
       PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
diff --git a/linden/indra/cmake/JPEG.cmake b/linden/indra/cmake/JPEG.cmake
index 5d0ee0d..92aa458 100644
--- a/linden/indra/cmake/JPEG.cmake
+++ b/linden/indra/cmake/JPEG.cmake
@@ -12,10 +12,7 @@ else (STANDALONE)
   if (LINUX)
     set(JPEG_LIBRARIES jpeg)
   elseif (DARWIN)
-    set(JPEG_LIBRARIES
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/liblljpeg.a
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/liblljpeg.a
-      )
+    set(JPEG_LIBRARIES jpeg)
   elseif (WINDOWS)
     set(JPEG_LIBRARIES jpeglib_6b)
   endif (LINUX)
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index ad26d4c..71cbd67 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -40,7 +40,7 @@ if (OPENAL)
   # OPENAL_INCLUDE_DIR
 
   if (DARWIN)
-    set(OPENAL_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include/AL")        
+    set(OPENAL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/AL)
   else (DARWIN)
     find_path(OPENAL_INCLUDE_DIR
       NAMES al.h
@@ -85,7 +85,7 @@ if (OPENAL)
 
   find_path(ALUT_INCLUDE_DIR
     NAMES alut.h
-    PATHS ${LIBS_PREBUILT_DIR}/include/AL
+    PATHS ${OPENAL_INCLUDE_DIR}
     )
 
   if (NOT ALUT_INCLUDE_DIR)
diff --git a/linden/indra/cmake/PNG.cmake b/linden/indra/cmake/PNG.cmake
index 4d0b7b2..d08476d 100644
--- a/linden/indra/cmake/PNG.cmake
+++ b/linden/indra/cmake/PNG.cmake
@@ -9,5 +9,5 @@ if (STANDALONE)
 else (STANDALONE)
   use_prebuilt_binary(libpng)
   set(PNG_LIBRARIES png12)
-  set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+  set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (STANDALONE)
-- 
cgit v1.1