[CMAKE]

Livecd: Add dlls that aren't win32dll modules.

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

diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt
index 50fb984..b7e1f33 100644 (file)
--- a/dll/ntdll/CMakeLists.txt
+++ b/dll/ntdll/CMakeLists.txt
@@ -45,4 +45,5 @@ target_link_libraries(ntdll ${CMAKE_CURRENT_SOURCE_DIR}/def/ntdll.def
 add_pch(ntdll ${CMAKE_CURRENT_SOURCE_DIR}/include/ntdll.h ${SOURCE})
 add_dependencies(ntdll ntstatus version)
 
-add_minicd_target(ntdll reactos/system32 ntdll.dll)
\ No newline at end of file
+add_minicd_target(ntdll reactos/system32 ntdll.dll)
+add_livecd_target(ntdll reactos/system32)
\ No newline at end of file

diff --git a/dll/win32/beepmidi/CMakeLists.txt b/dll/win32/beepmidi/CMakeLists.txt
index cf85284..5042bfb 100644 (file)
--- a/dll/win32/beepmidi/CMakeLists.txt
+++ b/dll/win32/beepmidi/CMakeLists.txt
@@ -11,3 +11,4 @@ target_link_libraries(beepmidi ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def)
 
 add_importlibs(beepmidi winmm kernel32 ntdll)
 add_dependencies(beepmidi beepmidi_def psdk)
+add_livecd_target(beepmidi reactos/system32)
\ No newline at end of file

diff --git a/dll/win32/dnsapi/CMakeLists.txt b/dll/win32/dnsapi/CMakeLists.txt
index fa42c86..c0c5e8c 100644 (file)
--- a/dll/win32/dnsapi/CMakeLists.txt
+++ b/dll/win32/dnsapi/CMakeLists.txt
@@ -32,3 +32,4 @@ target_link_libraries(dnsapi
 add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll)
 add_pch(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi/precomp.h ${SOURCE})
 add_dependencies(dnsapi dnsapi_def psdk buildno_header)
+add_livecd_target(dnsapi reactos/system32)
\ No newline at end of file

diff --git a/dll/win32/lsasrv/CMakeLists.txt b/dll/win32/lsasrv/CMakeLists.txt
index 50cb137..2667558 100644 (file)
--- a/dll/win32/lsasrv/CMakeLists.txt
+++ b/dll/win32/lsasrv/CMakeLists.txt
@@ -24,3 +24,4 @@ target_link_libraries(lsasrv
 
 add_importlibs(lsasrv rpcrt4 kernel32 ntdll)
 add_dependencies(lsasrv lsasrv_def  psdk buildno_header)
+add_livecd_target(lsasrv reactos/system32)
\ No newline at end of file

diff --git a/dll/win32/lz32/CMakeLists.txt b/dll/win32/lz32/CMakeLists.txt
index 4417a3d..df0142b 100644 (file)
--- a/dll/win32/lz32/CMakeLists.txt
+++ b/dll/win32/lz32/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(lz32
 
 add_importlibs(lz32 kernel32 ntdll)
 add_dependencies(lz32 lz32_def psdk buildno_header)
+add_livecd_target(lz32 reactos/system32)
\ No newline at end of file

diff --git a/dll/win32/mlang/CMakeLists.txt b/dll/win32/mlang/CMakeLists.txt
index a31ec82..f71107e 100644 (file)
--- a/dll/win32/mlang/CMakeLists.txt
+++ b/dll/win32/mlang/CMakeLists.txt
@@ -24,4 +24,5 @@ add_importlibs(mlang
     kernel32
     ntdll)
 
-add_dependencies(mlang mlang_def  psdk buildno_header)
+add_dependencies(mlang mlang_def psdk buildno_header)
+add_livecd_target(mlang reactos/system32)
\ No newline at end of file

diff --git a/dll/win32/msacm32/msacm32.drv/CMakeLists.txt b/dll/win32/msacm32/msacm32.drv/CMakeLists.txt
index 663065f..adcd1b0 100644 (file)
--- a/dll/win32/msacm32/msacm32.drv/CMakeLists.txt
+++ b/dll/win32/msacm32/msacm32.drv/CMakeLists.txt
@@ -21,3 +21,4 @@ target_link_libraries(msacm32.drv
 
 add_importlibs(msacm32.drv msacm32 user32 winmm advapi32 kernel32 ntdll)
 add_dependencies(msacm32.drv msacm32.drv_def psdk buildno_header)
+add_livecd_target(msacm32.drv reactos/system32)
\ No newline at end of file

diff --git a/dll/win32/olecli32/CMakeLists.txt b/dll/win32/olecli32/CMakeLists.txt
index c4d0284..4ccde1d 100644 (file)
--- a/dll/win32/olecli32/CMakeLists.txt
+++ b/dll/win32/olecli32/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(olecli32
 
 add_importlibs(olecli32 ole32 gdi32 kernel32 ntdll)
 add_dependencies(olecli32 olecli32_def psdk buildno_header)
+add_livecd_target(olecli32 reactos/system32)
\ No newline at end of file

diff --git a/dll/win32/olesvr32/CMakeLists.txt b/dll/win32/olesvr32/CMakeLists.txt
index 19a24b4..eabc8e0 100644 (file)
--- a/dll/win32/olesvr32/CMakeLists.txt
+++ b/dll/win32/olesvr32/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(olesvr32
 
 add_importlibs(olesvr32 kernel32 ntdll)
 add_dependencies(olesvr32 olesvr32_def psdk buildno_header)
+add_livecd_target(olesvr32 reactos/system32)
\ No newline at end of file

diff --git a/dll/win32/version/CMakeLists.txt b/dll/win32/version/CMakeLists.txt
index 2b7f639..b6b0eaa 100644 (file)
--- a/dll/win32/version/CMakeLists.txt
+++ b/dll/win32/version/CMakeLists.txt
@@ -18,3 +18,4 @@ target_link_libraries(version
 
 add_importlibs(version lz32 kernel32 ntdll)
 add_dependencies(version version_def psdk buildno_header)
+add_livecd_target(version reactos/system32)
\ No newline at end of file

diff --git a/dll/win32/winmm/midimap/CMakeLists.txt b/dll/win32/winmm/midimap/CMakeLists.txt
index 91d911e..e1561dc 100644 (file)
--- a/dll/win32/winmm/midimap/CMakeLists.txt
+++ b/dll/win32/winmm/midimap/CMakeLists.txt
@@ -13,3 +13,4 @@ target_link_libraries(midimap
 
 add_importlibs(midimap kernel32 uuid ntdll advapi32 user32 winmm)
 add_dependencies(midimap midimap_def psdk)
+add_livecd_target(midimap reactos/system32)
\ No newline at end of file

diff --git a/dll/win32/winspool/CMakeLists.txt b/dll/win32/winspool/CMakeLists.txt
index e7de322..8476e15 100644 (file)
--- a/dll/win32/winspool/CMakeLists.txt
+++ b/dll/win32/winspool/CMakeLists.txt
@@ -10,8 +10,8 @@ add_library(winspool SHARED
     stubs.c
     winspool.rc)
 
-set_module_type(winspool win32dll)
 set_target_properties(winspool PROPERTIES SUFFIX ".drv")
+set_module_type(winspool win32dll)
 
 target_link_libraries(winspool
     ${CMAKE_CURRENT_BINARY_DIR}/winspool.def
@@ -19,3 +19,4 @@ target_link_libraries(winspool
 
 add_importlibs(winspool advapi32 shlwapi kernel32 ntdll)
 add_dependencies(winspool winspool_def)
+#add_livecd_target(winspool reactos/system32 winspool.drv)