[ros-diffs] [rharabien] 51534: [CMAKE] * Add sndrec32 to build * Fix build of mmc

Author: rharabien
Date: Sun May  1 16:27:17 2011
New Revision: 51534

URL: http://svn.reactos.org/svn/reactos?rev=51534&view=rev
Log:
[CMAKE]
* Add sndrec32 to build
* Fix build of mmc

Modified:
    branches/cmake-bringup/base/applications/CMakeLists.txt
    branches/cmake-bringup/base/applications/mmc/lang/sv-SE.rc
    branches/cmake-bringup/base/applications/sndrec32/CMakeLists.txt
    branches/cmake-bringup/base/applications/sndrec32/sndrec32.cpp

Modified: branches/cmake-bringup/base/applications/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] Sun May  1
16:27:17 2011
@@ -28,7 +28,7 @@
 add_subdirectory(sc)
 add_subdirectory(screensavers)
 add_subdirectory(shutdown)
-#add_subdirectory(sndrec32)
+add_subdirectory(sndrec32)
 add_subdirectory(sndvol32)
 add_subdirectory(taskmgr)
 add_subdirectory(winhlp32)

Modified: branches/cmake-bringup/base/applications/mmc/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/mmc/lang/sv-SE.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/mmc/lang/sv-SE.rc [iso-8859-1] Sun May  1
16:27:17 2011
@@ -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

Modified: branches/cmake-bringup/base/applications/sndrec32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/sndrec32/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] Sun May 
1 16:27:17 2011
@@ -1,3 +1,7 @@
+
+set_unicode()
+set_cpp()
+set_rc_compiler()
 
 add_executable(sndrec32
     audio_format.cpp
@@ -12,4 +16,4 @@
 
 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)

Modified: branches/cmake-bringup/base/applications/sndrec32/sndrec32.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/sndrec32/sndrec32.cpp [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] Sun May  1
16:27:17 2011
@@ -462,7 +462,7 @@
 
                 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 )