2 files changed, 17 insertions, 8 deletions

diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 35f4e3a..38d0444 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -4,10 +4,12 @@ include(Prebuilt)
 if (NOT STANDALONE)
   use_prebuilt_binary(libuuid)
   use_prebuilt_binary(vivox)
-   if(LINUX AND ${ARCH} STREQUAL "x86_64")
+  if(LINUX)
+    if (${ARCH} STREQUAL "x86_64")
      use_prebuilt_binary(32bitcompatibilitylibs)
-   endif(LINUX AND ${ARCH} STREQUAL "x86_64")
-  use_prebuilt_binary(fontconfig)
+        endif (${ARCH} STREQUAL "x86_64")
+    use_prebuilt_binary(fontconfig)
+  endif(LINUX)
 else (NOT STANDALONE)
   # Download there even when using standalone.
   set(STANDALONE OFF)
diff --git a/linden/indra/llwindow/CMakeLists.txt b/linden/indra/llwindow/CMakeLists.txt
index ea81abf..98da751 100644
--- a/linden/indra/llwindow/CMakeLists.txt
+++ b/linden/indra/llwindow/CMakeLists.txt
@@ -56,11 +56,18 @@ set(viewer_HEADER_FILES
 
 # Libraries on which this library depends, needed for Linux builds
 # Sort by high-level to low-level
-set(llwindow_LINK_LIBRARIES
-    ${UI_LIBRARIES}     # for GTK
-    ${SDL_LIBRARY}
-    fontconfig                  # For FCInit and other FC* functions.
-    )
+if (LINUX)
+        set(llwindow_LINK_LIBRARIES
+                ${UI_LIBRARIES}     # for GTK
+                ${SDL_LIBRARY}
+                fontconfig                      # For FCInit and other FC* functions.
+                )
+else (LINUX)
+    set(llwindow_LINK_LIBRARIES
+                ${UI_LIBRARIES}     # for GTK
+                ${SDL_LIBRARY}
+                )
+endif (LINUX)
 
 if (DARWIN)
   list(APPEND llwindow_SOURCE_FILES