Hacks to get fmod working for now

indra/cmake/FMODSTUDIO.cmake

@@ -108,5 +108,5 @@ endif (FMOD_LIBRARY_RELEASE AND FMOD_INCLUDE_DIR)
 
 if (FMOD)
   message(STATUS "Building with FMOD Studio audio support")
-  set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMODSTUDIO")
+  set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMODSTUDIO=1")
 endif (FMOD)

indra/llaudio/llaudioengine_fmodstudio.cpp

@@ -281,8 +281,8 @@ void F_STDCALL decode_dealloc(void *ptr, FMOD_MEMORY_TYPE type, const char *sour
 
 bool LLAudioEngine_FMODSTUDIO::init(const S32 num_channels, void* userdata)
 {
-
-#if LL_WINDOWS
+	LL_WARNS("AudioImpl") << "BARKBARKBARK" << LL_ENDL;
+#if 0 //LL_WINDOWS
 	if(!attemptDelayLoad())
 		return false;
 #endif

indra/llaudio/llstreamingaudio_fmodstudio.cpp

@@ -226,7 +226,7 @@ std::string utf16input_to_utf8(char* input, U32 len, utf_endian_type_t type)
 			}
 		}
 	}
-	llutf16string out_16((U16*)input, len / 2);
+	llutf16string out_16((utf16strtype*)input, len / 2);
 	if (len % 2)
 	{
 		out_16.push_back((input)[len - 1] << 8);

indra/newview/CMakeLists.txt

@@ -1417,6 +1417,10 @@ if (WINDOWS)
   list(APPEND viewer_SOURCE_FILES ${viewer_INSTALLER_FILES})
 endif (WINDOWS)
 
+if (FMODSTUDIO)
+  set(FMOD_LIBRARY ${FMOD_LINK_LIBRARY_RELEASE})
+endif (FMODSTUDIO)
+
 set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}")
 
 list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES})
@@ -1646,6 +1650,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${Boost_DATE_TIME_LIBRARY}
     ${DBUSGLIB_LIBRARIES}
     ${OPENGL_LIBRARIES}
+    ${FMOD_LIBRARY} # must come after LLAudio
     ${GLOD_LIBRARIES}
     ${APRUTIL_LIBRARIES}
     ${OPENGL_LIBRARIES}