[ros-diffs] [akhaldi] 48995: [CMAKE] - Improve mciwave and mmdrv.

Author: akhaldi
Date: Tue Oct  5 12:43:23 2010
New Revision: 48995

URL: http://svn.reactos.org/svn/reactos?rev=48995&view=rev
Log:
[CMAKE]
- Improve mciwave and mmdrv.

Modified:
    branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt
    branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt

Modified: branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciwave…
==============================================================================
--- branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] Tue Oct  5
12:43:23 2010
@@ -1,5 +1,3 @@
-
-
 
 add_definitions(-D__WINESRC__)
 add_definitions(-D_DLL -D__USE_CRTIMP)
@@ -11,14 +9,11 @@
 
 add_library(mciwave SHARED mciwave.c)
 
-set_target_properties(mciwave PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+set_entrypoint(mciwave 0)
 
 target_link_libraries(mciwave
     ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def
-    wine
-    -lwinmm
-    mingw_common
-    -luser32
-    -lmsvcrt)
+    wine)
 
-add_dependencies(mciwave mciwave_def psdk)
+add_importlibs(mciwave winmm user32 msvcrt kernel32 ntdll)
+add_dependencies(mciwave mciwave_def psdk buildno_header)

Modified: branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mmdrv/C…
==============================================================================
--- branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt [iso-8859-1] Tue Oct  5 12:43:23
2010
@@ -1,8 +1,7 @@
 
-
+set_unicode()
 
 add_definitions(-DNDEBUG)
-add_definitions(-DUNICODE -D_UNICODE)
 
 spec2def(mmdrv ${CMAKE_CURRENT_SOURCE_DIR}/mmdrv.spec
${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def)
 
@@ -15,12 +14,9 @@
     wave.c
     wave_io.c)
 
-set_target_properties(mmdrv PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+set_entrypoint(mmdrv 0)
 
-target_link_libraries(mmdrv
-    ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def
-    -lwinmm
-    -luser32
-    -lkernel32)
+target_link_libraries(mmdrv ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def)
 
-add_dependencies(mmdrv mmdrv_def psdk)
+add_importlibs(mmdrv winmm user32 kernel32 ntdll)
+add_dependencies(mmdrv mmdrv_def psdk buildno_header)