[CMAKE]

- Start adding proper import lib targets.
- Improve some modules.

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

diff --git a/dll/win32/glu32/CMakeLists.txt b/dll/win32/glu32/CMakeLists.txt
index 9162a2e..496cd30 100644 (file)
--- a/dll/win32/glu32/CMakeLists.txt
+++ b/dll/win32/glu32/CMakeLists.txt
@@ -109,11 +109,9 @@ add_library(glu32 SHARED
 
 set_entrypoint(glu32 0)
 
-target_link_libraries(glu32 stlport -lsupc++ -lgcc)
+target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 -lcoldname)
 
 add_importlibs(glu32
-    mingw32
-    coldname
     opengl32
     gdi32
     msvcrt
@@ -122,3 +120,4 @@ add_importlibs(glu32
 
 add_cab_target(glu32 1)
 add_importlib_target(glu32.spec)
+

diff --git a/dll/win32/rsaenh/CMakeLists.txt b/dll/win32/rsaenh/CMakeLists.txt
index 95353db..e8c15ec 100644 (file)
--- a/dll/win32/rsaenh/CMakeLists.txt
+++ b/dll/win32/rsaenh/CMakeLists.txt
@@ -30,4 +30,7 @@ target_link_libraries(rsaenh wine)
 
 add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll)
 
+add_importlib_target(rsaenh.spec)
+
 add_cab_target(rsaenh 1)
+

diff --git a/dll/win32/winmm/midimap/CMakeLists.txt b/dll/win32/winmm/midimap/CMakeLists.txt
index c382101..84c41bc 100644 (file)
--- a/dll/win32/winmm/midimap/CMakeLists.txt
+++ b/dll/win32/winmm/midimap/CMakeLists.txt
@@ -3,13 +3,16 @@ add_definitions(-DUNICODE -D_UNICODE)
 
 spec2def(midimap.dll midimap.spec)
 
-add_library(midimap SHARED midimap.c midimap.rc
+add_library(midimap SHARED
+    midimap.c
+    midimap.rc
     ${CMAKE_CURRENT_BINARY_DIR}/midimap.def)
 
 set_entrypoint(midimap 0)
 
-target_link_libraries(midimap wine)
+target_link_libraries(midimap uuid wine)
 
-add_importlibs(midimap kernel32 uuid ntdll advapi32 user32 winmm)
+add_importlibs(midimap advapi32 user32 winmm kernel32 ntdll)
 add_dependencies(midimap psdk)
-add_cab_target(midimap 1)
\ No newline at end of file
+add_cab_target(midimap 1)
+

diff --git a/dll/win32/wintrust/CMakeLists.txt b/dll/win32/wintrust/CMakeLists.txt
index 620ca26..d083842 100644 (file)
--- a/dll/win32/wintrust/CMakeLists.txt
+++ b/dll/win32/wintrust/CMakeLists.txt
@@ -24,4 +24,7 @@ target_link_libraries(wintrust
 
 add_importlibs(wintrust crypt32 cryptui user32 advapi32 imagehlp msvcrt kernel32 ntdll)
 
+add_importlib_target(wintrust.spec)
+
 add_cab_target(wintrust 1)
+