aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/CMakeLists.txt')
-rw-r--r--linden/indra/newview/CMakeLists.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 7c49f72..b95ba37 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -9,6 +9,7 @@ include(DBusGlib)
9include(DirectX) 9include(DirectX)
10include(ELFIO) 10include(ELFIO)
11include(FMOD) 11include(FMOD)
12include(OPENAL)
12include(FindOpenGL) 13include(FindOpenGL)
13include(LLAudio) 14include(LLAudio)
14include(LLCharacter) 15include(LLCharacter)
@@ -1257,8 +1258,12 @@ if (WINDOWS)
1257 list(APPEND viewer_SOURCE_FILES ${viewer_INSTALLER_FILES}) 1258 list(APPEND viewer_SOURCE_FILES ${viewer_INSTALLER_FILES})
1258endif (WINDOWS) 1259endif (WINDOWS)
1259 1260
1261if (OPENAL)
1262 set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_OPENAL")
1263endif (OPENAL)
1264
1260if (FMOD) 1265if (FMOD)
1261 set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS -DLL_FMOD) 1266 set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMOD")
1262 1267
1263 if (NOT WINDOWS) 1268 if (NOT WINDOWS)
1264 set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp) 1269 set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp)
@@ -1279,6 +1284,8 @@ if (FMOD)
1279 endif (NOT WINDOWS) 1284 endif (NOT WINDOWS)
1280endif (FMOD) 1285endif (FMOD)
1281 1286
1287set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}")
1288
1282list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES}) 1289list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES})
1283 1290
1284set_source_files_properties(${viewer_HEADER_FILES} 1291set_source_files_properties(${viewer_HEADER_FILES}