diff --git a/indra/media_plugins/winmmshim/CMakeLists.txt b/indra/media_plugins/winmmshim/CMakeLists.txt index d35e97fc62e1b4ed7c150fd147be302f6b1cd619..387214088f16f474ab4582827d5304d6e4ad1cb6 100644 --- a/indra/media_plugins/winmmshim/CMakeLists.txt +++ b/indra/media_plugins/winmmshim/CMakeLists.txt @@ -29,6 +29,6 @@ if (WINDOWS) winmm_shim PROPERTIES LINK_FLAGS "/MANIFEST:NO" - OUTPUT_NAME "winmm" + OUTPUT_NAME "winmm" ) endif (WINDOWS) diff --git a/indra/media_plugins/winmmshim/forwarding_api.cpp b/indra/media_plugins/winmmshim/forwarding_api.cpp index aaa229fe9db77390b860858b0ea8d7ad63679d37..17bffdd850ce6c645f7b948e683c6d25f0f18828 100644 --- a/indra/media_plugins/winmmshim/forwarding_api.cpp +++ b/indra/media_plugins/winmmshim/forwarding_api.cpp @@ -1457,4 +1457,4 @@ extern "C" { //OutputDebugString(L"mciExecute\n"); return mciExecute_orig(pszCommand); } -} \ No newline at end of file +} diff --git a/indra/media_plugins/winmmshim/winmm_shim.cpp b/indra/media_plugins/winmmshim/winmm_shim.cpp index a46d908962811a0fee128ed1898b749decd12c75..974744333aeba024384add68915968f8dad01937 100644 --- a/indra/media_plugins/winmmshim/winmm_shim.cpp +++ b/indra/media_plugins/winmmshim/winmm_shim.cpp @@ -175,4 +175,4 @@ extern "C" { sMute = mute; } -} \ No newline at end of file +} diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 653dbefa18630940a050233ce25842056fc13282..668e21c25302c35aa1b0b075904dc391b377a9cf 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -332,7 +332,7 @@ def construct(self): self.path("media_plugin_webkit.dll") self.end_prefix() - # winmm.dll shim + # winmm.dll shim if self.prefix(src='../media_plugins/winmmshim/%s' % self.args['configuration'], dst="llplugin"): self.path("winmm.dll") self.end_prefix()