[CMAKE]

- Improve several modules.

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

diff --git a/base/applications/cacls/CMakeLists.txt b/base/applications/cacls/CMakeLists.txt
index ad3cb2a..5be71ef 100644 (file)
--- a/base/applications/cacls/CMakeLists.txt
+++ b/base/applications/cacls/CMakeLists.txt
@@ -11,5 +11,4 @@ add_pch(cacls ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(cacls win32cui)
 add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32)
-
-add_cab_target(cacls 1)
\ No newline at end of file
+add_cab_target(cacls 1)

diff --git a/base/applications/calc/CMakeLists.txt b/base/applications/calc/CMakeLists.txt
index f061578..64dcdc9 100644 (file)
--- a/base/applications/calc/CMakeLists.txt
+++ b/base/applications/calc/CMakeLists.txt
@@ -18,4 +18,4 @@ if(MSVC)
 add_importlibs(calc ntdll)
 endif()
 
-add_cab_target(calc 1)
\ No newline at end of file
+add_cab_target(calc 1)

diff --git a/base/applications/charmap/CMakeLists.txt b/base/applications/charmap/CMakeLists.txt
index c4357f5..37398c0 100644 (file)
--- a/base/applications/charmap/CMakeLists.txt
+++ b/base/applications/charmap/CMakeLists.txt
@@ -18,4 +18,4 @@ set_module_type(charmap win32gui)
 
 add_importlibs(charmap user32 gdi32 comctl32 kernel32 msvcrt)
 
-add_cab_target(charmap 1)
\ No newline at end of file
+add_cab_target(charmap 1)

diff --git a/base/applications/cmdutils/dbgprint/CMakeLists.txt b/base/applications/cmdutils/dbgprint/CMakeLists.txt
index c1b49ce..5a3ce00 100644 (file)
--- a/base/applications/cmdutils/dbgprint/CMakeLists.txt
+++ b/base/applications/cmdutils/dbgprint/CMakeLists.txt
@@ -1,7 +1,5 @@
 
 add_executable(dbgprint dbgprint.c)
-
 set_module_type(dbgprint win32cui)
 add_importlibs(dbgprint msvcrt kernel32)
-
-add_cab_target(dbgprint 1)
\ No newline at end of file
+add_cab_target(dbgprint 1)

diff --git a/base/applications/cmdutils/doskey/CMakeLists.txt b/base/applications/cmdutils/doskey/CMakeLists.txt
index d34b602..eeeac85 100644 (file)
--- a/base/applications/cmdutils/doskey/CMakeLists.txt
+++ b/base/applications/cmdutils/doskey/CMakeLists.txt
@@ -5,5 +5,4 @@ add_executable(doskey doskey.c doskey.rc)
 
 set_module_type(doskey win32cui)
 add_importlibs(doskey user32 msvcrt kernel32)
-
-add_cab_target(doskey 1)
\ No newline at end of file
+add_cab_target(doskey 1)

diff --git a/base/applications/cmdutils/find/CMakeLists.txt b/base/applications/cmdutils/find/CMakeLists.txt
index d7ea386..30acb79 100644 (file)
--- a/base/applications/cmdutils/find/CMakeLists.txt
+++ b/base/applications/cmdutils/find/CMakeLists.txt
@@ -4,5 +4,4 @@ add_executable(find find.c find.rc)
 
 set_module_type(find win32cui)
 add_importlibs(find user32 msvcrt kernel32)
-
-add_cab_target(find 1)
\ No newline at end of file
+add_cab_target(find 1)

diff --git a/base/applications/cmdutils/hostname/CMakeLists.txt b/base/applications/cmdutils/hostname/CMakeLists.txt
index c40f792..5c715b7 100644 (file)
--- a/base/applications/cmdutils/hostname/CMakeLists.txt
+++ b/base/applications/cmdutils/hostname/CMakeLists.txt
@@ -4,5 +4,4 @@ add_executable(hostname hostname.c hostname.rc)
 
 set_module_type(hostname win32cui)
 add_importlibs(hostname msvcrt kernel32)
-
-add_cab_target(hostname 1)
\ No newline at end of file
+add_cab_target(hostname 1)

diff --git a/base/applications/cmdutils/lodctr/CMakeLists.txt b/base/applications/cmdutils/lodctr/CMakeLists.txt
index d466f12..2495c35 100644 (file)
--- a/base/applications/cmdutils/lodctr/CMakeLists.txt
+++ b/base/applications/cmdutils/lodctr/CMakeLists.txt
@@ -5,5 +5,4 @@ add_executable(lodctr lodctr_main.c)
 
 set_module_type(lodctr win32cui)
 add_importlibs(lodctr loadperf msvcrt kernel32)
-
-add_cab_target(lodctr 1)
\ No newline at end of file
+add_cab_target(lodctr 1)

diff --git a/base/applications/cmdutils/more/CMakeLists.txt b/base/applications/cmdutils/more/CMakeLists.txt
index 0efd498..2b8deb1 100644 (file)
--- a/base/applications/cmdutils/more/CMakeLists.txt
+++ b/base/applications/cmdutils/more/CMakeLists.txt
@@ -3,5 +3,4 @@ add_executable(more more.c more.rc)
 
 set_module_type(more win32cui)
 add_importlibs(more user32 msvcrt kernel32)
-
-add_cab_target(more 1)
\ No newline at end of file
+add_cab_target(more 1)

diff --git a/base/applications/cmdutils/reg/CMakeLists.txt b/base/applications/cmdutils/reg/CMakeLists.txt
index ea415fd..4e7fddb 100644 (file)
--- a/base/applications/cmdutils/reg/CMakeLists.txt
+++ b/base/applications/cmdutils/reg/CMakeLists.txt
@@ -8,5 +8,4 @@ add_executable(reg reg.c rsrc.rc)
 
 set_module_type(reg win32cui)
 add_importlibs(reg advapi32 user32 msvcrt kernel32)
-
-add_cab_target(reg 1)
\ No newline at end of file
+add_cab_target(reg 1)

diff --git a/base/applications/cmdutils/xcopy/CMakeLists.txt b/base/applications/cmdutils/xcopy/CMakeLists.txt
index b073b29..7624c0c 100644 (file)
--- a/base/applications/cmdutils/xcopy/CMakeLists.txt
+++ b/base/applications/cmdutils/xcopy/CMakeLists.txt
@@ -7,5 +7,4 @@ target_link_libraries(xcopy wine)
 
 set_module_type(xcopy win32cui)
 add_importlibs(xcopy shell32 user32 msvcrt kernel32 ntdll)
-
-add_cab_target(xcopy 1)
\ No newline at end of file
+add_cab_target(xcopy 1)

diff --git a/base/applications/control/CMakeLists.txt b/base/applications/control/CMakeLists.txt
index a0b7157..c0d005b 100644 (file)
--- a/base/applications/control/CMakeLists.txt
+++ b/base/applications/control/CMakeLists.txt
@@ -5,5 +5,4 @@ add_executable(control control.c control.rc)
 
 set_module_type(control win32gui)
 add_importlibs(control advapi32 shell32 msvcrt kernel32)
-
-add_cab_target(control 1)
\ No newline at end of file
+add_cab_target(control 1)

diff --git a/base/applications/dxdiag/CMakeLists.txt b/base/applications/dxdiag/CMakeLists.txt
index 4dc4f13..ad4f120 100644 (file)
--- a/base/applications/dxdiag/CMakeLists.txt
+++ b/base/applications/dxdiag/CMakeLists.txt
@@ -29,4 +29,4 @@ target_link_libraries(dxdiag dxguid)
 
 add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32)
 
-add_cab_target(dxdiag 1)
\ No newline at end of file
+add_cab_target(dxdiag 1)

diff --git a/base/applications/extrac32/CMakeLists.txt b/base/applications/extrac32/CMakeLists.txt
index 77bc997..1770afa 100644 (file)
--- a/base/applications/extrac32/CMakeLists.txt
+++ b/base/applications/extrac32/CMakeLists.txt
@@ -7,5 +7,4 @@ target_link_libraries(extrac32 wine)
 
 set_module_type(extrac32 win32gui)
 add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt kernel32 ntdll)
-
-add_cab_target(extrac32 1)
\ No newline at end of file
+add_cab_target(extrac32 1)

diff --git a/base/applications/fontview/CMakeLists.txt b/base/applications/fontview/CMakeLists.txt
index 2bf3aa9..933f804 100644 (file)
--- a/base/applications/fontview/CMakeLists.txt
+++ b/base/applications/fontview/CMakeLists.txt
@@ -7,4 +7,4 @@ add_executable(fontview
 set_module_type(fontview win32gui)
 add_importlibs(fontview gdi32 shell32 user32 msvcrt kernel32)
 
-add_cab_target(fontview 1)
\ No newline at end of file
+add_cab_target(fontview 1)

diff --git a/base/applications/games/solitaire/CMakeLists.txt b/base/applications/games/solitaire/CMakeLists.txt
index ff3729c..6050d8c 100644 (file)
--- a/base/applications/games/solitaire/CMakeLists.txt
+++ b/base/applications/games/solitaire/CMakeLists.txt
@@ -16,4 +16,4 @@ set_module_type(sol win32gui)
 
 add_importlibs(sol advapi32 comctl32 user32 gdi32 kernel32 msvcrt)
 
-add_cab_target(sol 1)
\ No newline at end of file
+add_cab_target(sol 1)

diff --git a/base/applications/games/spider/CMakeLists.txt b/base/applications/games/spider/CMakeLists.txt
index 9bd5126..acbd76f 100644 (file)
--- a/base/applications/games/spider/CMakeLists.txt
+++ b/base/applications/games/spider/CMakeLists.txt
@@ -17,4 +17,4 @@ set_module_type(spider win32gui)
 
 add_importlibs(spider advapi32 comctl32 user32 gdi32 kernel32 msvcrt)
 
-add_cab_target(spider 1)
\ No newline at end of file
+add_cab_target(spider 1)

diff --git a/base/applications/games/winmine/CMakeLists.txt b/base/applications/games/winmine/CMakeLists.txt
index 9870ec7..63d7e6e 100644 (file)
--- a/base/applications/games/winmine/CMakeLists.txt
+++ b/base/applications/games/winmine/CMakeLists.txt
@@ -12,4 +12,4 @@ set_module_type(winmine win32gui)
 target_link_libraries(winmine wine)
 add_importlibs(winmine user32 gdi32 advapi32 shell32 msvcrt kernel32 ntdll)
 
-add_cab_target(winmine 1)
\ No newline at end of file
+add_cab_target(winmine 1)

diff --git a/base/applications/hh/CMakeLists.txt b/base/applications/hh/CMakeLists.txt
index 57eda59..48ad8f2 100644 (file)
--- a/base/applications/hh/CMakeLists.txt
+++ b/base/applications/hh/CMakeLists.txt
@@ -1,7 +1,5 @@
 
 add_executable(hh main.c hh.rc)
-
 set_module_type(hh win32gui)
 add_importlibs(hh gdi32 user32 msvcrt kernel32)
-
-add_cab_target(hh 4)
\ No newline at end of file
+add_cab_target(hh 4)

diff --git a/base/applications/iexplore/CMakeLists.txt b/base/applications/iexplore/CMakeLists.txt
index e4693fe..50b5f9f 100644 (file)
--- a/base/applications/iexplore/CMakeLists.txt
+++ b/base/applications/iexplore/CMakeLists.txt
@@ -1,7 +1,5 @@
 
 add_executable(iexplore main.c iexplore.rc)
-
 set_module_type(iexplore win32gui)
 add_importlibs(iexplore shdocvw msvcrt kernel32)
-
-add_cab_target(iexplore 4)
\ No newline at end of file
+add_cab_target(iexplore 4)

diff --git a/base/applications/kbswitch/kbsdll/CMakeLists.txt b/base/applications/kbswitch/kbsdll/CMakeLists.txt
index 1fea660..135969e 100644 (file)
--- a/base/applications/kbswitch/kbsdll/CMakeLists.txt
+++ b/base/applications/kbswitch/kbsdll/CMakeLists.txt
@@ -1,11 +1,15 @@
 
 set_unicode()
 
-add_library(kbsdll SHARED kbsdll.c kbsdll.rc ${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def)
-
 spec2def(kbsdll.dll kbsdll.spec)
 
+list(APPEND SOURCE
+    kbsdll.c
+    kbsdll.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def)
+
+add_library(kbsdll SHARED ${SOURCE})
+
 set_module_type(kbsdll win32dll)
 add_importlibs(kbsdll user32 comctl32 kernel32 msvcrt)
-
 add_cab_target(kbsdll 1)

diff --git a/base/applications/logoff/CMakeLists.txt b/base/applications/logoff/CMakeLists.txt
index 35dd240..c7cbb7f 100644 (file)
--- a/base/applications/logoff/CMakeLists.txt
+++ b/base/applications/logoff/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
 list(APPEND SOURCE
@@ -10,7 +11,5 @@ add_executable(logoff ${CMAKE_CURRENT_BINARY_DIR}/logoff_precomp.h.gch ${SOURCE}
 add_pch(logoff ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(logoff win32cui)
-
 add_importlibs(logoff advapi32 user32 msvcrt kernel32)
-
-add_cab_target(logoff 1)
\ No newline at end of file
+add_cab_target(logoff 1)

diff --git a/base/applications/magnify/CMakeLists.txt b/base/applications/magnify/CMakeLists.txt
index 80544f3..e73c2ad 100644 (file)
--- a/base/applications/magnify/CMakeLists.txt
+++ b/base/applications/magnify/CMakeLists.txt
@@ -5,7 +5,5 @@ add_executable(magnify
     magnify.rc)
 
 set_module_type(magnify win32gui)
-
 add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt kernel32)
-
-add_cab_target(magnify 1)
\ No newline at end of file
+add_cab_target(magnify 1)

diff --git a/base/applications/mmc/CMakeLists.txt b/base/applications/mmc/CMakeLists.txt
index 28ed849..670e729 100644 (file)
--- a/base/applications/mmc/CMakeLists.txt
+++ b/base/applications/mmc/CMakeLists.txt
@@ -12,5 +12,4 @@ add_executable(mmcclient ${CMAKE_CURRENT_BINARY_DIR}/mmcclient_precomp.h.gch ${S
 add_pch(mmcclient ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(mmcclient win32gui)
-
 add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32)

diff --git a/base/applications/mplay32/CMakeLists.txt b/base/applications/mplay32/CMakeLists.txt
index 0fcf3d7..8c55c45 100644 (file)
--- a/base/applications/mplay32/CMakeLists.txt
+++ b/base/applications/mplay32/CMakeLists.txt
@@ -4,7 +4,5 @@ set_unicode()
 add_executable(mplay32 mplay32.c mplay32.rc)
 
 set_module_type(mplay32 win32gui)
-
 add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt kernel32)
-
-add_cab_target(mplay32 1)
\ No newline at end of file
+add_cab_target(mplay32 1)

diff --git a/base/applications/msconfig/CMakeLists.txt b/base/applications/msconfig/CMakeLists.txt
index d726c2b..5a87023 100644 (file)
--- a/base/applications/msconfig/CMakeLists.txt
+++ b/base/applications/msconfig/CMakeLists.txt
@@ -16,7 +16,5 @@ add_executable(msconfig ${CMAKE_CURRENT_BINARY_DIR}/msconfig_precomp.h.gch ${SOU
 add_pch(msconfig ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(msconfig win32gui)
-
 add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32)
-
-add_cab_target(msconfig 1)
\ No newline at end of file
+add_cab_target(msconfig 1)

diff --git a/base/applications/mscutils/devmgmt/CMakeLists.txt b/base/applications/mscutils/devmgmt/CMakeLists.txt
index f4c8f15..26d97b2 100644 (file)
--- a/base/applications/mscutils/devmgmt/CMakeLists.txt
+++ b/base/applications/mscutils/devmgmt/CMakeLists.txt
@@ -14,7 +14,5 @@ add_executable(devmgmt ${CMAKE_CURRENT_BINARY_DIR}/devmgmt_precomp.h.gch ${SOURC
 add_pch(devmgmt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(devmgmt win32gui)
-
 add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32)
-
-add_cab_target(devmgmt 1)
\ No newline at end of file
+add_cab_target(devmgmt 1)

diff --git a/base/applications/mscutils/eventvwr/CMakeLists.txt b/base/applications/mscutils/eventvwr/CMakeLists.txt
index 9b11332..0e138af 100644 (file)
--- a/base/applications/mscutils/eventvwr/CMakeLists.txt
+++ b/base/applications/mscutils/eventvwr/CMakeLists.txt
@@ -10,4 +10,4 @@ if(MSVC)
 add_importlibs(eventvwr ntdll)
 endif()
 
-add_cab_target(eventvwr 1)
\ No newline at end of file
+add_cab_target(eventvwr 1)

diff --git a/base/applications/mscutils/servman/CMakeLists.txt b/base/applications/mscutils/servman/CMakeLists.txt
index 8803d78..d07d4aa 100644 (file)
--- a/base/applications/mscutils/servman/CMakeLists.txt
+++ b/base/applications/mscutils/servman/CMakeLists.txt
@@ -31,4 +31,4 @@ set_module_type(servman win32gui)
 
 add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32)
 
-add_cab_target(servman 1)
\ No newline at end of file
+add_cab_target(servman 1)

diff --git a/base/applications/mstsc/CMakeLists.txt b/base/applications/mstsc/CMakeLists.txt
index 4b780fe..bba3bb3 100644 (file)
--- a/base/applications/mstsc/CMakeLists.txt
+++ b/base/applications/mstsc/CMakeLists.txt
@@ -31,4 +31,4 @@ set_module_type(mstsc win32gui)
 
 add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32)
 
-add_cab_target(mstsc 1)
\ No newline at end of file
+add_cab_target(mstsc 1)

diff --git a/base/applications/network/arp/CMakeLists.txt b/base/applications/network/arp/CMakeLists.txt
index 9922f69..7c0c091 100644 (file)
--- a/base/applications/network/arp/CMakeLists.txt
+++ b/base/applications/network/arp/CMakeLists.txt
@@ -5,4 +5,4 @@ set_module_type(arp win32cui)
 
 add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32)
 
-add_cab_target(arp 1)
\ No newline at end of file
+add_cab_target(arp 1)

diff --git a/base/applications/network/dwnl/CMakeLists.txt b/base/applications/network/dwnl/CMakeLists.txt
index 3c23757..195a968 100644 (file)
--- a/base/applications/network/dwnl/CMakeLists.txt
+++ b/base/applications/network/dwnl/CMakeLists.txt
@@ -13,4 +13,4 @@ if(MSVC)
 add_importlibs(dwnl ntdll)
 endif()
 
-add_cab_target(dwnl 1)
\ No newline at end of file
+add_cab_target(dwnl 1)

diff --git a/base/applications/network/finger/CMakeLists.txt b/base/applications/network/finger/CMakeLists.txt
index 036f0f7..9ac4d9e 100644 (file)
--- a/base/applications/network/finger/CMakeLists.txt
+++ b/base/applications/network/finger/CMakeLists.txt
@@ -1,5 +1,7 @@
-add_definitions(-D__USE_W32_SOCKETS)
-add_definitions(-D_DLL -D__USE_CRTIMP)
+
+add_definitions(
+    -D__USE_W32_SOCKETS
+    -D_DLL -D__USE_CRTIMP)
 
 add_executable(finger 
     finger.c
@@ -9,7 +11,5 @@ add_executable(finger
     finger.rc)
 
 set_module_type(finger win32cui)
-
 add_importlibs(finger ws2_32 msvcrt kernel32)
-
-add_cab_target(finger 1)
\ No newline at end of file
+add_cab_target(finger 1)

diff --git a/base/applications/network/ftp/CMakeLists.txt b/base/applications/network/ftp/CMakeLists.txt
index 83b2ccf..ba12358 100644 (file)
--- a/base/applications/network/ftp/CMakeLists.txt
+++ b/base/applications/network/ftp/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
 add_executable(ftp
@@ -18,4 +19,4 @@ target_link_libraries(ftp oldnames)
 add_importlibs(ftp ntdll)
 endif()
 
-add_cab_target(ftp 1)
\ No newline at end of file
+add_cab_target(ftp 1)

diff --git a/base/applications/network/ipconfig/CMakeLists.txt b/base/applications/network/ipconfig/CMakeLists.txt
index 5e70095..ec18cf5 100644 (file)
--- a/base/applications/network/ipconfig/CMakeLists.txt
+++ b/base/applications/network/ipconfig/CMakeLists.txt
@@ -1,8 +1,5 @@
 
 add_executable(ipconfig ipconfig.c ipconfig.rc)
-
 set_module_type(ipconfig win32cui)
-
 add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt kernel32)
-
-add_cab_target(ipconfig 1)
\ No newline at end of file
+add_cab_target(ipconfig 1)

diff --git a/base/applications/network/net/CMakeLists.txt b/base/applications/network/net/CMakeLists.txt
index c5669c1..aacb247 100644 (file)
--- a/base/applications/network/net/CMakeLists.txt
+++ b/base/applications/network/net/CMakeLists.txt
@@ -11,7 +11,5 @@ list(APPEND SOURCE
 add_executable(net ${SOURCE})
 
 set_module_type(net win32cui)
-
 add_importlibs(net ws2_32 msvcrt kernel32)
-
-add_cab_target(net 1)
\ No newline at end of file
+add_cab_target(net 1)

diff --git a/base/applications/network/netstat/CMakeLists.txt b/base/applications/network/netstat/CMakeLists.txt
index e2f20f7..ee63313 100644 (file)
--- a/base/applications/network/netstat/CMakeLists.txt
+++ b/base/applications/network/netstat/CMakeLists.txt
@@ -1,8 +1,5 @@
 
 add_executable(netstat netstat.c netstat.rc)
-
 set_module_type(netstat win32cui)
-
 add_importlibs(netstat user32 ws2_32 snmpapi iphlpapi msvcrt kernel32)
-
-add_cab_target(netstat 1)
\ No newline at end of file
+add_cab_target(netstat 1)

diff --git a/base/applications/network/nslookup/CMakeLists.txt b/base/applications/network/nslookup/CMakeLists.txt
index 5f97ca4..5d1c17f 100644 (file)
--- a/base/applications/network/nslookup/CMakeLists.txt
+++ b/base/applications/network/nslookup/CMakeLists.txt
@@ -5,7 +5,5 @@ add_executable(nslookup
     nslookup.rc)
 
 set_module_type(nslookup win32cui)
-
 add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt kernel32)
-
-add_cab_target(nslookup 1)
\ No newline at end of file
+add_cab_target(nslookup 1)

diff --git a/base/applications/network/ping/CMakeLists.txt b/base/applications/network/ping/CMakeLists.txt
index 3dedcf8..9146b26 100644 (file)
--- a/base/applications/network/ping/CMakeLists.txt
+++ b/base/applications/network/ping/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_definitions(-D__USE_W32_SOCKETS)
 
 add_executable(ping ping.c ping.rc)
@@ -9,4 +10,4 @@ if(MSVC)
 add_importlibs(ping ntdll)
 endif()
 
-add_cab_target(ping 1)
\ No newline at end of file
+add_cab_target(ping 1)

diff --git a/base/applications/network/route/CMakeLists.txt b/base/applications/network/route/CMakeLists.txt
index 3ccab2e..dd04f73 100644 (file)
--- a/base/applications/network/route/CMakeLists.txt
+++ b/base/applications/network/route/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
 set_unicode()
@@ -6,5 +7,4 @@ add_executable(route route.c route.rc)
 
 set_module_type(route win32cui)
 add_importlibs(route ws2_32 iphlpapi msvcrt kernel32)
-
-add_cab_target(route 1)
\ No newline at end of file
+add_cab_target(route 1)

diff --git a/base/applications/network/telnet/CMakeLists.txt b/base/applications/network/telnet/CMakeLists.txt
index 595fe24..2fe2764 100644 (file)
--- a/base/applications/network/telnet/CMakeLists.txt
+++ b/base/applications/network/telnet/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_definitions(
     -D_CRT_NONSTDC_NO_DEPRECATE
     -D_DLL -D__USE_CRTIMP)
@@ -27,7 +28,5 @@ add_executable(telnet
     telnet.rc)
 
 set_module_type(telnet win32cui)
-
 add_importlibs(telnet ws2_32 user32 kernel32 msvcrt)
-
-add_cab_target(telnet 1)
\ No newline at end of file
+add_cab_target(telnet 1)

diff --git a/base/applications/network/tracert/CMakeLists.txt b/base/applications/network/tracert/CMakeLists.txt
index f09f55d..9d6ad65 100644 (file)
--- a/base/applications/network/tracert/CMakeLists.txt
+++ b/base/applications/network/tracert/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_definitions(-D__USE_W32_SOCKETS)
 
 add_executable(tracert tracert.c tracert.rc)
@@ -9,4 +10,4 @@ if(MSVC)
 add_importlibs(tracert ntdll)
 endif()
 
-add_cab_target(tracert 1)
\ No newline at end of file
+add_cab_target(tracert 1)

diff --git a/base/applications/network/whois/CMakeLists.txt b/base/applications/network/whois/CMakeLists.txt
index 997e3cd..66dab04 100644 (file)
--- a/base/applications/network/whois/CMakeLists.txt
+++ b/base/applications/network/whois/CMakeLists.txt
@@ -1,9 +1,8 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
 add_executable(whois whois.c whois.rc)
 
 set_module_type(whois win32cui)
-
 add_importlibs(whois ws2_32 msvcrt kernel32)
-
-add_cab_target(whois 1)
\ No newline at end of file
+add_cab_target(whois 1)

diff --git a/base/applications/notepad/CMakeLists.txt b/base/applications/notepad/CMakeLists.txt
index 1500710..b0fbb92 100644 (file)
--- a/base/applications/notepad/CMakeLists.txt
+++ b/base/applications/notepad/CMakeLists.txt
@@ -1,18 +1,17 @@
+
 list(APPEND SOURCE
     dialog.c
     main.c
     settings.c
     text.c
     rsrc.rc)
-    
-    
+
 set_rc_compiler()
 
 add_pch(notepad ${CMAKE_CURRENT_SOURCE_DIR}/notepad.h ${SOURCE})
+
 add_executable(notepad ${CMAKE_CURRENT_BINARY_DIR}/notepad_notepad.h.gch ${SOURCE})
 
 set_module_type(notepad win32gui)
-
 add_importlibs(notepad user32 gdi32 comctl32 comdlg32 advapi32 shell32 msvcrt kernel32)
-
-add_cab_target(notepad 1)
\ No newline at end of file
+add_cab_target(notepad 1)

diff --git a/base/applications/paint/CMakeLists.txt b/base/applications/paint/CMakeLists.txt
index 6b6b424..fb701d8 100644 (file)
--- a/base/applications/paint/CMakeLists.txt
+++ b/base/applications/paint/CMakeLists.txt
@@ -17,7 +17,5 @@ add_executable(paint
     rsrc.rc)
 
 set_module_type(paint win32gui)
-
 add_importlibs(paint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32)
-
-add_cab_target(paint 1)
\ No newline at end of file
+add_cab_target(paint 1)

diff --git a/base/applications/regedit/CMakeLists.txt b/base/applications/regedit/CMakeLists.txt
index 40adac9..95f51a5 100644 (file)
--- a/base/applications/regedit/CMakeLists.txt
+++ b/base/applications/regedit/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
 set_unicode()

diff --git a/base/applications/regedit/clb/CMakeLists.txt b/base/applications/regedit/clb/CMakeLists.txt
index e139177..4024c92 100644 (file)
--- a/base/applications/regedit/clb/CMakeLists.txt
+++ b/base/applications/regedit/clb/CMakeLists.txt
@@ -10,7 +10,5 @@ add_library(clb SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/clb.def)
 
 set_module_type(clb win32dll)
-
-
 add_importlibs(clb user32 gdi32 comctl32 kernel32 ntdll)
     
\ No newline at end of file

diff --git a/base/applications/regedt32/CMakeLists.txt b/base/applications/regedt32/CMakeLists.txt
index ff9fb5b..8cb5d04 100644 (file)
--- a/base/applications/regedt32/CMakeLists.txt
+++ b/base/applications/regedt32/CMakeLists.txt
@@ -4,7 +4,5 @@ set_unicode()
 add_executable(regedt32 regedt32.c resource.rc)
 
 set_module_type(regedt32 win32gui)
-
 add_importlibs(regedt32 shell32 shlwapi msvcrt kernel32)
-
-add_cab_target(regedt32 1)
\ No newline at end of file
+add_cab_target(regedt32 1)

diff --git a/base/applications/sc/CMakeLists.txt b/base/applications/sc/CMakeLists.txt
index 176bb55..8de2337 100644 (file)
--- a/base/applications/sc/CMakeLists.txt
+++ b/base/applications/sc/CMakeLists.txt
@@ -18,7 +18,5 @@ add_executable(sc ${CMAKE_CURRENT_BINARY_DIR}/sc_sc.h.gch ${SOURCE})
 add_pch(sc ${CMAKE_CURRENT_SOURCE_DIR}/sc.h ${SOURCE})
 
 set_module_type(sc win32cui)
-
 add_importlibs(sc advapi32 msvcrt kernel32)
-
-add_cab_target(sc 1)
\ No newline at end of file
+add_cab_target(sc 1)

diff --git a/base/applications/screensavers/3dtext/CMakeLists.txt b/base/applications/screensavers/3dtext/CMakeLists.txt
index 231d659..3f81614 100644 (file)
--- a/base/applications/screensavers/3dtext/CMakeLists.txt
+++ b/base/applications/screensavers/3dtext/CMakeLists.txt
@@ -13,4 +13,4 @@ set_target_properties(3dtext PROPERTIES SUFFIX ".scr")
 target_link_libraries(3dtext scrnsave)
 add_importlibs(3dtext user32 gdi32 opengl32 glu32 advapi32 msvcrt kernel32)
 
-add_cab_target(3dtext 1)
\ No newline at end of file
+add_cab_target(3dtext 1)

diff --git a/base/applications/screensavers/CMakeLists.txt b/base/applications/screensavers/CMakeLists.txt
index 2d20d9a..d232c3c 100644 (file)
--- a/base/applications/screensavers/CMakeLists.txt
+++ b/base/applications/screensavers/CMakeLists.txt
@@ -1,2 +1,3 @@
+
 add_subdirectory(3dtext)
-add_subdirectory(logon)
\ No newline at end of file
+add_subdirectory(logon)

diff --git a/base/applications/screensavers/logon/CMakeLists.txt b/base/applications/screensavers/logon/CMakeLists.txt
index 12b4e21..f909e2a 100644 (file)
--- a/base/applications/screensavers/logon/CMakeLists.txt
+++ b/base/applications/screensavers/logon/CMakeLists.txt
@@ -1,14 +1,12 @@
+
 set_rc_compiler()
 set_unicode()
 
-add_executable(logon
-    logon.c
-    logon.rc)
+add_executable(logon logon.c logon.rc)
 
 set_module_type(logon win32gui)
 set_target_properties(logon PROPERTIES SUFFIX ".scr")
 
 target_link_libraries(logon scrnsave)
 add_importlibs(logon user32 gdi32 msvcrt kernel32)
-
-add_cab_target(logon 1)
\ No newline at end of file
+add_cab_target(logon 1)

diff --git a/base/applications/shutdown/CMakeLists.txt b/base/applications/shutdown/CMakeLists.txt
index 7a0fa1b..f72303e 100644 (file)
--- a/base/applications/shutdown/CMakeLists.txt
+++ b/base/applications/shutdown/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
 list(APPEND SOURCE
@@ -10,6 +11,5 @@ add_executable(shutdown ${CMAKE_CURRENT_BINARY_DIR}/shutdown_precomp.h.gch ${SOU
 add_pch(shutdown ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(shutdown win32cui)
-
 add_importlibs(shutdown advapi32 user32 msvcrt kernel32)
-add_cab_target(shutdown 1)
\ No newline at end of file
+add_cab_target(shutdown 1)

diff --git a/base/applications/sndrec32/CMakeLists.txt b/base/applications/sndrec32/CMakeLists.txt
index cc10dfd..d2a765a 100644 (file)
--- a/base/applications/sndrec32/CMakeLists.txt
+++ b/base/applications/sndrec32/CMakeLists.txt
@@ -11,7 +11,5 @@ add_executable(sndrec32
     rsrc.rc)
 
 target_link_libraries(sndrec32 stlport)
-
 set_module_type(sndrec32 win32gui)
-
 add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt)

diff --git a/base/applications/sndvol32/CMakeLists.txt b/base/applications/sndvol32/CMakeLists.txt
index ab818b1..8136543 100644 (file)
--- a/base/applications/sndvol32/CMakeLists.txt
+++ b/base/applications/sndvol32/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
 set_unicode()
@@ -13,7 +14,5 @@ add_executable(sndvol32 ${CMAKE_CURRENT_BINARY_DIR}/sndvol32_sndvol32.h.gch ${SO
 add_pch(sndvol32 ${CMAKE_CURRENT_SOURCE_DIR}/sndvol32.h ${SOURCE})
 
 set_module_type(sndvol32 win32gui)
-
 add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll)
-
-add_cab_target(sndvol32 1)
\ No newline at end of file
+add_cab_target(sndvol32 1)

diff --git a/base/applications/taskmgr/CMakeLists.txt b/base/applications/taskmgr/CMakeLists.txt
index 870f776..92efa0c 100644 (file)
--- a/base/applications/taskmgr/CMakeLists.txt
+++ b/base/applications/taskmgr/CMakeLists.txt
@@ -27,7 +27,5 @@ add_executable(taskmgr ${CMAKE_CURRENT_BINARY_DIR}/taskmgr_precomp.h.gch ${SOURC
 add_pch(taskmgr ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_module_type(taskmgr win32gui)
-
 add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt kernel32 ntdll)
-
-add_cab_target(taskmgr 1)
\ No newline at end of file
+add_cab_target(taskmgr 1)

diff --git a/base/applications/winhlp32/CMakeLists.txt b/base/applications/winhlp32/CMakeLists.txt
index 3dfd37d..9acd99f 100644 (file)
--- a/base/applications/winhlp32/CMakeLists.txt
+++ b/base/applications/winhlp32/CMakeLists.txt
@@ -21,4 +21,4 @@ set_module_type(winhlp32 win32gui)
 
 target_link_libraries(winhlp32 wine)
 add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll)
-add_cab_target(winhlp32 4)
\ No newline at end of file
+add_cab_target(winhlp32 4)

diff --git a/base/applications/winver/CMakeLists.txt b/base/applications/winver/CMakeLists.txt
index 3410221..76bb3f2 100644 (file)
--- a/base/applications/winver/CMakeLists.txt
+++ b/base/applications/winver/CMakeLists.txt
@@ -2,9 +2,6 @@
 set_unicode()
 
 add_executable(winver winver.c)
-
 set_module_type(winver win32gui)
-
 add_importlibs(winver shell32 msvcrt kernel32)
-
-add_cab_target(winver 1)
\ No newline at end of file
+add_cab_target(winver 1)

diff --git a/base/applications/wordpad/CMakeLists.txt b/base/applications/wordpad/CMakeLists.txt
index 6c89da0..6b13acb 100644 (file)
--- a/base/applications/wordpad/CMakeLists.txt
+++ b/base/applications/wordpad/CMakeLists.txt
@@ -1,23 +1,23 @@
-list(APPEND SOURCE
-    olecallback.c
-    print.c
-    registry.c
-    wordpad.c
-    rsrc.rc)
+
+include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 add_definitions(
     -D__ROS_LONG64__
     -D_DLL -D__USE_CRTIMP)
 
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 set_rc_compiler()
 
+list(APPEND SOURCE
+    olecallback.c
+    print.c
+    registry.c
+    wordpad.c
+    rsrc.rc)
+
 add_executable(wordpad ${SOURCE})
+
 set_module_type(wordpad win32gui)
 
 target_link_libraries(wordpad wine uuid)
-
 add_importlibs(wordpad comdlg32 ole32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll)
-
-add_cab_target(wordpad 1)
\ No newline at end of file
+add_cab_target(wordpad 1)

diff --git a/base/applications/write/CMakeLists.txt b/base/applications/write/CMakeLists.txt
index b57193a..a528a5e 100644 (file)
--- a/base/applications/write/CMakeLists.txt
+++ b/base/applications/write/CMakeLists.txt
@@ -2,9 +2,6 @@
 set_unicode()
 
 add_executable(write write.c rsrc.rc)
-
 set_module_type(write win32gui)
-
 add_importlibs(write user32 gdi32 msvcrt kernel32)
-
-add_cab_target(write 1)
\ No newline at end of file
+add_cab_target(write 1)

diff --git a/base/services/audiosrv/CMakeLists.txt b/base/services/audiosrv/CMakeLists.txt
index 6719c9b..55271c4 100644 (file)
--- a/base/services/audiosrv/CMakeLists.txt
+++ b/base/services/audiosrv/CMakeLists.txt
@@ -12,4 +12,4 @@ add_executable(audiosrv
 
 set_module_type(audiosrv win32cui)
 add_importlibs(audiosrv advapi32 user32 setupapi msvcrt kernel32)
-add_cab_target(audiosrv 1)
\ No newline at end of file
+add_cab_target(audiosrv 1)

diff --git a/base/services/eventlog/CMakeLists.txt b/base/services/eventlog/CMakeLists.txt
index 211a8ff..167649b 100644 (file)
--- a/base/services/eventlog/CMakeLists.txt
+++ b/base/services/eventlog/CMakeLists.txt
@@ -17,6 +17,5 @@ target_link_libraries(eventlog eventlogrpc_server ${PSEH_LIB})
 add_pch(eventlog ${CMAKE_CURRENT_SOURCE_DIR}/eventlog.h ${SOURCE})
 
 set_module_type(eventlog win32cui)
-
 add_importlibs(eventlog advapi32 rpcrt4 msvcrt kernel32 ntdll)
-add_cab_target(eventlog 1)
\ No newline at end of file
+add_cab_target(eventlog 1)

diff --git a/base/services/rpcss/CMakeLists.txt b/base/services/rpcss/CMakeLists.txt
index b2fee12..6414a97 100644 (file)
--- a/base/services/rpcss/CMakeLists.txt
+++ b/base/services/rpcss/CMakeLists.txt
@@ -20,4 +20,4 @@ set_module_type(rpcss win32cui)
 
 add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll)
 add_cab_target(rpcss 1)
-add_dependencies(rpcss winesdk)
\ No newline at end of file
+add_dependencies(rpcss winesdk)

diff --git a/base/services/spoolsv/CMakeLists.txt b/base/services/spoolsv/CMakeLists.txt
index 3e764b5..99feb71 100644 (file)
--- a/base/services/spoolsv/CMakeLists.txt
+++ b/base/services/spoolsv/CMakeLists.txt
@@ -7,4 +7,4 @@ target_link_libraries(spoolsv wine)
 
 set_module_type(spoolsv win32cui)
 add_importlibs(spoolsv advapi32 msvcrt kernel32 ntdll)
-add_cab_target(spoolsv 1)
\ No newline at end of file
+add_cab_target(spoolsv 1)

diff --git a/base/services/svchost/CMakeLists.txt b/base/services/svchost/CMakeLists.txt
index a4d6ecb..f4188a2 100644 (file)
--- a/base/services/svchost/CMakeLists.txt
+++ b/base/services/svchost/CMakeLists.txt
@@ -3,4 +3,4 @@ add_executable(svchost svchost.c svchost.rc)
 
 set_module_type(svchost win32cui)
 add_importlibs(svchost advapi32 msvcrt kernel32 ntdll)
-add_cab_target(svchost 1)
\ No newline at end of file
+add_cab_target(svchost 1)

diff --git a/base/services/telnetd/CMakeLists.txt b/base/services/telnetd/CMakeLists.txt
index cc5a42d..d803319 100644 (file)
--- a/base/services/telnetd/CMakeLists.txt
+++ b/base/services/telnetd/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
 add_executable(telnetd
@@ -9,5 +10,4 @@ target_link_libraries(telnetd wine)
 
 set_module_type(telnetd win32cui)
 add_importlibs(telnetd advapi32 ws2_32 msvcrt kernel32 ntdll)
-
-add_cab_target(telnetd 1)
\ No newline at end of file
+add_cab_target(telnetd 1)

diff --git a/base/services/umpnpmgr/CMakeLists.txt b/base/services/umpnpmgr/CMakeLists.txt
index c552b07..923acc9 100644 (file)
--- a/base/services/umpnpmgr/CMakeLists.txt
+++ b/base/services/umpnpmgr/CMakeLists.txt
@@ -1,20 +1,14 @@
 
 set_unicode()
+
 include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl)
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
 add_executable(umpnpmgr umpnpmgr.c umpnpmgr.rc)
-
 target_link_libraries(umpnpmgr pnp_server wdmguid ${PSEH_LIB})
 
 set_module_type(umpnpmgr win32cui)
-add_importlibs(umpnpmgr
-    advapi32
-    rpcrt4
-    userenv
-    msvcrt
-    kernel32
-    ntdll)
-
-add_cab_target(umpnpmgr 1)
\ No newline at end of file
+add_importlibs(umpnpmgr advapi32 rpcrt4 userenv msvcrt kernel32 ntdll)
+add_cab_target(umpnpmgr 1)

diff --git a/base/services/wlansvc/CMakeLists.txt b/base/services/wlansvc/CMakeLists.txt
index 91f5f57..305aefa 100644 (file)
--- a/base/services/wlansvc/CMakeLists.txt
+++ b/base/services/wlansvc/CMakeLists.txt
@@ -7,12 +7,5 @@ add_executable(wlansvc wlansvc.c rpcserver.c)
 target_link_libraries(wlansvc wlansvc_server ${PSEH_LIB})
 
 set_module_type(wlansvc win32cui)
-add_importlibs(wlansvc
-    advapi32
-    rpcrt4
-    iphlpapi
-    msvcrt
-    kernel32
-    ntdll)
-
-add_cab_target(wlansvc 1)
\ No newline at end of file
+add_importlibs(wlansvc advapi32 rpcrt4 iphlpapi msvcrt kernel32 ntdll)
+add_cab_target(wlansvc 1)

diff --git a/base/setup/reactos/CMakeLists.txt b/base/setup/reactos/CMakeLists.txt
index 572fab2..5a009d1 100644 (file)
--- a/base/setup/reactos/CMakeLists.txt
+++ b/base/setup/reactos/CMakeLists.txt
@@ -6,13 +6,5 @@ add_executable(reactos reactos.c reactos.rc)
 target_link_libraries(reactos uuid)
 
 set_module_type(reactos win32gui)
-add_importlibs(reactos
-    gdi32
-    user32
-    comctl32
-    setupapi
-    msvcrt
-    kernel32
-    ntdll)
-
-add_minicd_target(reactos reactos)
\ No newline at end of file
+add_importlibs(reactos gdi32 user32 comctl32 setupapi msvcrt kernel32 ntdll)
+add_minicd_target(reactos reactos)

diff --git a/base/setup/setup/CMakeLists.txt b/base/setup/setup/CMakeLists.txt
index a1d2a42..27a9f64 100644 (file)
--- a/base/setup/setup/CMakeLists.txt
+++ b/base/setup/setup/CMakeLists.txt
@@ -5,4 +5,4 @@ add_executable(setup setup.c setup.rc)
 
 set_module_type(setup win32gui)
 add_importlibs(setup userenv msvcrt kernel32 ntdll)
-add_cab_target(setup 1)
\ No newline at end of file
+add_cab_target(setup 1)

diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt
index 5221811..ba1780b 100644 (file)
--- a/base/setup/usetup/CMakeLists.txt
+++ b/base/setup/usetup/CMakeLists.txt
@@ -1,7 +1,8 @@
 
-include_directories(${REACTOS_SOURCE_DIR}/lib/newinflib)
-include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/lib/newinflib
+    ${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib
+    ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
 
 add_executable(usetup
     interface/usetup.c

diff --git a/base/setup/vmwinst/CMakeLists.txt b/base/setup/vmwinst/CMakeLists.txt
index 0bfa05e..38ea15e 100644 (file)
--- a/base/setup/vmwinst/CMakeLists.txt
+++ b/base/setup/vmwinst/CMakeLists.txt
@@ -18,4 +18,4 @@ add_importlibs(vmwinst
     kernel32
     ntdll)
 
-add_cab_target(vmwinst 1)
\ No newline at end of file
+add_cab_target(vmwinst 1)

diff --git a/base/setup/welcome/CMakeLists.txt b/base/setup/welcome/CMakeLists.txt
index 0d68a59..de50226 100644 (file)
--- a/base/setup/welcome/CMakeLists.txt
+++ b/base/setup/welcome/CMakeLists.txt
@@ -5,5 +5,4 @@ add_executable(welcome welcome.c welcome.rc)
 
 set_module_type(welcome win32gui)
 add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll)
-
-add_minicd_target(welcome reactos)
\ No newline at end of file
+add_minicd_target(welcome reactos)

diff --git a/base/shell/cmd/CMakeLists.txt b/base/shell/cmd/CMakeLists.txt
index 561ebef..fbd6c1e 100644 (file)
--- a/base/shell/cmd/CMakeLists.txt
+++ b/base/shell/cmd/CMakeLists.txt
@@ -1,8 +1,9 @@
 
 set_unicode()
 
-add_definitions(-DANONYMOUSUNIONS)
-add_definitions(-D_DEBUG_MEM)
+add_definitions(
+    -DANONYMOUSUNIONS
+    -D_DEBUG_MEM)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
@@ -76,4 +77,4 @@ target_link_libraries(cmd wine)
 add_pch(cmd ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE)
 set_module_type(cmd win32cui)
 add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll)
-add_cab_target(cmd 1)
\ No newline at end of file
+add_cab_target(cmd 1)

diff --git a/base/shell/explorer-new/CMakeLists.txt b/base/shell/explorer-new/CMakeLists.txt
index 8ca3e1a..4b62255 100644 (file)
--- a/base/shell/explorer-new/CMakeLists.txt
+++ b/base/shell/explorer-new/CMakeLists.txt
@@ -35,4 +35,4 @@ add_importlibs(explorer_new
     kernel32
     ntdll)
 
-add_cab_target(explorer_new 4)
\ No newline at end of file
+add_cab_target(explorer_new 4)

diff --git a/base/shell/explorer/notifyhook/CMakeLists.txt b/base/shell/explorer/notifyhook/CMakeLists.txt
index f54cdb2..4c3bda2 100644 (file)
--- a/base/shell/explorer/notifyhook/CMakeLists.txt
+++ b/base/shell/explorer/notifyhook/CMakeLists.txt
@@ -14,5 +14,4 @@ set_module_type(notifyhook win32dll)
 
 add_importlibs(notifyhook user32 msvcrt kernel32)
 add_importlib_target(notifyhook.spec)
-
 add_cab_target(notifyhook 1)

diff --git a/base/system/autochk/CMakeLists.txt b/base/system/autochk/CMakeLists.txt
index 4221d9e..c184654 100644 (file)
--- a/base/system/autochk/CMakeLists.txt
+++ b/base/system/autochk/CMakeLists.txt
@@ -5,4 +5,4 @@ set_module_type(autochk nativecui)
 
 target_link_libraries(autochk mingw_common nt)
 add_importlibs(autochk kernel32 ntdll)
-add_cab_target(autochk 1)
\ No newline at end of file
+add_cab_target(autochk 1)

diff --git a/base/system/bootok/CMakeLists.txt b/base/system/bootok/CMakeLists.txt
index 3f52a33..9d8b104 100644 (file)
--- a/base/system/bootok/CMakeLists.txt
+++ b/base/system/bootok/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
 set_unicode()
@@ -5,7 +6,5 @@ set_unicode()
 add_executable(bootok bootok.c bootok.rc)
 
 set_module_type(bootok win32cui)
-
 add_importlibs(bootok advapi32 msvcrt kernel32 ntdll)
-
-add_cab_target(bootok 1)
\ No newline at end of file
+add_cab_target(bootok 1)

diff --git a/base/system/expand/CMakeLists.txt b/base/system/expand/CMakeLists.txt
index 6833660..cb393eb 100644 (file)
--- a/base/system/expand/CMakeLists.txt
+++ b/base/system/expand/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -5,7 +6,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_executable(expand expand.c expand.rc)
 
 set_module_type(expand win32cui)
-
 add_importlibs(expand lz32 setupapi user32 msvcrt kernel32 ntdll)
-
-add_cab_target(expand 1)
\ No newline at end of file
+add_cab_target(expand 1)

diff --git a/base/system/format/CMakeLists.txt b/base/system/format/CMakeLists.txt
index 89fdaf2..6b4d280 100644 (file)
--- a/base/system/format/CMakeLists.txt
+++ b/base/system/format/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
 include_directories(.)
@@ -6,7 +7,5 @@ set_rc_compiler()
 add_executable(format format.c format.rc)
 
 set_module_type(format win32cui)
-
 add_importlibs(format user32 fmifs msvcrt kernel32 ntdll)
-
-add_cab_target(format 1)
\ No newline at end of file
+add_cab_target(format 1)

diff --git a/base/system/lsass/CMakeLists.txt b/base/system/lsass/CMakeLists.txt
index 86e6661..516f416 100644 (file)
--- a/base/system/lsass/CMakeLists.txt
+++ b/base/system/lsass/CMakeLists.txt
@@ -6,6 +6,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
 add_executable(lsass lsass.c lsass.rc)
 
 set_module_type(lsass win32gui)
-
 add_importlibs(lsass advapi32 lsasrv msvcrt kernel32 ntdll)
-add_cab_target(lsass 1)
\ No newline at end of file
+add_cab_target(lsass 1)

diff --git a/base/system/msiexec/CMakeLists.txt b/base/system/msiexec/CMakeLists.txt
index 23575db..8c82c73 100644 (file)
--- a/base/system/msiexec/CMakeLists.txt
+++ b/base/system/msiexec/CMakeLists.txt
@@ -1,7 +1,9 @@
-add_definitions(-D_DLL -D__USE_CRTIMP)
+
+add_definitions(
+    -D_DLL -D__USE_CRTIMP
+    -D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/wine)
-add_definitions(-D__WINESRC__)
 
 add_executable(msiexec
     msiexec.c
@@ -11,7 +13,5 @@ add_executable(msiexec
 set_module_type(msiexec win32gui)
 
 target_link_libraries(msiexec uuid wine)
-
 add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt kernel32 ntdll)
-
-add_cab_target(msiexec 1)
\ No newline at end of file
+add_cab_target(msiexec 1)

diff --git a/base/system/regsvr32/CMakeLists.txt b/base/system/regsvr32/CMakeLists.txt
index c350b6d..e676c20 100644 (file)
--- a/base/system/regsvr32/CMakeLists.txt
+++ b/base/system/regsvr32/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
 set_unicode()
@@ -7,7 +8,5 @@ set_rc_compiler()
 add_executable(regsvr32 regsvr32.c regsvr32.rc)
 
 set_module_type(regsvr32 win32gui)
-
 add_importlibs(regsvr32 user32 shell32 ole32 msvcrt kernel32 ntdll)
-
-add_cab_target(regsvr32 1)
\ No newline at end of file
+add_cab_target(regsvr32 1)

diff --git a/base/system/rundll32/CMakeLists.txt b/base/system/rundll32/CMakeLists.txt
index 4cac137..bb43fc1 100644 (file)
--- a/base/system/rundll32/CMakeLists.txt
+++ b/base/system/rundll32/CMakeLists.txt
@@ -6,6 +6,5 @@ set_rc_compiler()
 add_executable(rundll32 rundll32.c rundll32.rc)
 
 set_module_type(rundll32 win32gui)
-
 add_importlibs(rundll32 user32 msvcrt kernel32 ntdll)
-add_cab_target(rundll32 1)
\ No newline at end of file
+add_cab_target(rundll32 1)

diff --git a/base/system/runonce/CMakeLists.txt b/base/system/runonce/CMakeLists.txt
index 2724b94..314d838 100644 (file)
--- a/base/system/runonce/CMakeLists.txt
+++ b/base/system/runonce/CMakeLists.txt
@@ -4,7 +4,5 @@ set_unicode()
 add_executable(runonce runonce.c runonce.rc)
 
 set_module_type(runonce win32gui)
-
 add_importlibs(runonce advapi32 user32 msvcrt kernel32 ntdll)
-
-add_cab_target(runonce 1)
\ No newline at end of file
+add_cab_target(runonce 1)

diff --git a/base/system/services/CMakeLists.txt b/base/system/services/CMakeLists.txt
index 3dd46f0..63f31bb 100644 (file)
--- a/base/system/services/CMakeLists.txt
+++ b/base/system/services/CMakeLists.txt
@@ -1,7 +1,9 @@
 
 set_unicode()
-include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
+
+include_directories(
+    ${REACTOS_BINARY_DIR}/include/reactos/idl
+    ${REACTOS_SOURCE_DIR}/include/reactos/subsys)
 
 list(APPEND SOURCE
     config.c
@@ -21,6 +23,5 @@ target_link_libraries(services
 add_pch(services ${CMAKE_CURRENT_SOURCE_DIR}/services.h ${SOURCE})
 
 set_module_type(services win32cui)
-
 add_importlibs(services user32 advapi32 rpcrt4 msvcrt kernel32 ntdll)
-add_cab_target(services 1)
\ No newline at end of file
+add_cab_target(services 1)

diff --git a/base/system/smss/CMakeLists.txt b/base/system/smss/CMakeLists.txt
index 3fd548a..3dc4a13 100644 (file)
--- a/base/system/smss/CMakeLists.txt
+++ b/base/system/smss/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
 
 list(APPEND SOURCE
@@ -30,4 +31,4 @@ add_pch(smss ${CMAKE_CURRENT_SOURCE_DIR}/smss.h ${SOURCE})
 
 set_module_type(smss nativecui)
 add_importlibs(smss ntdll)
-add_cab_target(smss 1)
\ No newline at end of file
+add_cab_target(smss 1)

diff --git a/base/system/winlogon/CMakeLists.txt b/base/system/winlogon/CMakeLists.txt
index cbeb46e..b411d0d 100644 (file)
--- a/base/system/winlogon/CMakeLists.txt
+++ b/base/system/winlogon/CMakeLists.txt
@@ -15,6 +15,5 @@ target_link_libraries(winlogon wine)
 add_pch(winlogon ${CMAKE_CURRENT_SOURCE_DIR}/winlogon.h ${SOURCE})
 
 set_module_type(winlogon win32gui)
-
 add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt kernel32 ntdll)
-add_cab_target(winlogon 1)
\ No newline at end of file
+add_cab_target(winlogon 1)

diff --git a/dll/cpl/desk/CMakeLists.txt b/dll/cpl/desk/CMakeLists.txt
index bbafc53..5db03ec 100644 (file)
--- a/dll/cpl/desk/CMakeLists.txt
+++ b/dll/cpl/desk/CMakeLists.txt
@@ -1,8 +1,9 @@
 
 set_unicode()
 
-add_definitions(-D_WIN32)
-add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(
+    -D_WIN32
+    -D_DLL -D__USE_CRTIMP)
 
 spec2def(desk.cpl desk.spec)
 

diff --git a/dll/cpl/powercfg/CMakeLists.txt b/dll/cpl/powercfg/CMakeLists.txt
index 0f47d85..a699c91 100644 (file)
--- a/dll/cpl/powercfg/CMakeLists.txt
+++ b/dll/cpl/powercfg/CMakeLists.txt
@@ -14,8 +14,6 @@ add_library(powercfg SHARED
 
 set_module_type(powercfg cpl)
 
-
-
 add_importlibs(powercfg
     msvcrt
     user32

diff --git a/dll/directx/amstream/CMakeLists.txt b/dll/directx/amstream/CMakeLists.txt
index 0d8d0f4..cfaaa1e 100644 (file)
--- a/dll/directx/amstream/CMakeLists.txt
+++ b/dll/directx/amstream/CMakeLists.txt
@@ -1,7 +1,9 @@
 
 add_definitions(-D__WINESRC__)
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(amstream.dll amstream.spec)

diff --git a/dll/directx/d3d8thk/CMakeLists.txt b/dll/directx/d3d8thk/CMakeLists.txt
index c9b91f3..208f139 100644 (file)
--- a/dll/directx/d3d8thk/CMakeLists.txt
+++ b/dll/directx/d3d8thk/CMakeLists.txt
@@ -9,4 +9,4 @@ add_importlibs(d3d8thk gdi32)
 
 add_dependencies(d3d8thk psdk buildno_header)
 
-add_cab_target(d3d8thk 1)
\ No newline at end of file
+add_cab_target(d3d8thk 1)

diff --git a/dll/directx/devenum/CMakeLists.txt b/dll/directx/devenum/CMakeLists.txt
index ba75d0b..2fe436d 100644 (file)
--- a/dll/directx/devenum/CMakeLists.txt
+++ b/dll/directx/devenum/CMakeLists.txt
@@ -3,6 +3,7 @@ set_unicode()
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(devenum.dll devenum.spec)
@@ -34,5 +35,4 @@ add_importlibs(devenum
     kernel32
     ntdll)
 
-
 add_cab_target(devenum 1)

diff --git a/dll/directx/dinput/CMakeLists.txt b/dll/directx/dinput/CMakeLists.txt
index 9f7e692..f61ec37 100644 (file)
--- a/dll/directx/dinput/CMakeLists.txt
+++ b/dll/directx/dinput/CMakeLists.txt
@@ -3,6 +3,7 @@ set_unicode()
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(dinput.dll dinput.spec)
@@ -36,6 +37,5 @@ add_importlibs(dinput
     kernel32
     ntdll)
 
-
 add_cab_target(dinput 1)
 add_importlib_target(dinput.spec)

diff --git a/dll/directx/dinput8/CMakeLists.txt b/dll/directx/dinput8/CMakeLists.txt
index 4a4c110..9f6b3dc 100644 (file)
--- a/dll/directx/dinput8/CMakeLists.txt
+++ b/dll/directx/dinput8/CMakeLists.txt
@@ -3,6 +3,7 @@ set_unicode()
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(dinput8.dll dinput8.spec)
@@ -32,4 +33,4 @@ add_importlibs(dinput8
 add_dependencies(dinput8 psdk buildno_header)
 
 add_cab_target(dinput8 1)
-add_importlib_target(dinput8.spec)
\ No newline at end of file
+add_importlib_target(dinput8.spec)

diff --git a/dll/directx/dmusic/CMakeLists.txt b/dll/directx/dmusic/CMakeLists.txt
index a8d883e..99bfe80 100644 (file)
--- a/dll/directx/dmusic/CMakeLists.txt
+++ b/dll/directx/dmusic/CMakeLists.txt
@@ -2,8 +2,10 @@
 set_unicode()
 
 add_definitions(-D__WINESRC__)
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(dmusic.dll dmusic.spec)
@@ -39,4 +41,4 @@ add_importlibs(dmusic
 
 add_dependencies(dmusic psdk buildno_header)
 
-add_cab_target(dmusic 1)
\ No newline at end of file
+add_cab_target(dmusic 1)

diff --git a/dll/directx/dplayx/CMakeLists.txt b/dll/directx/dplayx/CMakeLists.txt
index 0e29112..9ee83d4 100644 (file)
--- a/dll/directx/dplayx/CMakeLists.txt
+++ b/dll/directx/dplayx/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 set_rc_compiler()
 
 spec2def(dplayx.dll dplayx.spec)

diff --git a/dll/directx/dsound/CMakeLists.txt b/dll/directx/dsound/CMakeLists.txt
index dfb8c36..b953611 100644 (file)
--- a/dll/directx/dsound/CMakeLists.txt
+++ b/dll/directx/dsound/CMakeLists.txt
@@ -1,6 +1,8 @@
 
-add_definitions(-D_WINE)
-add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(
+    -D_WINE
+    -D_DLL -D__USE_CRTIMP)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(dsound.dll dsound.spec)
@@ -36,6 +38,5 @@ add_importlibs(dsound
     kernel32
     ntdll)
 
-
 add_cab_target(dsound 1)
 add_importlib_target(dsound.spec)

diff --git a/dll/directx/dxdiagn/CMakeLists.txt b/dll/directx/dxdiagn/CMakeLists.txt
index ad0c39a..1ff42b5 100644 (file)
--- a/dll/directx/dxdiagn/CMakeLists.txt
+++ b/dll/directx/dxdiagn/CMakeLists.txt
@@ -14,9 +14,7 @@ add_library(dxdiagn SHARED
 
 set_module_type(dxdiagn win32dll)
 
-target_link_libraries(dxdiagn
-    uuid
-    wine)
+target_link_libraries(dxdiagn uuid wine)
 
 add_importlibs(dxdiagn
     user32

diff --git a/dll/directx/ksproxy/CMakeLists.txt b/dll/directx/ksproxy/CMakeLists.txt
index 4536cc3..6b56805 100644 (file)
--- a/dll/directx/ksproxy/CMakeLists.txt
+++ b/dll/directx/ksproxy/CMakeLists.txt
@@ -1,8 +1,8 @@
 
 spec2def(ksproxy.ax ksproxy.spec)
 
-add_definitions(-D_DLL -D__USE_CRTIMP)
 add_definitions(
+    -D_DLL -D__USE_CRTIMP
     -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++
     -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt)
 

diff --git a/dll/directx/qedit/CMakeLists.txt b/dll/directx/qedit/CMakeLists.txt
index 7989a84..ae717b5 100644 (file)
--- a/dll/directx/qedit/CMakeLists.txt
+++ b/dll/directx/qedit/CMakeLists.txt
@@ -1,10 +1,13 @@
 
 set_unicode()
 
-add_definitions(-D__WINESRC__)
+add_definitions(
+    -D__WINESRC__
+    -D_DLL -D__USE_CRTIMP)
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
-add_definitions(-D_DLL -D__USE_CRTIMP)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(qedit.dll qedit.spec)

diff --git a/dll/directx/wine/d3d8/CMakeLists.txt b/dll/directx/wine/d3d8/CMakeLists.txt
index 0b44eeb..5a6f51b 100644 (file)
--- a/dll/directx/wine/d3d8/CMakeLists.txt
+++ b/dll/directx/wine/d3d8/CMakeLists.txt
@@ -1,14 +1,18 @@
-set_rc_compiler()
+
 set_unicode()
 
-add_definitions(-D__WINESRC__)
-add_definitions(-DUSE_WIN32_OPENGL)
+add_definitions(
+    -D__WINESRC__
+    -DUSE_WIN32_OPENGL)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 if(MSVC)
     add_definitions(-FImsvchelper.h)
 endif()
 
+set_rc_compiler()
+
 spec2def(d3d8.dll d3d8.spec)
 
 list(APPEND SOURCE
@@ -31,9 +35,7 @@ add_library(d3d8 SHARED ${SOURCE})
 
 set_module_type(d3d8 win32dll)
 
-target_link_libraries(d3d8
-    uuid
-    wine)
+target_link_libraries(d3d8 uuid wine)
 
 add_importlibs(d3d8
     user32

diff --git a/dll/directx/wine/d3d9/CMakeLists.txt b/dll/directx/wine/d3d9/CMakeLists.txt
index 4c85618..de227ac 100644 (file)
--- a/dll/directx/wine/d3d9/CMakeLists.txt
+++ b/dll/directx/wine/d3d9/CMakeLists.txt
@@ -1,14 +1,18 @@
-set_rc_compiler()
+
 set_unicode()
 
-add_definitions(-D__WINESRC__)
-add_definitions(-DUSE_WIN32_OPENGL)
+add_definitions(
+    -D__WINESRC__
+    -DUSE_WIN32_OPENGL)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 if(MSVC)
     add_definitions(-FImsvchelper.h)
 endif()
 
+set_rc_compiler()
+
 spec2def(d3d9.dll d3d9.spec)
 
 list(APPEND SOURCE
@@ -34,9 +38,7 @@ add_library(d3d9 SHARED ${SOURCE})
 
 set_module_type(d3d9 win32dll)
 
-target_link_libraries(d3d9
-    uuid
-    wine)
+target_link_libraries(d3d9 uuid wine)
 
 add_importlibs(d3d9
     user32

diff --git a/dll/directx/wine/ddraw/CMakeLists.txt b/dll/directx/wine/ddraw/CMakeLists.txt
index 93a002e..a2e2b90 100644 (file)
--- a/dll/directx/wine/ddraw/CMakeLists.txt
+++ b/dll/directx/wine/ddraw/CMakeLists.txt
@@ -1,3 +1,14 @@
+
+add_definitions(
+    -D__WINESRC__
+    -DUSE_WIN32_OPENGL)
+
+if(MSVC)
+    add_definitions(/FIwine/typeof.h)
+endif()
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
 set_rc_compiler()
 
 spec2def(ddraw.dll ddraw.spec)
@@ -22,15 +33,6 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/ddraw_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def)
 
-add_definitions(
-    -D__WINESRC__
-    -DUSE_WIN32_OPENGL)
-
-if(MSVC)
-    add_definitions(/FIwine/typeof.h)
-endif()
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 add_library(ddraw SHARED ${SOURCE})
 set_module_type(ddraw win32dll)
 

diff --git a/dll/directx/wine/wined3d/CMakeLists.txt b/dll/directx/wine/wined3d/CMakeLists.txt
index 64bb85d..17bbf30 100644 (file)
--- a/dll/directx/wine/wined3d/CMakeLists.txt
+++ b/dll/directx/wine/wined3d/CMakeLists.txt
@@ -1,3 +1,10 @@
+
+add_definitions(
+    -D__WINESRC__
+    -DUSE_WIN32_OPENGL)
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
 set_rc_compiler()
 
 spec2def(wined3.dll wined3d.spec)
@@ -46,12 +53,6 @@ list(APPEND SOURCE
      sqrtf.c)
 endif()
 
-add_definitions(
-    -D__WINESRC__
-    -DUSE_WIN32_OPENGL)
-
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 add_library(wined3d SHARED ${SOURCE})
 set_module_type(wined3d win32dll)
 

diff --git a/dll/keyboard/kbda1/CMakeLists.txt b/dll/keyboard/kbda1/CMakeLists.txt
index 98ca4c0..b70b9b6 100644 (file)
--- a/dll/keyboard/kbda1/CMakeLists.txt
+++ b/dll/keyboard/kbda1/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbda1 0)
 
 add_dependencies(kbda1 psdk buildno_header)
 
-add_cab_target(kbda1 1)
\ No newline at end of file
+add_cab_target(kbda1 1)

diff --git a/dll/keyboard/kbda2/CMakeLists.txt b/dll/keyboard/kbda2/CMakeLists.txt
index 06ec45e..d678bc9 100644 (file)
--- a/dll/keyboard/kbda2/CMakeLists.txt
+++ b/dll/keyboard/kbda2/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbda2 0)
 
 add_dependencies(kbda2 psdk buildno_header)
 
-add_cab_target(kbda2 1)
\ No newline at end of file
+add_cab_target(kbda2 1)

diff --git a/dll/keyboard/kbda3/CMakeLists.txt b/dll/keyboard/kbda3/CMakeLists.txt
index 3d49362..bb1442c 100644 (file)
--- a/dll/keyboard/kbda3/CMakeLists.txt
+++ b/dll/keyboard/kbda3/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbda3 0)
 
 add_dependencies(kbda3 psdk buildno_header)
 
-add_cab_target(kbda3 1)
\ No newline at end of file
+add_cab_target(kbda3 1)

diff --git a/dll/keyboard/kbdal/CMakeLists.txt b/dll/keyboard/kbdal/CMakeLists.txt
index 2282fb2..f460b59 100644 (file)
--- a/dll/keyboard/kbdal/CMakeLists.txt
+++ b/dll/keyboard/kbdal/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdal 0)
 
 add_dependencies(kbdal psdk buildno_header)
 
-add_cab_target(kbdal 1)
\ No newline at end of file
+add_cab_target(kbdal 1)

diff --git a/dll/keyboard/kbdarme/CMakeLists.txt b/dll/keyboard/kbdarme/CMakeLists.txt
index 1c9fb76..3495518 100644 (file)
--- a/dll/keyboard/kbdarme/CMakeLists.txt
+++ b/dll/keyboard/kbdarme/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdarme 0)
 
 add_dependencies(kbdarme psdk buildno_header)
 
-add_cab_target(kbdarme 1)
\ No newline at end of file
+add_cab_target(kbdarme 1)

diff --git a/dll/keyboard/kbdarmw/CMakeLists.txt b/dll/keyboard/kbdarmw/CMakeLists.txt
index 9a13201..5f77770 100644 (file)
--- a/dll/keyboard/kbdarmw/CMakeLists.txt
+++ b/dll/keyboard/kbdarmw/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdarmw 0)
 
 add_dependencies(kbdarmw psdk buildno_header)
 
-add_cab_target(kbdarmw 1)
\ No newline at end of file
+add_cab_target(kbdarmw 1)

diff --git a/dll/keyboard/kbdaze/CMakeLists.txt b/dll/keyboard/kbdaze/CMakeLists.txt
index d18bb6e..0fb7522 100644 (file)
--- a/dll/keyboard/kbdaze/CMakeLists.txt
+++ b/dll/keyboard/kbdaze/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdaze 0)
 
 add_dependencies(kbdaze psdk buildno_header)
 
-add_cab_target(kbdaze 1)
\ No newline at end of file
+add_cab_target(kbdaze 1)

diff --git a/dll/keyboard/kbdazel/CMakeLists.txt b/dll/keyboard/kbdazel/CMakeLists.txt
index 6917aae..e063f16 100644 (file)
--- a/dll/keyboard/kbdazel/CMakeLists.txt
+++ b/dll/keyboard/kbdazel/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdazel 0)
 
 add_dependencies(kbdazel psdk buildno_header)
 
-add_cab_target(kbdazel 1)
\ No newline at end of file
+add_cab_target(kbdazel 1)

diff --git a/dll/keyboard/kbdbe/CMakeLists.txt b/dll/keyboard/kbdbe/CMakeLists.txt
index 9eadea9..011eba8 100644 (file)
--- a/dll/keyboard/kbdbe/CMakeLists.txt
+++ b/dll/keyboard/kbdbe/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdbe 0)
 
 add_dependencies(kbdbe psdk buildno_header)
 
-add_cab_target(kbdbe 1)
\ No newline at end of file
+add_cab_target(kbdbe 1)

diff --git a/dll/keyboard/kbdbga/CMakeLists.txt b/dll/keyboard/kbdbga/CMakeLists.txt
index 188517e..7f06a82 100644 (file)
--- a/dll/keyboard/kbdbga/CMakeLists.txt
+++ b/dll/keyboard/kbdbga/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdbga 0)
 
 add_dependencies(kbdbga psdk buildno_header)
 
-add_cab_target(kbdbga 1)
\ No newline at end of file
+add_cab_target(kbdbga 1)

diff --git a/dll/keyboard/kbdbgm/CMakeLists.txt b/dll/keyboard/kbdbgm/CMakeLists.txt
index 0784c3d..15fb7d8 100644 (file)
--- a/dll/keyboard/kbdbgm/CMakeLists.txt
+++ b/dll/keyboard/kbdbgm/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdbgm 0)
 
 add_dependencies(kbdbgm psdk buildno_header)
 
-add_cab_target(kbdbgm 1)
\ No newline at end of file
+add_cab_target(kbdbgm 1)

diff --git a/dll/keyboard/kbdbgt/CMakeLists.txt b/dll/keyboard/kbdbgt/CMakeLists.txt
index 8fc5e82..bb0e925 100644 (file)
--- a/dll/keyboard/kbdbgt/CMakeLists.txt
+++ b/dll/keyboard/kbdbgt/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdbgt 0)
 
 add_dependencies(kbdbgt psdk buildno_header)
 
-add_cab_target(kbdbgt 1)
\ No newline at end of file
+add_cab_target(kbdbgt 1)

diff --git a/dll/keyboard/kbdblr/CMakeLists.txt b/dll/keyboard/kbdblr/CMakeLists.txt
index d375971..9ce2935 100644 (file)
--- a/dll/keyboard/kbdblr/CMakeLists.txt
+++ b/dll/keyboard/kbdblr/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdblr 0)
 
 add_dependencies(kbdblr psdk buildno_header)
 
-add_cab_target(kbdblr 1)
\ No newline at end of file
+add_cab_target(kbdblr 1)

diff --git a/dll/keyboard/kbdbr/CMakeLists.txt b/dll/keyboard/kbdbr/CMakeLists.txt
index 288bca3..d847b32 100644 (file)
--- a/dll/keyboard/kbdbr/CMakeLists.txt
+++ b/dll/keyboard/kbdbr/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdbr 0)
 
 add_dependencies(kbdbr psdk buildno_header)
 
-add_cab_target(kbdbr 1)
\ No newline at end of file
+add_cab_target(kbdbr 1)

diff --git a/dll/keyboard/kbdbur/CMakeLists.txt b/dll/keyboard/kbdbur/CMakeLists.txt
index 798291e..c06a079 100644 (file)
--- a/dll/keyboard/kbdbur/CMakeLists.txt
+++ b/dll/keyboard/kbdbur/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdbur 0)
 
 add_dependencies(kbdbur psdk buildno_header)
 
-add_cab_target(kbdbur 1)
\ No newline at end of file
+add_cab_target(kbdbur 1)

diff --git a/dll/keyboard/kbdcan/CMakeLists.txt b/dll/keyboard/kbdcan/CMakeLists.txt
index 82b437f..10ff902 100644 (file)
--- a/dll/keyboard/kbdcan/CMakeLists.txt
+++ b/dll/keyboard/kbdcan/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdcan 0)
 
 add_dependencies(kbdcan psdk buildno_header)
 
-add_cab_target(kbdcan 1)
\ No newline at end of file
+add_cab_target(kbdcan 1)

diff --git a/dll/keyboard/kbdcr/CMakeLists.txt b/dll/keyboard/kbdcr/CMakeLists.txt
index 6373362..c6107f8 100644 (file)
--- a/dll/keyboard/kbdcr/CMakeLists.txt
+++ b/dll/keyboard/kbdcr/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdcr 0)
 
 add_dependencies(kbdcr psdk buildno_header)
 
-add_cab_target(kbdcr 1)
\ No newline at end of file
+add_cab_target(kbdcr 1)

diff --git a/dll/keyboard/kbdcz/CMakeLists.txt b/dll/keyboard/kbdcz/CMakeLists.txt
index 6d7e9ca..3ba8736 100644 (file)
--- a/dll/keyboard/kbdcz/CMakeLists.txt
+++ b/dll/keyboard/kbdcz/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdcz 0)
 
 add_dependencies(kbdcz psdk buildno_header)
 
-add_cab_target(kbdcz 1)
\ No newline at end of file
+add_cab_target(kbdcz 1)

diff --git a/dll/keyboard/kbdcz1/CMakeLists.txt b/dll/keyboard/kbdcz1/CMakeLists.txt
index 760ab27..8e7df91 100644 (file)
--- a/dll/keyboard/kbdcz1/CMakeLists.txt
+++ b/dll/keyboard/kbdcz1/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdcz1 0)
 
 add_dependencies(kbdcz1 psdk buildno_header)
 
-add_cab_target(kbdcz1 1)
\ No newline at end of file
+add_cab_target(kbdcz1 1)

diff --git a/dll/keyboard/kbdda/CMakeLists.txt b/dll/keyboard/kbdda/CMakeLists.txt
index 786dc18..57d212d 100644 (file)
--- a/dll/keyboard/kbdda/CMakeLists.txt
+++ b/dll/keyboard/kbdda/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdda 0)
 
 add_dependencies(kbdda psdk buildno_header)
 
-add_cab_target(kbdda 1)
\ No newline at end of file
+add_cab_target(kbdda 1)

diff --git a/dll/keyboard/kbddv/CMakeLists.txt b/dll/keyboard/kbddv/CMakeLists.txt
index 030adde..8d9bcfb 100644 (file)
--- a/dll/keyboard/kbddv/CMakeLists.txt
+++ b/dll/keyboard/kbddv/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbddv 0)
 
 add_dependencies(kbddv psdk buildno_header)
 
-add_cab_target(kbddv 1)
\ No newline at end of file
+add_cab_target(kbddv 1)

diff --git a/dll/keyboard/kbdes/CMakeLists.txt b/dll/keyboard/kbdes/CMakeLists.txt
index 26d64b6..25d4533 100644 (file)
--- a/dll/keyboard/kbdes/CMakeLists.txt
+++ b/dll/keyboard/kbdes/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdes 0)
 
 add_dependencies(kbdes psdk buildno_header)
 
-add_cab_target(kbdes 1)
\ No newline at end of file
+add_cab_target(kbdes 1)

diff --git a/dll/keyboard/kbdest/CMakeLists.txt b/dll/keyboard/kbdest/CMakeLists.txt
index 5d5ed34..d1a5a70 100644 (file)
--- a/dll/keyboard/kbdest/CMakeLists.txt
+++ b/dll/keyboard/kbdest/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdest 0)
 
 add_dependencies(kbdest psdk buildno_header)
 
-add_cab_target(kbdest 1)
\ No newline at end of file
+add_cab_target(kbdest 1)

diff --git a/dll/keyboard/kbdfc/CMakeLists.txt b/dll/keyboard/kbdfc/CMakeLists.txt
index b41c8c9..9a2ee4f 100644 (file)
--- a/dll/keyboard/kbdfc/CMakeLists.txt
+++ b/dll/keyboard/kbdfc/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdfc 0)
 
 add_dependencies(kbdfc psdk buildno_header)
 
-add_cab_target(kbdfc 1)
\ No newline at end of file
+add_cab_target(kbdfc 1)

diff --git a/dll/keyboard/kbdfi/CMakeLists.txt b/dll/keyboard/kbdfi/CMakeLists.txt
index 140c2ab..110607f 100644 (file)
--- a/dll/keyboard/kbdfi/CMakeLists.txt
+++ b/dll/keyboard/kbdfi/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdfi 0)
 
 add_dependencies(kbdfi psdk buildno_header)
 
-add_cab_target(kbdfi 1)
\ No newline at end of file
+add_cab_target(kbdfi 1)

diff --git a/dll/keyboard/kbdgeo/CMakeLists.txt b/dll/keyboard/kbdgeo/CMakeLists.txt
index 2464f68..e808fc5 100644 (file)
--- a/dll/keyboard/kbdgeo/CMakeLists.txt
+++ b/dll/keyboard/kbdgeo/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdgeo 0)
 
 add_dependencies(kbdgeo psdk buildno_header)
 
-add_cab_target(kbdgeo 1)
\ No newline at end of file
+add_cab_target(kbdgeo 1)

diff --git a/dll/keyboard/kbdgerg/CMakeLists.txt b/dll/keyboard/kbdgerg/CMakeLists.txt
index cc3f460..d884d6f 100644 (file)
--- a/dll/keyboard/kbdgerg/CMakeLists.txt
+++ b/dll/keyboard/kbdgerg/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdgerg 0)
 
 add_dependencies(kbdgerg psdk buildno_header)
 
-add_cab_target(kbdgerg 1)
\ No newline at end of file
+add_cab_target(kbdgerg 1)

diff --git a/dll/keyboard/kbdgneo/CMakeLists.txt b/dll/keyboard/kbdgneo/CMakeLists.txt
index 7634d9b..35dcbc2 100644 (file)
--- a/dll/keyboard/kbdgneo/CMakeLists.txt
+++ b/dll/keyboard/kbdgneo/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdgneo 0)
 
 add_dependencies(kbdgneo psdk buildno_header)
 
-add_cab_target(kbdgneo 1)
\ No newline at end of file
+add_cab_target(kbdgneo 1)

diff --git a/dll/keyboard/kbdgr/CMakeLists.txt b/dll/keyboard/kbdgr/CMakeLists.txt
index ec62fa9..a98cc5f 100644 (file)
--- a/dll/keyboard/kbdgr/CMakeLists.txt
+++ b/dll/keyboard/kbdgr/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdgr 0)
 
 add_dependencies(kbdgr psdk buildno_header)
 
-add_cab_target(kbdgr 1)
\ No newline at end of file
+add_cab_target(kbdgr 1)

diff --git a/dll/keyboard/kbdgrist/CMakeLists.txt b/dll/keyboard/kbdgrist/CMakeLists.txt
index 66a5e5d..3834f04 100644 (file)
--- a/dll/keyboard/kbdgrist/CMakeLists.txt
+++ b/dll/keyboard/kbdgrist/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdgrist 0)
 
 add_dependencies(kbdgrist psdk buildno_header)
 
-add_cab_target(kbdgrist 1)
\ No newline at end of file
+add_cab_target(kbdgrist 1)

diff --git a/dll/keyboard/kbdhe/CMakeLists.txt b/dll/keyboard/kbdhe/CMakeLists.txt
index 5a62b2c..e3909b2 100644 (file)
--- a/dll/keyboard/kbdhe/CMakeLists.txt
+++ b/dll/keyboard/kbdhe/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdhe 0)
 
 add_dependencies(kbdhe psdk buildno_header)
 
-add_cab_target(kbdhe 1)
\ No newline at end of file
+add_cab_target(kbdhe 1)

diff --git a/dll/keyboard/kbdheb/CMakeLists.txt b/dll/keyboard/kbdheb/CMakeLists.txt
index 24b9021..7fabb20 100644 (file)
--- a/dll/keyboard/kbdheb/CMakeLists.txt
+++ b/dll/keyboard/kbdheb/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdheb 0)
 
 add_dependencies(kbdheb psdk buildno_header)
 
-add_cab_target(kbdheb 1)
\ No newline at end of file
+add_cab_target(kbdheb 1)

diff --git a/dll/keyboard/kbdhu/CMakeLists.txt b/dll/keyboard/kbdhu/CMakeLists.txt
index b85c93a..66783d5 100644 (file)
--- a/dll/keyboard/kbdhu/CMakeLists.txt
+++ b/dll/keyboard/kbdhu/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdhu 0)
 
 add_dependencies(kbdhu psdk buildno_header)
 
-add_cab_target(kbdhu 1)
\ No newline at end of file
+add_cab_target(kbdhu 1)

diff --git a/dll/keyboard/kbdic/CMakeLists.txt b/dll/keyboard/kbdic/CMakeLists.txt
index eff744a..432f51a 100644 (file)
--- a/dll/keyboard/kbdic/CMakeLists.txt
+++ b/dll/keyboard/kbdic/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdic 0)
 
 add_dependencies(kbdic psdk buildno_header)
 
-add_cab_target(kbdic 1)
\ No newline at end of file
+add_cab_target(kbdic 1)

diff --git a/dll/keyboard/kbdinasa/CMakeLists.txt b/dll/keyboard/kbdinasa/CMakeLists.txt
index 659c7fa..7d0831b 100644 (file)
--- a/dll/keyboard/kbdinasa/CMakeLists.txt
+++ b/dll/keyboard/kbdinasa/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdinasa 0)
 
 add_dependencies(kbdinasa psdk buildno_header)
 
-add_cab_target(kbdinasa 1)
\ No newline at end of file
+add_cab_target(kbdinasa 1)

diff --git a/dll/keyboard/kbdinben/CMakeLists.txt b/dll/keyboard/kbdinben/CMakeLists.txt
index aecc6f0..de30cc3 100644 (file)
--- a/dll/keyboard/kbdinben/CMakeLists.txt
+++ b/dll/keyboard/kbdinben/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdinben 0)
 
 add_dependencies(kbdinben psdk buildno_header)
 
-add_cab_target(kbdinben 1)
\ No newline at end of file
+add_cab_target(kbdinben 1)

diff --git a/dll/keyboard/kbdindev/CMakeLists.txt b/dll/keyboard/kbdindev/CMakeLists.txt
index 58c0287..fcc6d05 100644 (file)
--- a/dll/keyboard/kbdindev/CMakeLists.txt
+++ b/dll/keyboard/kbdindev/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdindev 0)
 
 add_dependencies(kbdindev psdk buildno_header)
 
-add_cab_target(kbdindev 1)
\ No newline at end of file
+add_cab_target(kbdindev 1)

diff --git a/dll/keyboard/kbdinguj/CMakeLists.txt b/dll/keyboard/kbdinguj/CMakeLists.txt
index ebe15d8..f943709 100644 (file)
--- a/dll/keyboard/kbdinguj/CMakeLists.txt
+++ b/dll/keyboard/kbdinguj/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdinguj 0)
 
 add_dependencies(kbdinguj psdk buildno_header)
 
-add_cab_target(kbdinguj 1)
\ No newline at end of file
+add_cab_target(kbdinguj 1)

diff --git a/dll/keyboard/kbdinmal/CMakeLists.txt b/dll/keyboard/kbdinmal/CMakeLists.txt
index 014a380..1e693c7 100644 (file)
--- a/dll/keyboard/kbdinmal/CMakeLists.txt
+++ b/dll/keyboard/kbdinmal/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdinmal 0)
 
 add_dependencies(kbdinmal psdk buildno_header)
 
-add_cab_target(kbdinmal 1)
\ No newline at end of file
+add_cab_target(kbdinmal 1)

diff --git a/dll/keyboard/kbdir/CMakeLists.txt b/dll/keyboard/kbdir/CMakeLists.txt
index 5304073..4a484f2 100644 (file)
--- a/dll/keyboard/kbdir/CMakeLists.txt
+++ b/dll/keyboard/kbdir/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdir 0)
 
 add_dependencies(kbdir psdk buildno_header)
 
-add_cab_target(kbdir 1)
\ No newline at end of file
+add_cab_target(kbdir 1)

diff --git a/dll/keyboard/kbdit/CMakeLists.txt b/dll/keyboard/kbdit/CMakeLists.txt
index 8d92275..d82e9ed 100644 (file)
--- a/dll/keyboard/kbdit/CMakeLists.txt
+++ b/dll/keyboard/kbdit/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdit 0)
 
 add_dependencies(kbdit psdk buildno_header)
 
-add_cab_target(kbdit 1)
\ No newline at end of file
+add_cab_target(kbdit 1)

diff --git a/dll/keyboard/kbdja/CMakeLists.txt b/dll/keyboard/kbdja/CMakeLists.txt
index 1e00e7a..b5b9c5b 100644 (file)
--- a/dll/keyboard/kbdja/CMakeLists.txt
+++ b/dll/keyboard/kbdja/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdja 0)
 
 add_dependencies(kbdja psdk buildno_header)
 
-add_cab_target(kbdja 1)
\ No newline at end of file
+add_cab_target(kbdja 1)

diff --git a/dll/keyboard/kbdkaz/CMakeLists.txt b/dll/keyboard/kbdkaz/CMakeLists.txt
index caa4f9d..72b6f55 100644 (file)
--- a/dll/keyboard/kbdkaz/CMakeLists.txt
+++ b/dll/keyboard/kbdkaz/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdkaz 0)
 
 add_dependencies(kbdkaz psdk buildno_header)
 
-add_cab_target(kbdkaz 1)
\ No newline at end of file
+add_cab_target(kbdkaz 1)

diff --git a/dll/keyboard/kbdko/CMakeLists.txt b/dll/keyboard/kbdko/CMakeLists.txt
index cfb8ba4..60e37cb 100644 (file)
--- a/dll/keyboard/kbdko/CMakeLists.txt
+++ b/dll/keyboard/kbdko/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdko 0)
 
 add_dependencies(kbdko psdk buildno_header)
 
-add_cab_target(kbdko 1)
\ No newline at end of file
+add_cab_target(kbdko 1)

diff --git a/dll/keyboard/kbdla/CMakeLists.txt b/dll/keyboard/kbdla/CMakeLists.txt
index 1c33f45..e695741 100644 (file)
--- a/dll/keyboard/kbdla/CMakeLists.txt
+++ b/dll/keyboard/kbdla/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdla 0)
 
 add_dependencies(kbdla psdk buildno_header)
 
-add_cab_target(kbdla 1)
\ No newline at end of file
+add_cab_target(kbdla 1)

diff --git a/dll/keyboard/kbdlt1/CMakeLists.txt b/dll/keyboard/kbdlt1/CMakeLists.txt
index 51c8c18..8fb0426 100644 (file)
--- a/dll/keyboard/kbdlt1/CMakeLists.txt
+++ b/dll/keyboard/kbdlt1/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdlt1 0)
 
 add_dependencies(kbdlt1 psdk buildno_header)
 
-add_cab_target(kbdlt1 1)
\ No newline at end of file
+add_cab_target(kbdlt1 1)

diff --git a/dll/keyboard/kbdlv/CMakeLists.txt b/dll/keyboard/kbdlv/CMakeLists.txt
index 09c67e7..f038c9e 100644 (file)
--- a/dll/keyboard/kbdlv/CMakeLists.txt
+++ b/dll/keyboard/kbdlv/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdlv 0)
 
 add_dependencies(kbdlv psdk buildno_header)
 
-add_cab_target(kbdlv 1)
\ No newline at end of file
+add_cab_target(kbdlv 1)

diff --git a/dll/keyboard/kbdmac/CMakeLists.txt b/dll/keyboard/kbdmac/CMakeLists.txt
index c895ff2..9cbe275 100644 (file)
--- a/dll/keyboard/kbdmac/CMakeLists.txt
+++ b/dll/keyboard/kbdmac/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdmac 0)
 
 add_dependencies(kbdmac psdk buildno_header)
 
-add_cab_target(kbdmac 1)
\ No newline at end of file
+add_cab_target(kbdmac 1)

diff --git a/dll/keyboard/kbdne/CMakeLists.txt b/dll/keyboard/kbdne/CMakeLists.txt
index 822bd5b..01856f8 100644 (file)
--- a/dll/keyboard/kbdne/CMakeLists.txt
+++ b/dll/keyboard/kbdne/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdne 0)
 
 add_dependencies(kbdne psdk buildno_header)
 
-add_cab_target(kbdne 1)
\ No newline at end of file
+add_cab_target(kbdne 1)

diff --git a/dll/keyboard/kbdno/CMakeLists.txt b/dll/keyboard/kbdno/CMakeLists.txt
index f57213a..e764817 100644 (file)
--- a/dll/keyboard/kbdno/CMakeLists.txt
+++ b/dll/keyboard/kbdno/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdno 0)
 
 add_dependencies(kbdno psdk buildno_header)
 
-add_cab_target(kbdno 1)
\ No newline at end of file
+add_cab_target(kbdno 1)

diff --git a/dll/keyboard/kbdpl1/CMakeLists.txt b/dll/keyboard/kbdpl1/CMakeLists.txt
index 6f78475..36d4797 100644 (file)
--- a/dll/keyboard/kbdpl1/CMakeLists.txt
+++ b/dll/keyboard/kbdpl1/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdpl1 0)
 
 add_dependencies(kbdpl1 psdk buildno_header)
 
-add_cab_target(kbdpl1 1)
\ No newline at end of file
+add_cab_target(kbdpl1 1)

diff --git a/dll/keyboard/kbdpo/CMakeLists.txt b/dll/keyboard/kbdpo/CMakeLists.txt
index 6f13615..0c0247b 100644 (file)
--- a/dll/keyboard/kbdpo/CMakeLists.txt
+++ b/dll/keyboard/kbdpo/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdpo 0)
 
 add_dependencies(kbdpo psdk buildno_header)
 
-add_cab_target(kbdpo 1)
\ No newline at end of file
+add_cab_target(kbdpo 1)

diff --git a/dll/keyboard/kbdro/CMakeLists.txt b/dll/keyboard/kbdro/CMakeLists.txt
index 5e651bc..872f894 100644 (file)
--- a/dll/keyboard/kbdro/CMakeLists.txt
+++ b/dll/keyboard/kbdro/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdro 0)
 
 add_dependencies(kbdro psdk buildno_header)
 
-add_cab_target(kbdro 1)
\ No newline at end of file
+add_cab_target(kbdro 1)

diff --git a/dll/keyboard/kbdru/CMakeLists.txt b/dll/keyboard/kbdru/CMakeLists.txt
index 6d0a757..65f7038 100644 (file)
--- a/dll/keyboard/kbdru/CMakeLists.txt
+++ b/dll/keyboard/kbdru/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdru 0)
 
 add_dependencies(kbdru psdk buildno_header)
 
-add_cab_target(kbdru 1)
\ No newline at end of file
+add_cab_target(kbdru 1)

diff --git a/dll/keyboard/kbdru1/CMakeLists.txt b/dll/keyboard/kbdru1/CMakeLists.txt
index ab27679..38b6724 100644 (file)
--- a/dll/keyboard/kbdru1/CMakeLists.txt
+++ b/dll/keyboard/kbdru1/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdru1 0)
 
 add_dependencies(kbdru1 psdk buildno_header)
 
-add_cab_target(kbdru1 1)
\ No newline at end of file
+add_cab_target(kbdru1 1)

diff --git a/dll/keyboard/kbdsg/CMakeLists.txt b/dll/keyboard/kbdsg/CMakeLists.txt
index 2facf22..cba571d 100644 (file)
--- a/dll/keyboard/kbdsg/CMakeLists.txt
+++ b/dll/keyboard/kbdsg/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdsg 0)
 
 add_dependencies(kbdsg psdk buildno_header)
 
-add_cab_target(kbdsg 1)
\ No newline at end of file
+add_cab_target(kbdsg 1)

diff --git a/dll/keyboard/kbdsk/CMakeLists.txt b/dll/keyboard/kbdsk/CMakeLists.txt
index cce3512..cdf1478 100644 (file)
--- a/dll/keyboard/kbdsk/CMakeLists.txt
+++ b/dll/keyboard/kbdsk/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdsk 0)
 
 add_dependencies(kbdsk psdk buildno_header)
 
-add_cab_target(kbdsk 1)
\ No newline at end of file
+add_cab_target(kbdsk 1)

diff --git a/dll/keyboard/kbdsk1/CMakeLists.txt b/dll/keyboard/kbdsk1/CMakeLists.txt
index c9da90f..8bec861 100644 (file)
--- a/dll/keyboard/kbdsk1/CMakeLists.txt
+++ b/dll/keyboard/kbdsk1/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdsk1 0)
 
 add_dependencies(kbdsk1 psdk buildno_header)
 
-add_cab_target(kbdsk1 1)
\ No newline at end of file
+add_cab_target(kbdsk1 1)

diff --git a/dll/keyboard/kbdsw/CMakeLists.txt b/dll/keyboard/kbdsw/CMakeLists.txt
index 19e78fa..6e2abed 100644 (file)
--- a/dll/keyboard/kbdsw/CMakeLists.txt
+++ b/dll/keyboard/kbdsw/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdsw 0)
 
 add_dependencies(kbdsw psdk buildno_header)
 
-add_cab_target(kbdsw 1)
\ No newline at end of file
+add_cab_target(kbdsw 1)

diff --git a/dll/keyboard/kbdtat/CMakeLists.txt b/dll/keyboard/kbdtat/CMakeLists.txt
index c0bc983..42c67fe 100644 (file)
--- a/dll/keyboard/kbdtat/CMakeLists.txt
+++ b/dll/keyboard/kbdtat/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdtat 0)
 
 add_dependencies(kbdtat psdk buildno_header)
 
-add_cab_target(kbdtat 1)
\ No newline at end of file
+add_cab_target(kbdtat 1)

diff --git a/dll/keyboard/kbdth0/CMakeLists.txt b/dll/keyboard/kbdth0/CMakeLists.txt
index 1633046..27b715b 100644 (file)
--- a/dll/keyboard/kbdth0/CMakeLists.txt
+++ b/dll/keyboard/kbdth0/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdth0 0)
 
 add_dependencies(kbdth0 psdk buildno_header)
 
-add_cab_target(kbdth0 1)
\ No newline at end of file
+add_cab_target(kbdth0 1)

diff --git a/dll/keyboard/kbdth1/CMakeLists.txt b/dll/keyboard/kbdth1/CMakeLists.txt
index 3c332ab..b6193d1 100644 (file)
--- a/dll/keyboard/kbdth1/CMakeLists.txt
+++ b/dll/keyboard/kbdth1/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdth1 0)
 
 add_dependencies(kbdth1 psdk buildno_header)
 
-add_cab_target(kbdth1 1)
\ No newline at end of file
+add_cab_target(kbdth1 1)

diff --git a/dll/keyboard/kbdth2/CMakeLists.txt b/dll/keyboard/kbdth2/CMakeLists.txt
index 2be0e9a..776e3df 100644 (file)
--- a/dll/keyboard/kbdth2/CMakeLists.txt
+++ b/dll/keyboard/kbdth2/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdth2 0)
 
 add_dependencies(kbdth2 psdk buildno_header)
 
-add_cab_target(kbdth2 1)
\ No newline at end of file
+add_cab_target(kbdth2 1)

diff --git a/dll/keyboard/kbdth3/CMakeLists.txt b/dll/keyboard/kbdth3/CMakeLists.txt
index 2617347..9e816c7 100644 (file)
--- a/dll/keyboard/kbdth3/CMakeLists.txt
+++ b/dll/keyboard/kbdth3/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdth3 0)
 
 add_dependencies(kbdth3 psdk buildno_header)
 
-add_cab_target(kbdth3 1)
\ No newline at end of file
+add_cab_target(kbdth3 1)

diff --git a/dll/keyboard/kbdtuf/CMakeLists.txt b/dll/keyboard/kbdtuf/CMakeLists.txt
index d23fced..4426ecc 100644 (file)
--- a/dll/keyboard/kbdtuf/CMakeLists.txt
+++ b/dll/keyboard/kbdtuf/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdtuf 0)
 
 add_dependencies(kbdtuf psdk buildno_header)
 
-add_cab_target(kbdtuf 1)
\ No newline at end of file
+add_cab_target(kbdtuf 1)

diff --git a/dll/keyboard/kbdtuq/CMakeLists.txt b/dll/keyboard/kbdtuq/CMakeLists.txt
index 40a5f2e..475f234 100644 (file)
--- a/dll/keyboard/kbdtuq/CMakeLists.txt
+++ b/dll/keyboard/kbdtuq/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdtuq 0)
 
 add_dependencies(kbdtuq psdk buildno_header)
 
-add_cab_target(kbdtuq 1)
\ No newline at end of file
+add_cab_target(kbdtuq 1)

diff --git a/dll/keyboard/kbduk/CMakeLists.txt b/dll/keyboard/kbduk/CMakeLists.txt
index ce81024..60850ee 100644 (file)
--- a/dll/keyboard/kbduk/CMakeLists.txt
+++ b/dll/keyboard/kbduk/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbduk 0)
 
 add_dependencies(kbduk psdk buildno_header)
 
-add_cab_target(kbduk 1)
\ No newline at end of file
+add_cab_target(kbduk 1)

diff --git a/dll/keyboard/kbdur/CMakeLists.txt b/dll/keyboard/kbdur/CMakeLists.txt
index b7cebce..0ee4730 100644 (file)
--- a/dll/keyboard/kbdur/CMakeLists.txt
+++ b/dll/keyboard/kbdur/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdur 0)
 
 add_dependencies(kbdur psdk buildno_header)
 
-add_cab_target(kbdur 1)
\ No newline at end of file
+add_cab_target(kbdur 1)

diff --git a/dll/keyboard/kbdurs/CMakeLists.txt b/dll/keyboard/kbdurs/CMakeLists.txt
index 7525db1..3bdbb8b 100644 (file)
--- a/dll/keyboard/kbdurs/CMakeLists.txt
+++ b/dll/keyboard/kbdurs/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdurs 0)
 
 add_dependencies(kbdurs psdk buildno_header)
 
-add_cab_target(kbdurs 1)
\ No newline at end of file
+add_cab_target(kbdurs 1)

diff --git a/dll/keyboard/kbdus/CMakeLists.txt b/dll/keyboard/kbdus/CMakeLists.txt
index c5a946c..9381dc1 100644 (file)
--- a/dll/keyboard/kbdus/CMakeLists.txt
+++ b/dll/keyboard/kbdus/CMakeLists.txt
@@ -8,4 +8,4 @@ set_entrypoint(kbdus 0)
 
 add_dependencies(kbdus psdk buildno_header)
 
-add_cab_target(kbdus 1)
\ No newline at end of file
+add_cab_target(kbdus 1)

diff --git a/dll/keyboard/kbdusa/CMakeLists.txt b/dll/keyboard/kbdusa/CMakeLists.txt
index 6a1ec44..05ee689 100644 (file)
--- a/dll/keyboard/kbdusa/CMakeLists.txt
+++ b/dll/keyboard/kbdusa/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdusa 0)
 
 add_dependencies(kbdusa psdk buildno_header)
 
-add_cab_target(kbdusa 1)
\ No newline at end of file
+add_cab_target(kbdusa 1)

diff --git a/dll/keyboard/kbdusl/CMakeLists.txt b/dll/keyboard/kbdusl/CMakeLists.txt
index 6c4fbae..85960e6 100644 (file)
--- a/dll/keyboard/kbdusl/CMakeLists.txt
+++ b/dll/keyboard/kbdusl/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdusl 0)
 
 add_dependencies(kbdusl psdk buildno_header)
 
-add_cab_target(kbdusl 1)
\ No newline at end of file
+add_cab_target(kbdusl 1)

diff --git a/dll/keyboard/kbdusr/CMakeLists.txt b/dll/keyboard/kbdusr/CMakeLists.txt
index 7f9524c..57c9c15 100644 (file)
--- a/dll/keyboard/kbdusr/CMakeLists.txt
+++ b/dll/keyboard/kbdusr/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdusr 0)
 
 add_dependencies(kbdusr psdk buildno_header)
 
-add_cab_target(kbdusr 1)
\ No newline at end of file
+add_cab_target(kbdusr 1)

diff --git a/dll/keyboard/kbdusx/CMakeLists.txt b/dll/keyboard/kbdusx/CMakeLists.txt
index 0a89ed0..53f79ba 100644 (file)
--- a/dll/keyboard/kbdusx/CMakeLists.txt
+++ b/dll/keyboard/kbdusx/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdusx 0)
 
 add_dependencies(kbdusx psdk buildno_header)
 
-add_cab_target(kbdusx 1)
\ No newline at end of file
+add_cab_target(kbdusx 1)

diff --git a/dll/keyboard/kbduzb/CMakeLists.txt b/dll/keyboard/kbduzb/CMakeLists.txt
index 40896d6..c7ada8f 100644 (file)
--- a/dll/keyboard/kbduzb/CMakeLists.txt
+++ b/dll/keyboard/kbduzb/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbduzb 0)
 
 add_dependencies(kbduzb psdk buildno_header)
 
-add_cab_target(kbduzb 1)
\ No newline at end of file
+add_cab_target(kbduzb 1)

diff --git a/dll/keyboard/kbdvntc/CMakeLists.txt b/dll/keyboard/kbdvntc/CMakeLists.txt
index 52df7b8..23391ec 100644 (file)
--- a/dll/keyboard/kbdvntc/CMakeLists.txt
+++ b/dll/keyboard/kbdvntc/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdvntc 0)
 
 add_dependencies(kbdvntc psdk buildno_header)
 
-add_cab_target(kbdvntc 1)
\ No newline at end of file
+add_cab_target(kbdvntc 1)

diff --git a/dll/keyboard/kbdycc/CMakeLists.txt b/dll/keyboard/kbdycc/CMakeLists.txt
index 6b3ef91..6f8ff0c 100644 (file)
--- a/dll/keyboard/kbdycc/CMakeLists.txt
+++ b/dll/keyboard/kbdycc/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdycc 0)
 
 add_dependencies(kbdycc psdk buildno_header)
 
-add_cab_target(kbdycc 1)
\ No newline at end of file
+add_cab_target(kbdycc 1)

diff --git a/dll/keyboard/kbdycl/CMakeLists.txt b/dll/keyboard/kbdycl/CMakeLists.txt
index 4cfee74..2a1e1e2 100644 (file)
--- a/dll/keyboard/kbdycl/CMakeLists.txt
+++ b/dll/keyboard/kbdycl/CMakeLists.txt
@@ -9,4 +9,4 @@ set_entrypoint(kbdycl 0)
 
 add_dependencies(kbdycl psdk buildno_header)
 
-add_cab_target(kbdycl 1)
\ No newline at end of file
+add_cab_target(kbdycl 1)

diff --git a/dll/win32/acledit/CMakeLists.txt b/dll/win32/acledit/CMakeLists.txt
index 2b56c18..884f3e4 100644 (file)
--- a/dll/win32/acledit/CMakeLists.txt
+++ b/dll/win32/acledit/CMakeLists.txt
@@ -1,6 +1,8 @@
 
 set_unicode()
 
+spec2def(acledit.dll acledit.spec)
+
 list(APPEND SOURCE
     acledit.c
     stubs.c
@@ -10,12 +12,6 @@ list(APPEND SOURCE
 add_library(acledit SHARED ${SOURCE})
 
 set_module_type(acledit win32dll)
-
-set_export_spec(acledit acledit.spec)
-
 add_importlibs(acledit msvcrt kernel32 ntdll)
-
 add_cab_target(acledit 1)
-
 add_importlib_target(acledit.spec)
-

diff --git a/dll/win32/activeds/CMakeLists.txt b/dll/win32/activeds/CMakeLists.txt
index 99a35e4..7fe72e8 100644 (file)
--- a/dll/win32/activeds/CMakeLists.txt
+++ b/dll/win32/activeds/CMakeLists.txt
@@ -18,5 +18,4 @@ target_link_libraries(activeds wine)
 
 add_importlibs(activeds msvcrt kernel32 ntdll)
 
-
 add_cab_target(activeds 1)

diff --git a/dll/win32/advpack/CMakeLists.txt b/dll/win32/advpack/CMakeLists.txt
index 392dd53..f988c61 100644 (file)
--- a/dll/win32/advpack/CMakeLists.txt
+++ b/dll/win32/advpack/CMakeLists.txt
@@ -3,16 +3,14 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+spec2def(advpack.dll advpack.spec)
+
 list(APPEND SOURCE
     advpack.c
     files.c
     install.c
     reg.c
-    advpack.def)
-
-if(NOT MSVC)
-    set_source_files_properties(advpack.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+    ${CMAKE_CURRENT_BINARY_DIR}/advpack.def)
 
 add_library(advpack SHARED ${SOURCE})
 
@@ -21,5 +19,4 @@ set_module_type(advpack win32dll)
 target_link_libraries(advpack wine)
 
 add_importlibs(advpack ole32 setupapi version advapi32 msvcrt kernel32 ntdll)
-
 add_cab_target(advpack 1)

diff --git a/dll/win32/atl/CMakeLists.txt b/dll/win32/atl/CMakeLists.txt
index dc965ab..fa58664 100644 (file)
--- a/dll/win32/atl/CMakeLists.txt
+++ b/dll/win32/atl/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_definitions(-D__WINESRC__)
 
 remove_definitions(-D_WIN32_WINNT=0x502)

diff --git a/dll/win32/authz/CMakeLists.txt b/dll/win32/authz/CMakeLists.txt
index 1638288..f20118a 100644 (file)
--- a/dll/win32/authz/CMakeLists.txt
+++ b/dll/win32/authz/CMakeLists.txt
@@ -1,6 +1,8 @@
 
 set_unicode()
 
+spec2def(authz.dll authz.spec)
+
 list(APPEND SOURCE
     authz.c
     clictx.c
@@ -8,8 +10,6 @@ list(APPEND SOURCE
     authz.rc
     ${CMAKE_CURRENT_BINARY_DIR}/authz.def)
 
-spec2def(authz.dll authz.spec)
-
 add_library(authz SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/authz_precomp.h.gch
     ${SOURCE})

diff --git a/dll/win32/avifil32/CMakeLists.txt b/dll/win32/avifil32/CMakeLists.txt
index c5c72a5..c11db8b 100644 (file)
--- a/dll/win32/avifil32/CMakeLists.txt
+++ b/dll/win32/avifil32/CMakeLists.txt
@@ -1,6 +1,7 @@
 
-add_definitions(-D__WINESRC__)
-add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(
+    -D__WINESRC__
+    -D_DLL -D__USE_CRTIMP)
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)

diff --git a/dll/win32/beepmidi/CMakeLists.txt b/dll/win32/beepmidi/CMakeLists.txt
index e9212f3..b70bb78 100644 (file)
--- a/dll/win32/beepmidi/CMakeLists.txt
+++ b/dll/win32/beepmidi/CMakeLists.txt
@@ -1,15 +1,17 @@
 
 set_unicode()
 
-add_library(beepmidi SHARED beepmidi.c ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def)
+spec2def(beepmidi.dll beepmidi.spec)
 
-set_export_spec(beepmidi beepmidi.spec)
+list(APPEND SOURCE
+    beepmidi.c
+    ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def)
 
-add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def)
+add_library(beepmidi SHARED ${SOURCE})
 
 set_entrypoint(beepmidi 0)
-
 add_importlibs(beepmidi winmm kernel32 ntdll)
+add_importlib_target(beepmidi.spec)
+
 add_dependencies(beepmidi psdk)
 add_cab_target(beepmidi 1)
-

diff --git a/dll/win32/cards/CMakeLists.txt b/dll/win32/cards/CMakeLists.txt
index 3e5e8f9..ac82cd0 100644 (file)
--- a/dll/win32/cards/CMakeLists.txt
+++ b/dll/win32/cards/CMakeLists.txt
@@ -4,17 +4,16 @@ set_unicode()
 # Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN
 add_definitions(-DCARDSTYLE_DEFAULT)
 
-add_library(cards SHARED
+spec2def(cards.dll cards.spec)
+
+list(APPEND SOURCE
     cards.c
     cards.rc
     ${CMAKE_CURRENT_BINARY_DIR}/cards.def)
 
-set_export_spec(cards cards.spec)
-
-add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/cards.def)
+add_library(cards SHARED ${SOURCE})
 
 set_module_type(cards win32dll)
-
 add_importlibs(cards user32 gdi32 msvcrt kernel32)
-
+add_importlib_target(cards.spec)
 add_cab_target(cards 1)

diff --git a/dll/win32/cfgmgr32/CMakeLists.txt b/dll/win32/cfgmgr32/CMakeLists.txt
index 7b445d4..dfd5666 100644 (file)
--- a/dll/win32/cfgmgr32/CMakeLists.txt
+++ b/dll/win32/cfgmgr32/CMakeLists.txt
@@ -4,6 +4,7 @@ spec2def(cfgmgr32.dll cfgmgr32.spec)
 list(APPEND SOURCE 
     cfgmgr32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def)
+
 add_library(cfgmgr32 SHARED ${SOURCE})
 
 set_entrypoint(cfgmgr32 0)

diff --git a/dll/win32/comcat/CMakeLists.txt b/dll/win32/comcat/CMakeLists.txt
index f9a1c4f..eeca335 100644 (file)
--- a/dll/win32/comcat/CMakeLists.txt
+++ b/dll/win32/comcat/CMakeLists.txt
@@ -6,23 +6,20 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(comcat SHARED comcat_main.c version.rc comcat.def)
+spec2def(comcat.dll comcat.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(comcat.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    comcat_main.c
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/comcat.def)
+
+add_library(comcat SHARED ${SOURCE})
 
 set_entrypoint(comcat 0)
 
-target_link_libraries(comcat
-    uuid
-    wine)
+target_link_libraries(comcat uuid wine)
 
-add_importlibs(comcat
-    ole32
-    user32
-    advapi32
-    ntdll)
+add_importlibs(comcat ole32 user32 advapi32 ntdll)
 
 add_dependencies(comcat psdk buildno_header)
 add_cab_target(comcat 1)

diff --git a/dll/win32/comdlg32/CMakeLists.txt b/dll/win32/comdlg32/CMakeLists.txt
index a614093..d2e8258 100644 (file)
--- a/dll/win32/comdlg32/CMakeLists.txt
+++ b/dll/win32/comdlg32/CMakeLists.txt
@@ -1,10 +1,13 @@
 
-add_definitions(-D__WINESRC__)
-add_definitions(-D_WINE)
-add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(
+    -D__WINESRC__
+    -D_WINE
+    -D_DLL -D__USE_CRTIMP)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(comdlg32.dll comdlg32.spec)
 
 list(APPEND SOURCE
@@ -23,9 +26,7 @@ add_library(comdlg32 SHARED ${SOURCE})
 
 set_module_type(comdlg32 win32dll)
 
-target_link_libraries(comdlg32
-    uuid
-    wine)
+target_link_libraries(comdlg32 uuid wine)
 
 add_importlibs(comdlg32
     shell32
@@ -40,6 +41,5 @@ add_importlibs(comdlg32
     kernel32
     ntdll)
 
-
 add_cab_target(comdlg32 1)
 add_importlib_target(comdlg32.spec)

diff --git a/dll/win32/compstui/CMakeLists.txt b/dll/win32/compstui/CMakeLists.txt
index f42488a..ed89e61 100644 (file)
--- a/dll/win32/compstui/CMakeLists.txt
+++ b/dll/win32/compstui/CMakeLists.txt
@@ -1,17 +1,20 @@
 
 add_definitions(-D__WINESRC__)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(compstui SHARED compstui_main.c ${CMAKE_CURRENT_BINARY_DIR}/compstui.def)
+spec2def(compstui.dll compstui.spec)
 
-set_module_type(compstui win32dll)
+list(APPEND SOURCE
+    compstui_main.c
+    ${CMAKE_CURRENT_BINARY_DIR}/compstui.def)
+
+add_library(compstui SHARED ${SOURCE})
 
-set_export_spec(compstui compstui.spec)
+set_module_type(compstui win32dll)
 
 target_link_libraries(compstui wine)
 
 add_importlibs(compstui msvcrt kernel32 ntdll)
-
 add_cab_target(compstui 1)
 add_importlib_target(compstui.spec)
-

diff --git a/dll/win32/credui/CMakeLists.txt b/dll/win32/credui/CMakeLists.txt
index 338c213..b5c3656 100644 (file)
--- a/dll/win32/credui/CMakeLists.txt
+++ b/dll/win32/credui/CMakeLists.txt
@@ -4,6 +4,7 @@ add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(credui.dll credui.spec)
 
 list(APPEND SOURCE
@@ -19,5 +20,4 @@ target_link_libraries(credui wine)
 
 add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll)
 add_importlib_target(credui.spec)
-
 add_cab_target(credui 1)

diff --git a/dll/win32/crypt32/CMakeLists.txt b/dll/win32/crypt32/CMakeLists.txt
index 93f78b6..4d535e9 100644 (file)
--- a/dll/win32/crypt32/CMakeLists.txt
+++ b/dll/win32/crypt32/CMakeLists.txt
@@ -11,6 +11,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(crypt32.dll crypt32.spec)
 
 list(APPEND SOURCE

diff --git a/dll/win32/cryptdlg/CMakeLists.txt b/dll/win32/cryptdlg/CMakeLists.txt
index 1891163..43162cc 100644 (file)
--- a/dll/win32/cryptdlg/CMakeLists.txt
+++ b/dll/win32/cryptdlg/CMakeLists.txt
@@ -3,6 +3,7 @@ add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(cryptdlg.dll cryptdlg.spec)
 
 list(APPEND SOURCE
@@ -26,5 +27,4 @@ add_importlibs(cryptdlg
     kernel32
     ntdll)
 
-
 add_cab_target(cryptdlg 1)

diff --git a/dll/win32/cryptdll/CMakeLists.txt b/dll/win32/cryptdll/CMakeLists.txt
index 54a2b34..748a429 100644 (file)
--- a/dll/win32/cryptdll/CMakeLists.txt
+++ b/dll/win32/cryptdll/CMakeLists.txt
@@ -5,17 +5,14 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(cryptdll.dll cryptdll.spec)
 
-add_library(cryptdll SHARED
-            cryptdll.c
-            stubs.c
-            ${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def)
+list(APPEND SOURCE
+    cryptdll.c
+    stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def)
 
-set_module_type(cryptdll win32dll)
-
-target_link_libraries(cryptdll
-    ${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def
-    wine)
+add_library(cryptdll SHARED ${SOURCE})
 
+set_module_type(cryptdll win32dll)
+target_link_libraries(cryptdll wine)
 add_importlibs(cryptdll msvcrt kernel32 ntdll)
-
 add_cab_target(cryptdll 1)

diff --git a/dll/win32/cryptui/CMakeLists.txt b/dll/win32/cryptui/CMakeLists.txt
index 149164e..fff4003 100644 (file)
--- a/dll/win32/cryptui/CMakeLists.txt
+++ b/dll/win32/cryptui/CMakeLists.txt
@@ -18,9 +18,7 @@ add_library(cryptui SHARED ${SOURCE})
 
 set_module_type(cryptui win32dll)
 
-target_link_libraries(cryptui
-    uuid
-    wine)
+target_link_libraries(cryptui uuid wine)
 
 add_importlibs(cryptui
     user32
@@ -37,5 +35,4 @@ add_importlibs(cryptui
     ntdll)
 
 add_importlib_target(cryptui.spec)
-
 add_cab_target(cryptui 1)

diff --git a/dll/win32/dbghelp/CMakeLists.txt b/dll/win32/dbghelp/CMakeLists.txt
index 7c7628d..ea5a6d4 100644 (file)
--- a/dll/win32/dbghelp/CMakeLists.txt
+++ b/dll/win32/dbghelp/CMakeLists.txt
@@ -14,6 +14,7 @@ endif(ARCH MATCHES amd64)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(dbghelp.dll dbghelp.spec)
 
 list(APPEND SOURCE
@@ -53,7 +54,5 @@ target_link_libraries(dbghelp
     oldnames)
 
 add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll)
-
 add_importlib_target(dbghelp.spec)
-
 add_cab_target(dbghelp 1)

diff --git a/dll/win32/dciman32/CMakeLists.txt b/dll/win32/dciman32/CMakeLists.txt
index 53fa927..9b2a7a8 100644 (file)
--- a/dll/win32/dciman32/CMakeLists.txt
+++ b/dll/win32/dciman32/CMakeLists.txt
@@ -4,6 +4,7 @@ add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(dciman32.dll dciman32.spec)
 
 list(APPEND SOURCE
@@ -13,9 +14,6 @@ list(APPEND SOURCE
 add_library(dciman32 SHARED ${SOURCE})
 
 set_module_type(dciman32 win32dll)
-
 target_link_libraries(dciman32 wine)
-
 add_importlibs(dciman32 msvcrt kernel32 ntdll)
-
 add_cab_target(dciman32 1)

diff --git a/dll/win32/devmgr/CMakeLists.txt b/dll/win32/devmgr/CMakeLists.txt
index e684ec4..2d2c122 100644 (file)
--- a/dll/win32/devmgr/CMakeLists.txt
+++ b/dll/win32/devmgr/CMakeLists.txt
@@ -16,9 +16,7 @@ add_library(devmgr SHARED ${CMAKE_CURRENT_BINARY_DIR}/devmgr_precomp.h.gch ${SOU
 
 set_module_type(devmgr win32dll)
 
-target_link_libraries(devmgr
-    uuid
-    wine)
+target_link_libraries(devmgr uuid wine)
 
 add_importlibs(devmgr
     setupapi

diff --git a/dll/win32/dnsapi/CMakeLists.txt b/dll/win32/dnsapi/CMakeLists.txt
index cfb2b32..903db32 100644 (file)
--- a/dll/win32/dnsapi/CMakeLists.txt
+++ b/dll/win32/dnsapi/CMakeLists.txt
@@ -4,8 +4,9 @@ include_directories(
     ${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/src
     ${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/adns_win32)
 
-add_definitions(-D_DLL -D__USE_CRTIMP)
-add_definitions(-DADNS_JGAA_WIN32)
+add_definitions(
+    -D_DLL -D__USE_CRTIMP
+    -DADNS_JGAA_WIN32)
 
 spec2def(dnsapi.dll dnsapi.spec)
 

diff --git a/dll/win32/dwmapi/CMakeLists.txt b/dll/win32/dwmapi/CMakeLists.txt
index 53cf967..c68219b 100644 (file)
--- a/dll/win32/dwmapi/CMakeLists.txt
+++ b/dll/win32/dwmapi/CMakeLists.txt
@@ -4,6 +4,7 @@ add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(dwmapi.dll dwmapi.spec)
 
 list(APPEND SOURCE
@@ -14,9 +15,6 @@ list(APPEND SOURCE
 add_library(dwmapi SHARED ${SOURCE})
 
 set_module_type(dwmapi win32dll)
-
 target_link_libraries(dwmapi wine)
-
 add_importlibs(dwmapi msvcrt kernel32 ntdll)
-
 add_cab_target(dwmapi 1)

diff --git a/dll/win32/faultrep/CMakeLists.txt b/dll/win32/faultrep/CMakeLists.txt
index 456684f..9dd5305 100644 (file)
--- a/dll/win32/faultrep/CMakeLists.txt
+++ b/dll/win32/faultrep/CMakeLists.txt
@@ -4,6 +4,7 @@ add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(faultrep.dll faultrep.spec)
 
 list(APPEND SOURCE
@@ -13,9 +14,6 @@ list(APPEND SOURCE
 add_library(faultrep SHARED ${SOURCE})
 
 set_module_type(faultrep win32dll)
-
 target_link_libraries(faultrep wine)
-
 add_importlibs(faultrep advapi32 msvcrt kernel32 ntdll)
-
 add_cab_target(faultrep 1)

diff --git a/dll/win32/fusion/CMakeLists.txt b/dll/win32/fusion/CMakeLists.txt
index 914e4b4..1740494 100644 (file)
--- a/dll/win32/fusion/CMakeLists.txt
+++ b/dll/win32/fusion/CMakeLists.txt
@@ -4,6 +4,7 @@ add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(fusion.dll fusion.spec)
 
 list(APPEND SOURCE
@@ -18,9 +19,6 @@ list(APPEND SOURCE
 add_library(fusion SHARED ${SOURCE})
 
 set_module_type(fusion win32dll)
-
 target_link_libraries(fusion wine)
-
 add_importlibs(fusion shlwapi advapi32 dbghelp user32 msvcrt kernel32 ntdll)
-
 add_cab_target(fusion 1)

diff --git a/dll/win32/gdi32/CMakeLists.txt b/dll/win32/gdi32/CMakeLists.txt
index 2017a7c..9baa9f9 100644 (file)
--- a/dll/win32/gdi32/CMakeLists.txt
+++ b/dll/win32/gdi32/CMakeLists.txt
@@ -1,11 +1,14 @@
 
 set_unicode()
 
-add_definitions(-D_DLL -D__USE_CRTIMP)
-add_definitions(-DLANGPACK)
+add_definitions(
+    -D_DLL -D__USE_CRTIMP
+    -DLANGPACK)
 
 include_directories(include)
 
+spec2def(gdi32.dll gdi32.spec)
+
 list(APPEND SOURCE
     main/dllmain.c
     misc/heap.c
@@ -50,8 +53,6 @@ target_link_libraries(gdi32
     dxguid
     ${PSEH_LIB})
 
-set_export_spec(gdi32 gdi32.spec)
-
 add_importlibs(gdi32 user32 advapi32 msvcrt kernel32 ntdll)
 add_pch(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE})
 add_cab_target(gdi32 1)

diff --git a/dll/win32/getuname/CMakeLists.txt b/dll/win32/getuname/CMakeLists.txt
index 56b70e7..1c11b2e 100644 (file)
--- a/dll/win32/getuname/CMakeLists.txt
+++ b/dll/win32/getuname/CMakeLists.txt
@@ -3,17 +3,14 @@ set_unicode()
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+spec2def(getuname.dll getuname.spec)
+
 add_library(getuname SHARED
     getuname.c
     getuname.rc
     ${CMAKE_CURRENT_BINARY_DIR}/getuname.def)
 
-set_export_spec(getuname getuname.spec)
-
 add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/getuname.def)
-
 set_module_type(getuname win32dll)
-
 add_importlibs(getuname msvcrt kernel32 ntdll)
-
 add_cab_target(getuname 1)

diff --git a/dll/win32/glu32/CMakeLists.txt b/dll/win32/glu32/CMakeLists.txt
index 496cd30..8354eda 100644 (file)
--- a/dll/win32/glu32/CMakeLists.txt
+++ b/dll/win32/glu32/CMakeLists.txt
@@ -15,7 +15,7 @@ include_directories(
 
 spec2def(glu32.dll glu32.spec)
 
-add_library(glu32 SHARED
+list(APPEND SOURCE
     libnurbs/interface/bezierEval.cc
     libnurbs/interface/bezierPatch.cc
     libnurbs/interface/bezierPatchMesh.cc
@@ -107,6 +107,8 @@ add_library(glu32 SHARED
     libutil/registry.c
     ${CMAKE_CURRENT_BINARY_DIR}/glu32.def)
 
+add_library(glu32 SHARED ${SOURCE})
+
 set_entrypoint(glu32 0)
 
 target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 -lcoldname)
@@ -120,4 +122,3 @@ add_importlibs(glu32
 
 add_cab_target(glu32 1)
 add_importlib_target(glu32.spec)
-

diff --git a/dll/win32/hhctrl.ocx/CMakeLists.txt b/dll/win32/hhctrl.ocx/CMakeLists.txt
index 88f4b14..30101f6 100644 (file)
--- a/dll/win32/hhctrl.ocx/CMakeLists.txt
+++ b/dll/win32/hhctrl.ocx/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 add_definitions(-D__WINESRC__)
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
@@ -22,9 +23,7 @@ add_library(hhctrl SHARED
 
 set_module_type(hhctrl win32ocx)
 
-target_link_libraries(hhctrl
-    uuid
-    wine)
+target_link_libraries(hhctrl uuid wine)
 
 add_importlibs(hhctrl
     advapi32
@@ -38,4 +37,4 @@ add_importlibs(hhctrl
     kernel32
     ntdll)
 
-add_cab_target(hhctrl 1)
\ No newline at end of file
+add_cab_target(hhctrl 1)

diff --git a/dll/win32/hid/CMakeLists.txt b/dll/win32/hid/CMakeLists.txt
index 0a28895..8a22b0a 100644 (file)
--- a/dll/win32/hid/CMakeLists.txt
+++ b/dll/win32/hid/CMakeLists.txt
@@ -17,5 +17,4 @@ set_module_type(hid win32dll)
 
 add_importlibs(hid msvcrt kernel32 ntdll)
 add_pch(hid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
-
 add_cab_target(hid 1)

diff --git a/dll/win32/hlink/CMakeLists.txt b/dll/win32/hlink/CMakeLists.txt
index c9f328b..2a856ae 100644 (file)
--- a/dll/win32/hlink/CMakeLists.txt
+++ b/dll/win32/hlink/CMakeLists.txt
@@ -15,9 +15,7 @@ add_library(hlink SHARED ${SOURCE})
 
 set_module_type(hlink win32dll)
 
-target_link_libraries(hlink
-    uuid
-    wine)
+target_link_libraries(hlink uuid wine)
 
 add_importlibs(hlink
     shell32

diff --git a/dll/win32/hnetcfg/CMakeLists.txt b/dll/win32/hnetcfg/CMakeLists.txt
index f67ab02..b8fe19e 100644 (file)
--- a/dll/win32/hnetcfg/CMakeLists.txt
+++ b/dll/win32/hnetcfg/CMakeLists.txt
@@ -6,7 +6,9 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(hnetcfg SHARED
+spec2def(hnetcfg.dll hnetcfg.spec)
+
+list(APPEND SOURCE
     apps.c
     hnetcfg.c
     manager.c
@@ -15,11 +17,9 @@ add_library(hnetcfg SHARED
     profile.c
     regsvr.c
     service.c
-    hnetcfg.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/hnetcfg.def)
 
-if(NOT MSVC)
-    set_source_files_properties(hnetcfg.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+add_library(hnetcfg SHARED ${SOURCE})
 
 set_module_type(hnetcfg win32dll)
 

diff --git a/dll/win32/httpapi/CMakeLists.txt b/dll/win32/httpapi/CMakeLists.txt
index ff7a689..d2e9002 100644 (file)
--- a/dll/win32/httpapi/CMakeLists.txt
+++ b/dll/win32/httpapi/CMakeLists.txt
@@ -12,9 +12,6 @@ list(APPEND SOURCE
 add_library(httpapi SHARED ${SOURCE})
 
 set_module_type(httpapi win32dll)
-
 target_link_libraries(httpapi wine)
-
 add_importlibs(httpapi msvcrt kernel32 ntdll)
-
 add_cab_target(httpapi 1)

diff --git a/dll/win32/iccvid/CMakeLists.txt b/dll/win32/iccvid/CMakeLists.txt
index 32aec00..ba86b3f 100644 (file)
--- a/dll/win32/iccvid/CMakeLists.txt
+++ b/dll/win32/iccvid/CMakeLists.txt
@@ -1,17 +1,18 @@
 
 add_definitions(-D__WINESRC__)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(iccvid SHARED iccvid.c rsrc.rc iccvid.def)
+spec2def(iccvid.dll iccvid.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(iccvid.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    iccvid.c
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def)
 
-set_module_type(iccvid win32dll)
+add_library(iccvid SHARED ${SOURCE})
 
+set_module_type(iccvid win32dll)
 target_link_libraries(iccvid wine)
-
 add_importlibs(iccvid user32 msvcrt kernel32 ntdll)
-
 add_cab_target(iccvid 1)

diff --git a/dll/win32/icmp/CMakeLists.txt b/dll/win32/icmp/CMakeLists.txt
index aed1b62..cfded7b 100644 (file)
--- a/dll/win32/icmp/CMakeLists.txt
+++ b/dll/win32/icmp/CMakeLists.txt
@@ -2,6 +2,7 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(icmp.dll icmp.spec)
 
 list(APPEND SOURCE
@@ -14,7 +15,6 @@ add_library(icmp SHARED ${SOURCE})
 set_module_type(icmp win32dll)
 
 target_link_libraries(icmp wine)
-
 add_importlibs(icmp ws2_32 msvcrt kernel32 ntdll)
 add_importlib_target(icmp.spec)
 add_cab_target(icmp 1)

diff --git a/dll/win32/imaadp32.acm/CMakeLists.txt b/dll/win32/imaadp32.acm/CMakeLists.txt
index 963802e..aba329e 100644 (file)
--- a/dll/win32/imaadp32.acm/CMakeLists.txt
+++ b/dll/win32/imaadp32.acm/CMakeLists.txt
@@ -1,14 +1,17 @@
 
-add_definitions(-D_DLL -D__USE_CRTIMP)
-add_definitions(-D__WINESRC__)
+add_definitions(
+    -D_DLL -D__USE_CRTIMP
+    -D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(imaadp32.acm SHARED imaadp32.c imaadp32.def)
+spec2def(imaadp32.acm imaadp32.acm.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(imaadp32.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    imaadp32.c
+    ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.def)
+
+add_library(imaadp32.acm SHARED ${SOURCE})
 
 set_entrypoint(imaadp32.acm 0)
 set_target_properties(imaadp32.acm PROPERTIES SUFFIX "")

diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt
index be8c957..5b06e6b 100644 (file)
--- a/dll/win32/imm32/CMakeLists.txt
+++ b/dll/win32/imm32/CMakeLists.txt
@@ -7,6 +7,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(imm32.dll imm32.spec)
 
 list(APPEND SOURCE
@@ -17,10 +18,7 @@ list(APPEND SOURCE
 add_library(imm32 SHARED ${SOURCE})
 
 set_module_type(imm32 win32dll)
-
 target_link_libraries(imm32 wine)
-
 add_importlibs(imm32 advapi32 user32 msvcrt kernel32 ntdll)
-
 add_cab_target(imm32 1)
 add_importlib_target(imm32.spec)

diff --git a/dll/win32/inetcomm/CMakeLists.txt b/dll/win32/inetcomm/CMakeLists.txt
index c0924d6..aefd53f 100644 (file)
--- a/dll/win32/inetcomm/CMakeLists.txt
+++ b/dll/win32/inetcomm/CMakeLists.txt
@@ -1,7 +1,9 @@
 
 add_definitions(-D__WINESRC__)
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(inetcomm.dll inetcomm.spec)

diff --git a/dll/win32/inetmib1/CMakeLists.txt b/dll/win32/inetmib1/CMakeLists.txt
index 602fd27..f804283 100644 (file)
--- a/dll/win32/inetmib1/CMakeLists.txt
+++ b/dll/win32/inetmib1/CMakeLists.txt
@@ -1,6 +1,8 @@
 
-add_definitions(-D__WINESRC__)
-add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(
+    -D__WINESRC__
+    -D_DLL -D__USE_CRTIMP)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(inetmib1.dll inetmib1.spec)

diff --git a/dll/win32/initpki/CMakeLists.txt b/dll/win32/initpki/CMakeLists.txt
index 4d5e42d..2cdd32d 100644 (file)
--- a/dll/win32/initpki/CMakeLists.txt
+++ b/dll/win32/initpki/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 add_definitions(-D__WINESRC__)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(initpki.dll initpki.spec)
@@ -11,9 +12,6 @@ list(APPEND SOURCE
 add_library(initpki SHARED ${SOURCE})
 
 set_module_type(initpki win32dll)
-
 target_link_libraries(initpki wine)
-
 add_importlibs(initpki msvcrt kernel32 ntdll)
-
 add_cab_target(initpki 1)

diff --git a/dll/win32/inseng/CMakeLists.txt b/dll/win32/inseng/CMakeLists.txt
index 9cf1083..c02e840 100644 (file)
--- a/dll/win32/inseng/CMakeLists.txt
+++ b/dll/win32/inseng/CMakeLists.txt
@@ -1,7 +1,9 @@
 
 add_definitions(-D__WINESRC__)
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(inseng.dll inseng.spec)
@@ -15,9 +17,7 @@ add_library(inseng SHARED ${SOURCE})
 
 set_module_type(inseng win32dll)
 
-target_link_libraries(inseng
-    uuid
-    wine)
+target_link_libraries(inseng uuid wine)
 
 add_importlibs(inseng
     ole32
@@ -26,5 +26,4 @@ add_importlibs(inseng
     kernel32
     ntdll)
 
-
 add_cab_target(inseng 1)

diff --git a/dll/win32/iphlpapi/CMakeLists.txt b/dll/win32/iphlpapi/CMakeLists.txt
index d2d1d2c..40b793f 100644 (file)
--- a/dll/win32/iphlpapi/CMakeLists.txt
+++ b/dll/win32/iphlpapi/CMakeLists.txt
@@ -27,8 +27,6 @@ add_library(iphlpapi SHARED ${SOURCE})
 set_module_type(iphlpapi win32dll)
 
 target_link_libraries(iphlpapi wine tdilib)
-
 add_importlibs(iphlpapi dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll)
-
 add_cab_target(iphlpapi 1)
 add_importlib_target(iphlpapi.spec)

diff --git a/dll/win32/itss/CMakeLists.txt b/dll/win32/itss/CMakeLists.txt
index 43548e5..b3b53b7 100644 (file)
--- a/dll/win32/itss/CMakeLists.txt
+++ b/dll/win32/itss/CMakeLists.txt
@@ -1,8 +1,12 @@
 
-add_definitions(-D__WINESRC__ -D_DLL -D__USE_CRTIMP)
+add_definitions(
+    -D__WINESRC__
+    -D_DLL -D__USE_CRTIMP)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(itss.dll itss.spec)
 
 list(APPEND SOURCE
@@ -19,9 +23,7 @@ add_library(itss SHARED ${SOURCE})
 
 set_module_type(itss win32dll)
 
-target_link_libraries(itss
-    uuid
-    wine)
+target_link_libraries(itss uuid wine)
 
 add_importlibs(itss
     urlmon

diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt
index 82e55bc..9cea717 100644 (file)
--- a/dll/win32/jscript/CMakeLists.txt
+++ b/dll/win32/jscript/CMakeLists.txt
@@ -12,7 +12,9 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(jscript SHARED
+spec2def(jscript.dll jscript.spec)
+
+list(APPEND SOURCE
     activex.c
     date.c
     dispex.c
@@ -33,11 +35,9 @@ add_library(jscript SHARED
     function.c
     global.c
     rsrc.rc
-    jscript.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/jscript.def)
 
-if(NOT MSVC)
-    set_source_files_properties(jscript.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+add_library(jscript SHARED ${SOURCE})
 
 set_module_type(jscript win32dll)
 

diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt
index c7d8172..7bc8fef 100644 (file)
--- a/dll/win32/kernel32/CMakeLists.txt
+++ b/dll/win32/kernel32/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-spec2def(kernel32.dll kernel32.spec)
-
 add_definitions(-D_KERNEL32_)
 
 remove_definitions(-D_WIN32_WINNT=0x502)
@@ -8,6 +6,8 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
 
+spec2def(kernel32.dll kernel32.spec)
+
 list(APPEND SOURCE
     debug/debugger.c
     debug/output.c
@@ -100,8 +100,7 @@ list(APPEND SOURCE
 if(ARCH MATCHES i386)
 list(APPEND SOURCE
     thread/i386/fiber.S
-    thread/i386/thread.S
-)
+    thread/i386/thread.S)
 elseif(ARCH MATCHES amd64)
 list(APPEND SOURCE
     thread/amd64/fiber.S

diff --git a/dll/win32/loadperf/CMakeLists.txt b/dll/win32/loadperf/CMakeLists.txt
index eb5cce5..d3e547c 100644 (file)
--- a/dll/win32/loadperf/CMakeLists.txt
+++ b/dll/win32/loadperf/CMakeLists.txt
@@ -10,12 +10,7 @@ add_library(loadperf SHARED
             ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def)
 
 set_module_type(loadperf win32dll)
-
-target_link_libraries(loadperf
-    ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def
-    wine)
-
+target_link_libraries(loadperf wine)
 add_importlibs(loadperf msvcrt kernel32 ntdll)
-
 add_cab_target(loadperf 1)
 add_importlib_target(loadperf.spec)

diff --git a/dll/win32/localspl/CMakeLists.txt b/dll/win32/localspl/CMakeLists.txt
index f1e5ec4..96b79f6 100644 (file)
--- a/dll/win32/localspl/CMakeLists.txt
+++ b/dll/win32/localspl/CMakeLists.txt
@@ -1,10 +1,13 @@
 
 add_definitions(-D__WINESRC__)
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(localspl.dll localspl.spec)
 
 list(APPEND SOURCE
@@ -18,8 +21,7 @@ add_library(localspl SHARED ${SOURCE})
 
 set_module_type(localspl win32dll)
 
-target_link_libraries(localspl
-    wine)
+target_link_libraries(localspl wine)
 
 add_importlibs(localspl
     spoolss
@@ -29,5 +31,4 @@ add_importlibs(localspl
     kernel32
     ntdll)
 
-
 add_cab_target(localspl 1)

diff --git a/dll/win32/localui/CMakeLists.txt b/dll/win32/localui/CMakeLists.txt
index 23d868e..6bc0d4b 100644 (file)
--- a/dll/win32/localui/CMakeLists.txt
+++ b/dll/win32/localui/CMakeLists.txt
@@ -2,21 +2,18 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(localui SHARED
+spec2def(localui.dll localui.spec)
+
+list(APPEND SOURCE
     localui.c
     localui.rc
     ${CMAKE_CURRENT_BINARY_DIR}/localui.def)
 
-set_export_spec(localui localui.spec)
-
-add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/localui.def)
+add_library(localui SHARED ${SOURCE})
 
 set_module_type(localui win32dll)
+target_link_libraries(localui uuid wine)
 
-target_link_libraries(localui
-    uuid
-    wine)
-
+add_importlib_target(localui.spec)
 add_importlibs(localui winspool user32 msvcrt kernel32 ntdll)
-
 add_cab_target(localui 1)

diff --git a/dll/win32/lpk/CMakeLists.txt b/dll/win32/lpk/CMakeLists.txt
index df37825..409dc2f 100644 (file)
--- a/dll/win32/lpk/CMakeLists.txt
+++ b/dll/win32/lpk/CMakeLists.txt
@@ -4,18 +4,18 @@ set_unicode()
 add_definitions(-DLANGPACK)
 include_directories(include)
 
-add_library(lpk SHARED
+spec2def(lpk.dll lpk.spec)
+
+list(APPEND SOURCE
     dllmain.c
     stub.c
     lpk.rc
     ${CMAKE_CURRENT_BINARY_DIR}/lpk.def)
 
-set_export_spec(lpk lpk.spec)
-
-add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/lpk.def)
+add_library(lpk SHARED ${SOURCE})
 
 set_module_type(lpk win32dll)
 
+add_importlib_target(lpk.spec)
 add_importlibs(lpk user32 usp10 msvcrt kernel32 ntdll)
-
 add_cab_target(lpk 1)

diff --git a/dll/win32/lsasrv/CMakeLists.txt b/dll/win32/lsasrv/CMakeLists.txt
index 3ce484d..a2a69b8 100644 (file)
--- a/dll/win32/lsasrv/CMakeLists.txt
+++ b/dll/win32/lsasrv/CMakeLists.txt
@@ -1,9 +1,12 @@
+
 set_unicode()
 
-include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys/lsass)
+include_directories(
+    ${REACTOS_BINARY_DIR}/include/reactos/idl
+    ${REACTOS_SOURCE_DIR}/include/reactos/subsys/lsass)
 
 set_rc_compiler()
+
 spec2def(lsasrv.dll lsasrv.spec)
 
 list(APPEND SOURCE
@@ -25,6 +28,6 @@ target_link_libraries(lsasrv
     ${PSEH_LIB})
 
 add_importlibs(lsasrv rpcrt4 kernel32 ntdll)
-add_dependencies(lsasrv  psdk buildno_header)
+add_dependencies(lsasrv psdk buildno_header)
 add_cab_target(lsasrv 1)
 add_importlib_target(lsasrv.spec)

diff --git a/dll/win32/lz32/CMakeLists.txt b/dll/win32/lz32/CMakeLists.txt
index 43b3b13..66d7acf 100644 (file)
--- a/dll/win32/lz32/CMakeLists.txt
+++ b/dll/win32/lz32/CMakeLists.txt
@@ -1,15 +1,16 @@
 
-spec2def(lz32.dll lz32.spec)
-
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(lz32 SHARED
-            version.rc
-            ${CMAKE_CURRENT_BINARY_DIR}/lz32.def)
+spec2def(lz32.dll lz32.spec)
+
+list(APPEND SOURCE
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/lz32.def)
 
-set_entrypoint(lz32 0)
+add_library(lz32 SHARED ${SOURCE})
 
+set_entrypoint(lz32 0)
 target_link_libraries(lz32 wine)
 
 add_importlibs(lz32 kernel32 ntdll)

diff --git a/dll/win32/mapi32/CMakeLists.txt b/dll/win32/mapi32/CMakeLists.txt
index 2ea31b0..f76d402 100644 (file)
--- a/dll/win32/mapi32/CMakeLists.txt
+++ b/dll/win32/mapi32/CMakeLists.txt
@@ -1,7 +1,9 @@
+
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(mapi32.dll mapi32.spec)
 
 list(APPEND SOURCE
@@ -18,10 +20,6 @@ add_library(mapi32 SHARED ${SOURCE})
 
 set_module_type(mapi32 win32dll)
 
-target_link_libraries(mapi32
-    wine
-    uuid)
-
+target_link_libraries(mapi32 wine uuid)
 add_importlibs(mapi32 shlwapi shell32 user32 advapi32 msvcrt kernel32 ntdll)
-
 add_cab_target(mapi32 1)

diff --git a/dll/win32/mciavi32/CMakeLists.txt b/dll/win32/mciavi32/CMakeLists.txt
index 835fa43..36879d4 100644 (file)
--- a/dll/win32/mciavi32/CMakeLists.txt
+++ b/dll/win32/mciavi32/CMakeLists.txt
@@ -2,22 +2,19 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(mciavi32 SHARED
+spec2def(mciavi32.dll mciavi32.spec)
+
+list(APPEND SOURCE
     info.c
     mciavi.c
     mmoutput.c
     wnd.c
     mciavi_res.rc
-    mciavi32.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def)
 
-if(NOT MSVC)
-    set_source_files_properties(mciavi32.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+add_library(mciavi32 SHARED ${SOURCE})
 
 set_module_type(mciavi32 win32dll)
-
 target_link_libraries(mciavi32 wine)
-
 add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 msvcrt kernel32 ntdll)
-
 add_cab_target(mciavi32 1)

diff --git a/dll/win32/mcicda/CMakeLists.txt b/dll/win32/mcicda/CMakeLists.txt
index 85084e8..50c46f0 100644 (file)
--- a/dll/win32/mcicda/CMakeLists.txt
+++ b/dll/win32/mcicda/CMakeLists.txt
@@ -2,16 +2,16 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(mcicda SHARED mcicda.c mcicda.def)
+spec2def(mcicda.dll mcicda.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(mcicda.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    mcicda.c
+    ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def)
 
-set_entrypoint(mcicda 0)
+add_library(mcicda SHARED ${SOURCE})
 
+set_entrypoint(mcicda 0)
 target_link_libraries(mcicda wine)
-
 add_importlibs(mcicda winmm user32 kernel32 ntdll)
 add_dependencies(mcicda psdk buildno_header)
-add_cab_target(mcicda 1)
\ No newline at end of file
+add_cab_target(mcicda 1)

diff --git a/dll/win32/mciqtz32/CMakeLists.txt b/dll/win32/mciqtz32/CMakeLists.txt
index 9ab0365..76c85ab 100644 (file)
--- a/dll/win32/mciqtz32/CMakeLists.txt
+++ b/dll/win32/mciqtz32/CMakeLists.txt
@@ -2,18 +2,17 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(mciqtz32 SHARED mciqtz.c version.rc mciqtz32.def)
+spec2def(mciqtz32.dll mciqtz32.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(mciqtz32.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    mciqtz.c
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def)
 
-set_module_type(mciqtz32 win32dll)
+add_library(mciqtz32 SHARED ${SOURCE})
 
-target_link_libraries(mciqtz32
-    wine
-    strmiids)
+set_module_type(mciqtz32 win32dll)
 
+target_link_libraries(mciqtz32 wine strmiids)
 add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 msvcrt kernel32 ntdll)
-
 add_cab_target(mciqtz32 1)

diff --git a/dll/win32/mciseq/CMakeLists.txt b/dll/win32/mciseq/CMakeLists.txt
index 85e2a96..0ac9acd 100644 (file)
--- a/dll/win32/mciseq/CMakeLists.txt
+++ b/dll/win32/mciseq/CMakeLists.txt
@@ -2,16 +2,16 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(mciseq SHARED mcimidi.c mciseq.def)
+spec2def(mciseq.dll mciseq.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(mciseq.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    mcimidi.c
+    ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def)
 
-set_entrypoint(mciseq 0)
+add_library(mciseq SHARED ${SOURCE})
 
+set_entrypoint(mciseq 0)
 target_link_libraries(mciseq wine)
-
 add_importlibs(mciseq winmm user32 kernel32 ntdll)
 add_dependencies(mciseq psdk buildno_header)
-add_cab_target(mciseq 1)
\ No newline at end of file
+add_cab_target(mciseq 1)

diff --git a/dll/win32/mciwave/CMakeLists.txt b/dll/win32/mciwave/CMakeLists.txt
index 8d0384d..003ae61 100644 (file)
--- a/dll/win32/mciwave/CMakeLists.txt
+++ b/dll/win32/mciwave/CMakeLists.txt
@@ -8,14 +8,14 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(mciwave.dll mciwave.spec)
 
-add_library(mciwave SHARED
+list(APPEND SOURCE
     mciwave.c
     ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def)
 
-set_entrypoint(mciwave 0)
+add_library(mciwave SHARED ${SOURCE})
 
+set_entrypoint(mciwave 0)
 target_link_libraries(mciwave wine)
 add_importlibs(mciwave user32 winmm msvcrt kernel32 ntdll)
-
 add_dependencies(mciwave psdk buildno_header)
 add_cab_target(mciwave 1)

diff --git a/dll/win32/mlang/CMakeLists.txt b/dll/win32/mlang/CMakeLists.txt
index 707bd89..6351d46 100644 (file)
--- a/dll/win32/mlang/CMakeLists.txt
+++ b/dll/win32/mlang/CMakeLists.txt
@@ -29,6 +29,5 @@ add_importlibs(mlang
     ntdll)
 
 add_importlib_target(mlang.spec)
-
 add_dependencies(mlang psdk buildno_header)
 add_cab_target(mlang 1)

diff --git a/dll/win32/mmdrv/CMakeLists.txt b/dll/win32/mmdrv/CMakeLists.txt
index 54d4c5d..24fdfe8 100644 (file)
--- a/dll/win32/mmdrv/CMakeLists.txt
+++ b/dll/win32/mmdrv/CMakeLists.txt
@@ -3,7 +3,9 @@ set_unicode()
 
 add_definitions(-DNDEBUG)
 
-add_library(mmdrv SHARED
+spec2def(mmdrv.dll mmdrv.spec)
+
+list(APPEND SOURCE
     entry.c
     mme.c
     kernel.c
@@ -11,14 +13,11 @@ add_library(mmdrv SHARED
     common.c
     wave.c
     wave_io.c
-    mmdrv.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def)
 
-if(NOT MSVC)
-    set_source_files_properties(mmdrv.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+add_library(mmdrv SHARED ${SOURCE})
 
 set_entrypoint(mmdrv 0)
-
 add_importlibs(mmdrv winmm user32 kernel32 ntdll)
 add_dependencies(mmdrv psdk buildno_header)
-add_cab_target(mmdrv 1)
\ No newline at end of file
+add_cab_target(mmdrv 1)

diff --git a/dll/win32/modemui/CMakeLists.txt b/dll/win32/modemui/CMakeLists.txt
index 1ba002b..cd05533 100644 (file)
--- a/dll/win32/modemui/CMakeLists.txt
+++ b/dll/win32/modemui/CMakeLists.txt
@@ -11,7 +11,5 @@ list(APPEND SOURCE
 add_library(modemui SHARED ${SOURCE})
 
 set_module_type(modemui win32dll)
-
 add_importlibs(modemui msvcrt kernel32 ntdll)
-
 add_cab_target(modemui 1)

diff --git a/dll/win32/mpr/CMakeLists.txt b/dll/win32/mpr/CMakeLists.txt
index e74670c..83060ea 100644 (file)
--- a/dll/win32/mpr/CMakeLists.txt
+++ b/dll/win32/mpr/CMakeLists.txt
@@ -1,9 +1,12 @@
-add_definitions(-D__WINESRC__)
-add_definitions(-D_WINE)
+
+add_definitions(
+    -D__WINESRC__
+    -D_WINE)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(mpr.dll mpr.spec)
 
 list(APPEND SOURCE
@@ -21,8 +24,6 @@ add_library(mpr SHARED ${SOURCE})
 set_module_type(mpr win32dll)
 
 target_link_libraries(mpr wine)
-
 add_importlibs(mpr advapi32 user32 msvcrt kernel32 ntdll)
-
 add_cab_target(mpr 1)
 add_importlib_target(mpr.spec)

diff --git a/dll/win32/mprapi/CMakeLists.txt b/dll/win32/mprapi/CMakeLists.txt
index c08eb44..0cbd515 100644 (file)
--- a/dll/win32/mprapi/CMakeLists.txt
+++ b/dll/win32/mprapi/CMakeLists.txt
@@ -11,9 +11,6 @@ list(APPEND SOURCE
 add_library(mprapi SHARED ${SOURCE})
 
 set_module_type(mprapi win32dll)
-
 target_link_libraries(mprapi wine)
-
 add_importlibs(mprapi msvcrt kernel32 ntdll)
-
 add_cab_target(mprapi 1)

diff --git a/dll/win32/msacm32/CMakeLists.txt b/dll/win32/msacm32/CMakeLists.txt
index f75d94a..58e88e7 100644 (file)
--- a/dll/win32/msacm32/CMakeLists.txt
+++ b/dll/win32/msacm32/CMakeLists.txt
@@ -5,6 +5,7 @@ add_definitions(-D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(msacm32.dll msacm32.spec)
 
 list(APPEND SOURCE
@@ -23,11 +24,10 @@ set_entrypoint(msacm32 DllMain@12)
 set_image_base(msacm32 ${baseaddress_msacm32})
 
 target_link_libraries(msacm32 wine)
-
 add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll)
-
 add_dependencies(msacm32 psdk buildno_header)
 
-add_subdirectory(msacm32.drv)
 add_cab_target(msacm32 1)
 add_importlib_target(msacm32.spec)
+
+add_subdirectory(msacm32.drv)

diff --git a/dll/win32/msadp32.acm/CMakeLists.txt b/dll/win32/msadp32.acm/CMakeLists.txt
index e8eaf2c..3363fb4 100644 (file)
--- a/dll/win32/msadp32.acm/CMakeLists.txt
+++ b/dll/win32/msadp32.acm/CMakeLists.txt
@@ -1,20 +1,21 @@
 
-add_definitions(-D_DLL -D__USE_CRTIMP)
-add_definitions(-D__WINESRC__)
+add_definitions(
+    -D_DLL -D__USE_CRTIMP
+    -D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(msadp32.acm SHARED msadp32.c msadp32.def)
+spec2def(msadp32.acm msadp32.acm.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(msadp32.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    msadp32.c
+    ${CMAKE_CURRENT_BINARY_DIR}/msadp32.def)
+
+add_library(msadp32.acm SHARED ${SOURCE})
 
 set_entrypoint(msadp32.acm 0)
 set_target_properties(msadp32.acm PROPERTIES SUFFIX "")
-
 target_link_libraries(msadp32.acm wine)
-
 add_importlibs(msadp32.acm winmm user32 msvcrt kernel32 ntdll)
 add_dependencies(msadp32.acm psdk buildno_header)
 add_cab_target(msadp32.acm 1)

diff --git a/dll/win32/msafd/CMakeLists.txt b/dll/win32/msafd/CMakeLists.txt
index 74eba11..8a2c0f7 100644 (file)
--- a/dll/win32/msafd/CMakeLists.txt
+++ b/dll/win32/msafd/CMakeLists.txt
@@ -5,6 +5,8 @@ include_directories(
     BEFORE include
     ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
 
+spec2def(msafd.dll msafd.spec)
+
 list(APPEND SOURCE
     msafd.rc
     misc/dllmain.c
@@ -12,11 +14,7 @@ list(APPEND SOURCE
     misc/helpers.c
     misc/sndrcv.c
     misc/stubs.c
-    msafd.def)
-
-if(NOT MSVC)
-    set_source_files_properties(msafd.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+    ${CMAKE_CURRENT_BINARY_DIR}/msafd.def)
 
 add_library(msafd SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/msafd_msafd.h.gch
@@ -27,5 +25,4 @@ set_module_type(msafd win32dll)
 add_pch(msafd ${CMAKE_CURRENT_SOURCE_DIR}/msafd.h ${SOURCE})
 
 add_importlibs(msafd advapi32 msvcrt kernel32 ntdll)
-
 add_cab_target(msafd 1)

diff --git a/dll/win32/mscat32/CMakeLists.txt b/dll/win32/mscat32/CMakeLists.txt
index 458fffc..a9b4ece 100644 (file)
--- a/dll/win32/mscat32/CMakeLists.txt
+++ b/dll/win32/mscat32/CMakeLists.txt
@@ -5,12 +5,13 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(mscat32.dll mscat32.spec)
 
-add_library(mscat32 SHARED main.c ${CMAKE_CURRENT_BINARY_DIR}/mscat32.def)
+list(APPEND SOURCE
+    main.c
+    ${CMAKE_CURRENT_BINARY_DIR}/mscat32.def)
 
-set_module_type(mscat32 win32dll)
+add_library(mscat32 SHARED ${SOURCE})
 
+set_module_type(mscat32 win32dll)
 target_link_libraries(mscat32 wine)
-
 add_importlibs(mscat32 wintrust msvcrt kernel32 ntdll)
-
 add_cab_target(mscat32 1)

diff --git a/dll/win32/mscms/CMakeLists.txt b/dll/win32/mscms/CMakeLists.txt
index ed364ea..8674eff 100644 (file)
--- a/dll/win32/mscms/CMakeLists.txt
+++ b/dll/win32/mscms/CMakeLists.txt
@@ -1,7 +1,9 @@
+
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(mscms.dll mscms.spec)
 
 list(APPEND SOURCE
@@ -17,9 +19,6 @@ list(APPEND SOURCE
 add_library(mscms SHARED ${SOURCE})
 
 set_module_type(mscms win32dll)
-
 target_link_libraries(mscms wine)
-
 add_importlibs(mscms msvcrt kernel32 ntdll)
-
 add_cab_target(mscms 1)

diff --git a/dll/win32/mscoree/CMakeLists.txt b/dll/win32/mscoree/CMakeLists.txt
index 1d901d8..02494fe 100644 (file)
--- a/dll/win32/mscoree/CMakeLists.txt
+++ b/dll/win32/mscoree/CMakeLists.txt
@@ -12,9 +12,6 @@ list(APPEND SOURCE
 add_library(mscoree SHARED ${SOURCE})
 
 set_module_type(mscoree win32dll)
-
 target_link_libraries(mscoree wine uuid)
-
 add_importlibs(mscoree advapi32 shell32 msvcrt kernel32 ntdll)
-
 add_cab_target(mscoree 1)

diff --git a/dll/win32/msctf/CMakeLists.txt b/dll/win32/msctf/CMakeLists.txt
index df20382..3edc063 100644 (file)
--- a/dll/win32/msctf/CMakeLists.txt
+++ b/dll/win32/msctf/CMakeLists.txt
@@ -1,10 +1,15 @@
-add_definitions(-D__WINESRC__)
+
+add_definitions(
+    -D__WINESRC__
+    -D_DLL -D__USE_CRTIMP)
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
-add_definitions(-D_DLL -D__USE_CRTIMP)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(msctf.dll msctf.spec)
 
 list(APPEND SOURCE
@@ -26,10 +31,6 @@ add_library(msctf SHARED ${SOURCE})
 
 set_module_type(msctf win32dll)
 
-target_link_libraries(msctf
-    uuid
-    wine)
-
+target_link_libraries(msctf uuid wine)
 add_importlibs(msctf ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)
-
 add_cab_target(msctf 1)

diff --git a/dll/win32/msftedit/CMakeLists.txt b/dll/win32/msftedit/CMakeLists.txt
index dab96ca..775c3e8 100644 (file)
--- a/dll/win32/msftedit/CMakeLists.txt
+++ b/dll/win32/msftedit/CMakeLists.txt
@@ -1,7 +1,9 @@
+
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(msftedit.dll msftedit.spec)
 
 list(APPEND SOURCE
@@ -13,10 +15,6 @@ add_library(msftedit SHARED ${SOURCE})
 
 set_module_type(msftedit win32dll)
 
-target_link_libraries(msftedit
-    uuid
-    wine)
-
+target_link_libraries(msftedit uuid wine)
 add_importlibs(msftedit riched20 msvcrt kernel32 ntdll)
-
 add_cab_target(msftedit 1)

diff --git a/dll/win32/msg711.acm/CMakeLists.txt b/dll/win32/msg711.acm/CMakeLists.txt
index 49d235b..a7655e4 100644 (file)
--- a/dll/win32/msg711.acm/CMakeLists.txt
+++ b/dll/win32/msg711.acm/CMakeLists.txt
@@ -5,17 +5,18 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(msg711.acm SHARED msg711.c msg711.def)
+spec2def(msg711.acm msg711.acm.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(msg711.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    msg711.c
+    ${CMAKE_CURRENT_BINARY_DIR}/msg711.def)
+
+add_library(msg711.acm SHARED ${SOURCE})
 
 set_entrypoint(msg711.acm 0)
 set_target_properties(msg711.acm PROPERTIES SUFFIX "")
 
 target_link_libraries(msg711.acm wine)
-
 add_importlibs(msg711.acm winmm user32 msvcrt kernel32 ntdll)
 add_dependencies(msg711.acm psdk buildno_header)
 add_cab_target(msg711.acm 1)

diff --git a/dll/win32/msgina/CMakeLists.txt b/dll/win32/msgina/CMakeLists.txt
index d9ced08..ce1440b 100644 (file)
--- a/dll/win32/msgina/CMakeLists.txt
+++ b/dll/win32/msgina/CMakeLists.txt
@@ -1,7 +1,10 @@
-include_directories(include)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+include_directories(
+    include
+    ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(msgina.dll msgina.spec)
 
 list(APPEND SOURCE
@@ -15,9 +18,6 @@ list(APPEND SOURCE
 add_library(msgina SHARED ${SOURCE})
 
 set_module_type(msgina win32dll)
-
 target_link_libraries(msgina wine)
-
 add_importlibs(msgina advapi32 user32 gdi32 userenv msvcrt kernel32 ntdll)
-
 add_cab_target(msgina 1)

diff --git a/dll/win32/msgsm32.acm/CMakeLists.txt b/dll/win32/msgsm32.acm/CMakeLists.txt
index 5617666..3fb20dc 100644 (file)
--- a/dll/win32/msgsm32.acm/CMakeLists.txt
+++ b/dll/win32/msgsm32.acm/CMakeLists.txt
@@ -5,11 +5,13 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(msgsm32.acm SHARED msgsm32.c msgsm32.def)
+spec2def(msgsm32.acm msgsm32.acm.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(msgsm32.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    msgsm32.c
+    ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.def)
+
+add_library(msgsm32.acm SHARED ${SOURCE})
 
 set_entrypoint(msgsm32.acm 0)
 set_target_properties(msgsm32.acm PROPERTIES SUFFIX "")

diff --git a/dll/win32/mshtml/CMakeLists.txt b/dll/win32/mshtml/CMakeLists.txt
index 150a37b..a590331 100644 (file)
--- a/dll/win32/mshtml/CMakeLists.txt
+++ b/dll/win32/mshtml/CMakeLists.txt
@@ -12,6 +12,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 ADD_INTERFACE_DEFINITIONS(mshtml_nsiface_header nsiface.idl)
 
 set_rc_compiler()
+
 spec2def(mshtml.dll mshtml.spec)
 
 list(APPEND SOURCE

diff --git a/dll/win32/msimg32/CMakeLists.txt b/dll/win32/msimg32/CMakeLists.txt
index 46838ae..eeb8e2d 100644 (file)
--- a/dll/win32/msimg32/CMakeLists.txt
+++ b/dll/win32/msimg32/CMakeLists.txt
@@ -1,18 +1,17 @@
 
-spec2def(msimg32.dll msimg32.spec)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 
-add_library(msimg32 SHARED
-            msimg32_main.c
-            ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def)
+spec2def(msimg32.dll msimg32.spec)
 
-set_module_type(msimg32 win32dll)
+list(APPEND SOURCE
+    msimg32_main.c
+    ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def)
 
-target_link_libraries(msimg32 wine)
+add_library(msimg32 SHARED ${SOURCE})
 
+set_module_type(msimg32 win32dll)
+target_link_libraries(msimg32 wine)
 add_importlibs(msimg32 gdi32 msvcrt kernel32 ntdll)
-
 add_cab_target(msimg32 1)
 add_importlib_target(msimg32.spec)

diff --git a/dll/win32/msimtf/CMakeLists.txt b/dll/win32/msimtf/CMakeLists.txt
index 5b16129..950ce0b 100644 (file)
--- a/dll/win32/msimtf/CMakeLists.txt
+++ b/dll/win32/msimtf/CMakeLists.txt
@@ -1,7 +1,9 @@
+
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
+
 spec2def(msimtf.dll msimtf.spec)
 
 list(APPEND SOURCE
@@ -14,10 +16,6 @@ add_library(msimtf SHARED ${SOURCE})
 
 set_module_type(msimtf win32dll)
 
-target_link_libraries(msimtf
-    uuid
-    wine)
-
+target_link_libraries(msimtf uuid wine)
 add_importlibs(msimtf msvcrt imm32 kernel32 ntdll)
-
 add_cab_target(msimtf 1)

diff --git a/dll/win32/msisip/CMakeLists.txt b/dll/win32/msisip/CMakeLists.txt
index b65348e..25b5004 100644 (file)
--- a/dll/win32/msisip/CMakeLists.txt
+++ b/dll/win32/msisip/CMakeLists.txt
@@ -13,7 +13,5 @@ add_library(msisip SHARED ${SOURCE})
 set_module_type(msisip win32dll)
 
 target_link_libraries(msisip wine)
-
 add_importlibs(msisip crypt32 ole32 msvcrt kernel32 ntdll)
-
 add_cab_target(msisip 1)