From 6466d12e9b1876bc8ae84e3f5230a439bed644e6 Mon Sep 17 00:00:00 2001 From: Rafal Harabien Date: Sun, 1 May 2011 16:27:17 +0000 Subject: [PATCH] [CMAKE] * Add sndrec32 to build * Fix build of mmc svn path=/branches/cmake-bringup/; revision=51534 --- base/applications/CMakeLists.txt | 2 +- base/applications/mmc/lang/sv-SE.rc | 8 +++++++- base/applications/sndrec32/CMakeLists.txt | 6 +++++- base/applications/sndrec32/sndrec32.cpp | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt index d98d392d217..7ff5a0bc294 100644 --- a/base/applications/CMakeLists.txt +++ b/base/applications/CMakeLists.txt @@ -28,7 +28,7 @@ add_subdirectory(regedt32) add_subdirectory(sc) add_subdirectory(screensavers) add_subdirectory(shutdown) -#add_subdirectory(sndrec32) +add_subdirectory(sndrec32) add_subdirectory(sndvol32) add_subdirectory(taskmgr) add_subdirectory(winhlp32) diff --git a/base/applications/mmc/lang/sv-SE.rc b/base/applications/mmc/lang/sv-SE.rc index cefb5e91c68..aad29a76fed 100644 --- a/base/applications/mmc/lang/sv-SE.rc +++ b/base/applications/mmc/lang/sv-SE.rc @@ -1,4 +1,10 @@ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +/* + * PROJECT: ReactOS RAPPS + * FILE: \base\applications\mmc\lang\sv-SE.rc + * PURPOSE: Swedish resource file + * Translation: Jaix Bly + */ +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDM_CONSOLEROOT MENU DISCARDABLE BEGIN diff --git a/base/applications/sndrec32/CMakeLists.txt b/base/applications/sndrec32/CMakeLists.txt index d2a765a90ec..dc2de05087b 100644 --- a/base/applications/sndrec32/CMakeLists.txt +++ b/base/applications/sndrec32/CMakeLists.txt @@ -1,4 +1,8 @@ +set_unicode() +set_cpp() +set_rc_compiler() + add_executable(sndrec32 audio_format.cpp audio_membuffer.cpp @@ -12,4 +16,4 @@ add_executable(sndrec32 target_link_libraries(sndrec32 stlport) set_module_type(sndrec32 win32gui) -add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt) +add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt kernel32) diff --git a/base/applications/sndrec32/sndrec32.cpp b/base/applications/sndrec32/sndrec32.cpp index 3e0f4a720f7..830e232ce63 100644 --- a/base/applications/sndrec32/sndrec32.cpp +++ b/base/applications/sndrec32/sndrec32.cpp @@ -462,7 +462,7 @@ WndProc_wave( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) x = ( i * samples ) / WAVEBAR_CX; - line_h = ( abs(AUD_OUT->nsample( x )) * max_h ) / AUD_OUT->samplevalue_max(); + line_h = ( AUD_OUT->nsample( x ) * max_h ) / AUD_OUT->samplevalue_max(); if ( line_h ) -- 2.17.1