[CMAKE]

- Improve mciwave and mmdrv.

svn path=/branches/cmake-bringup/; revision=48995

diff --git a/dll/win32/mciwave/CMakeLists.txt b/dll/win32/mciwave/CMakeLists.txt
index 8388944..cefe133 100644 (file)
--- a/dll/win32/mciwave/CMakeLists.txt
+++ b/dll/win32/mciwave/CMakeLists.txt
@@ -1,6 +1,4 @@
 
 

-
-

 add_definitions(-D__WINESRC__)
 add_definitions(-D_DLL -D__USE_CRTIMP)
 add_definitions(-D_WINE)
 add_definitions(-D__WINESRC__)
 add_definitions(-D_DLL -D__USE_CRTIMP)
 add_definitions(-D_WINE)


@@ -11,14 +9,11 @@ spec2def(mciwave ${CMAKE_CURRENT_SOURCE_DIR}/mciwave.spec ${CMAKE_CURRENT_BINARY
 
 add_library(mciwave SHARED mciwave.c)
 
 
 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
 
 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)

diff --git a/dll/win32/mmdrv/CMakeLists.txt b/dll/win32/mmdrv/CMakeLists.txt
index f0f6938..ba3db14 100644 (file)
--- a/dll/win32/mmdrv/CMakeLists.txt
+++ b/dll/win32/mmdrv/CMakeLists.txt
@@ -1,8 +1,7 @@
 
 

-
+set_unicode()

 
 add_definitions(-DNDEBUG)
 
 add_definitions(-DNDEBUG)

-add_definitions(-DUNICODE -D_UNICODE)

 
 spec2def(mmdrv ${CMAKE_CURRENT_SOURCE_DIR}/mmdrv.spec ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def)
 
 
 spec2def(mmdrv ${CMAKE_CURRENT_SOURCE_DIR}/mmdrv.spec ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def)
 


@@ -15,12 +14,9 @@ add_library(mmdrv SHARED
     wave.c
     wave_io.c)
 
     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)