diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 0428ae87d..964c9d684 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -78,15 +78,15 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
   #SDK Compiler and Deployment targets for XCode
   if (${XCODE_VERSION} VERSION_LESS 4.0.0)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
     set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
     set(CMAKE_XCODE_ATTIBUTE_GCC_VERSION "4.2")
   else (${XCODE_VERSION} VERSION_LESS 4.0.0)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
     set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
     set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
   endif (${XCODE_VERSION} VERSION_LESS 4.0.0)
 
+  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
+
   # NOTE: To attempt an i386/PPC Universal build, add this on the configure line:
   # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc'
   # Build only for i386 by default, system default on MacOSX 10.6 is x86_64
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 014a63461..66b5b4b3a 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1338,40 +1338,39 @@ if (OPENAL)
 endif (OPENAL)
 
 if (FMOD OR FMODEX)
-  if (FMODEX)
-    set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMODEX")
-  endif (FMODEX)
-  if (FMOD)
+  if(FMODEX)
+	set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMODEX")
+  endif(FMODEX)
+  if(FMOD)
     set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMOD")
-  endif (FMOD)
+  endif(FMOD)
 
-  if (DARWIN)
+  if (NOT WINDOWS)
     set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp)
     add_library(fmodwrapper SHARED ${fmodwrapper_SOURCE_FILES})
-    if (FMODEX)
-      set(fmodwrapper_needed_LIBRARIES ${FMODEX_LIBRARY} ${CARBON_LIBRARY})
-    endif (FMODEX)
-    if (FMOD)
-      set(fmodwrapper_needed_LIBRARIES ${FMOD_LIBRARY} ${CARBON_LIBRARY})
-    endif (FMOD)
-    set_target_properties(
-      fmodwrapper
-      PROPERTIES
-      BUILD_WITH_INSTALL_RPATH 1
-      INSTALL_NAME_DIR "@executable_path/../Resources"
-      LINK_FLAGS "-unexported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/fmod_hidden_symbols.exp"
-      )
+    if(FMOD AND FMODEX)
+		set(fmodwrapper_needed_LIBRARIES "${FMODEX_LIBRARY} ${FMOD_LIBRARY}")
+    else(FMOD AND FMODEX)
+        if(FMODEX)
+            set(fmodwrapper_needed_LIBRARIES ${FMODEX_LIBRARY})
+        endif(FMODEX)
+        if(FMOD)
+            set(fmodwrapper_needed_LIBRARIES "${FMOD_LIBRARY}")
+        endif(FMOD)
+    endif(FMOD AND FMODEX)
+    if (DARWIN)
+      list(APPEND fmodwrapper_needed_LIBRARIES ${CARBON_LIBRARY})
+      set_target_properties(
+        fmodwrapper
+        PROPERTIES
+        BUILD_WITH_INSTALL_RPATH 1
+        INSTALL_NAME_DIR "@executable_path/../Resources"
+        LINK_FLAGS "-unexported_symbols_list \"${CMAKE_CURRENT_SOURCE_DIR}/fmod_hidden_symbols.exp\""
+        )
+    endif (DARWIN)
     set(FMODWRAPPER_LIBRARY fmodwrapper)
     target_link_libraries(fmodwrapper ${fmodwrapper_needed_LIBRARIES})
-    else (DARWIN)
-    # fmodwrapper unnecessary on linux or windows, for fmod and fmodex
-    if (FMODEX)
-      set(FMODWRAPPER_LIBRARY ${FMODEX_LIBRARY})
-    endif (FMODEX)
-    if (FMOD)
-      set(FMODWRAPPER_LIBRARY ${FMOD_LIBRARY})
-    endif (FMOD)
-  endif (DARWIN)
+  endif (NOT WINDOWS)
 endif (FMOD OR FMODEX)
 
 set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}")