Skip to content
Snippets Groups Projects
Commit f929ec2d authored by Martin Reddy's avatar Martin Reddy
Browse files

Fixed the Linux build of viewer-2.0.0-3.

- Updated linux_updater for new LLStringUtil::getTokens() signature
- Ignore compiler warning for string constants not being referred to
  as const in fmod_error.h

Fix for DEV-39457. Reviewed by moss.
parent 92cccb97
No related branches found
No related tags found
No related merge requests found
...@@ -90,7 +90,7 @@ bool translate_init(std::string comma_delim_path_list, ...@@ -90,7 +90,7 @@ bool translate_init(std::string comma_delim_path_list,
// extract paths string vector from comma-delimited flat string // extract paths string vector from comma-delimited flat string
std::vector<std::string> paths; std::vector<std::string> paths;
LLStringUtil::getTokens(comma_delim_path_list, paths); // split over ',' LLStringUtil::getTokens(comma_delim_path_list, paths, ","); // split over ','
// suck the translation xml files into memory // suck the translation xml files into memory
LLXMLNodePtr root; LLXMLNodePtr root;
......
...@@ -62,7 +62,8 @@ if (FMOD) ...@@ -62,7 +62,8 @@ if (FMOD)
if (LINUX) if (LINUX)
if (${CXX_VERSION} MATCHES "4.[23]") if (${CXX_VERSION} MATCHES "4.[23]")
set_source_files_properties(llaudioengine_fmod.cpp set_source_files_properties(llaudioengine_fmod.cpp
COMPILE_FLAGS -Wno-error=write-strings) llstreamingaudio_fmod.cpp
COMPILE_FLAGS -Wno-write-strings)
endif (${CXX_VERSION} MATCHES "4.[23]") endif (${CXX_VERSION} MATCHES "4.[23]")
endif (LINUX) endif (LINUX)
endif (FMOD) endif (FMOD)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment