[CMAKE]

- Improve the unicode situation.
- Apply a consistent formatting.
- Improve the unicode modules we have so far.
- Get rid of some rbuildism.
- Overall improvements.

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

diff --git a/base/applications/cacls/CMakeLists.txt b/base/applications/cacls/CMakeLists.txt
index 0d09c6b..47ddfa1 100644 (file)
--- a/base/applications/cacls/CMakeLists.txt
+++ b/base/applications/cacls/CMakeLists.txt
@@ -1,7 +1,7 @@
 
-list(APPEND SOURCE
-    cacls.c
-    cacls.rc)
+set_unicode()
+
+list(APPEND SOURCE cacls.c cacls.rc)
 
 add_executable(cacls
     ${CMAKE_CURRENT_BINARY_DIR}/cacls_precomp.h.gch
@@ -9,8 +9,5 @@ add_executable(cacls
 
 add_pch(cacls ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
-set_unicode(cacls yes)
-
 set_module_type(cacls win32cui)
-
-add_importlibs(cacls advapi32 ntdll user32 shell32 msvcrt)
\ No newline at end of file
+add_importlibs(cacls advapi32 user32 shell32 msvcrt)

diff --git a/base/applications/calc/CMakeLists.txt b/base/applications/calc/CMakeLists.txt
index 67fc3f9..b30dccb 100644 (file)
--- a/base/applications/calc/CMakeLists.txt
+++ b/base/applications/calc/CMakeLists.txt
@@ -1,5 +1,6 @@
 
-add_definitions(-DUNICODE -D_UNICODE)
+set_unicode()
+
 add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1)
 
 add_executable(calc 
@@ -12,7 +13,4 @@ add_executable(calc
     resource.rc)
 
 set_module_type(calc win32gui)
-set_unicode(calc yes)
 add_importlibs(calc advapi32 user32 gdi32 msvcrt)
-
-add_dependencies(calc psdk)

diff --git a/base/applications/charmap/CMakeLists.txt b/base/applications/charmap/CMakeLists.txt
index e6f2253..b950157 100644 (file)
--- a/base/applications/charmap/CMakeLists.txt
+++ b/base/applications/charmap/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+set_unicode()
+
 list(APPEND SOURCE
     about.c
     charmap.c
@@ -12,8 +14,5 @@ add_executable(charmap
 
 add_pch(charmap ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
-set_unicode(charmap yes)
-
 set_module_type(charmap win32gui)
-
-add_importlibs(charmap user32 gdi32 comctl32 msvcrt)
\ No newline at end of file
+add_importlibs(charmap user32 gdi32 comctl32 msvcrt)

diff --git a/base/applications/cmdutils/dbgprint/CMakeLists.txt b/base/applications/cmdutils/dbgprint/CMakeLists.txt
index aef0a8b..0a9dd1a 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)
-
-set_unicode(dbgprint no)
-
-add_importlibs(dbgprint msvcrt)
\ No newline at end of file
+add_importlibs(dbgprint msvcrt)

diff --git a/base/applications/cmdutils/doskey/CMakeLists.txt b/base/applications/cmdutils/doskey/CMakeLists.txt
index 4bedb26..5b52082 100644 (file)
--- a/base/applications/cmdutils/doskey/CMakeLists.txt
+++ b/base/applications/cmdutils/doskey/CMakeLists.txt
@@ -1,9 +1,7 @@
-add_executable(doskey
-    doskey.c
-    doskey.rc)
 
-set_module_type(doskey win32cui)
+set_unicode()
 
-set_unicode(doskey yes)
+add_executable(doskey doskey.c doskey.rc)
 
-add_importlibs(doskey user32 msvcrt)
\ No newline at end of file
+set_module_type(doskey win32cui)
+add_importlibs(doskey user32 msvcrt)

diff --git a/base/applications/cmdutils/find/CMakeLists.txt b/base/applications/cmdutils/find/CMakeLists.txt
index c5e5e12..db02867 100644 (file)
--- a/base/applications/cmdutils/find/CMakeLists.txt
+++ b/base/applications/cmdutils/find/CMakeLists.txt
@@ -1,9 +1,5 @@
-add_executable(find
-    find.c
-    find.rc)
 
-set_module_type(find win32cui)
-
-set_unicode(find no)
+add_executable(find find.c find.rc)
 
-add_importlibs(find user32 msvcrt)
\ No newline at end of file
+set_module_type(find win32cui)
+add_importlibs(find user32 msvcrt)

diff --git a/base/applications/cmdutils/hostname/CMakeLists.txt b/base/applications/cmdutils/hostname/CMakeLists.txt
index 80f4d8d..a52cda0 100644 (file)
--- a/base/applications/cmdutils/hostname/CMakeLists.txt
+++ b/base/applications/cmdutils/hostname/CMakeLists.txt
@@ -1,9 +1,5 @@
-add_executable(hostname
-    hostname.c
-    hostname.rc)
 
-set_module_type(hostname win32cui)
-
-set_unicode(hostname no)
+add_executable(hostname hostname.c hostname.rc)
 
-add_importlibs(hostname msvcrt)
\ No newline at end of file
+set_module_type(hostname win32cui)
+add_importlibs(hostname msvcrt)

diff --git a/base/applications/cmdutils/lodctr/CMakeLists.txt b/base/applications/cmdutils/lodctr/CMakeLists.txt
index b287b6c..c14d39f 100644 (file)
--- a/base/applications/cmdutils/lodctr/CMakeLists.txt
+++ b/base/applications/cmdutils/lodctr/CMakeLists.txt
@@ -1,7 +1,7 @@
-add_executable(lodctr lodctr_main.c)
 
-set_module_type(lodctr win32cui)
+set_unicode()
 
-set_unicode(lodctr yes)
+add_executable(lodctr lodctr_main.c)
 
-add_importlibs(lodctr loadperf msvcrt)
\ No newline at end of file
+set_module_type(lodctr win32cui)
+add_importlibs(lodctr loadperf msvcrt)

diff --git a/base/applications/cmdutils/more/CMakeLists.txt b/base/applications/cmdutils/more/CMakeLists.txt
index e164073..08ff486 100644 (file)
--- a/base/applications/cmdutils/more/CMakeLists.txt
+++ b/base/applications/cmdutils/more/CMakeLists.txt
@@ -1,9 +1,5 @@
-add_executable(more
-    more.c
-    more.rc)
 
-set_module_type(more win32cui)
-
-set_unicode(more no)
+add_executable(more more.c more.rc)
 
-add_importlibs(more ntdll user32 msvcrt)
\ No newline at end of file
+set_module_type(more win32cui)
+add_importlibs(more user32 msvcrt)

diff --git a/base/applications/cmdutils/reg/CMakeLists.txt b/base/applications/cmdutils/reg/CMakeLists.txt
index d3ad12d..7a218f8 100644 (file)
--- a/base/applications/cmdutils/reg/CMakeLists.txt
+++ b/base/applications/cmdutils/reg/CMakeLists.txt
@@ -1,12 +1,10 @@
+
+set_unicode()
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
-add_executable(reg
-    reg.c
-    rsrc.rc)
+add_executable(reg reg.c rsrc.rc)
 
 set_module_type(reg win32cui)
-
-set_unicode(reg yes)
-
-add_importlibs(reg advapi32 user32 msvcrt)
\ No newline at end of file
+add_importlibs(reg advapi32 user32 msvcrt)

diff --git a/base/applications/cmdutils/xcopy/CMakeLists.txt b/base/applications/cmdutils/xcopy/CMakeLists.txt
index 26614d3..393eb06 100644 (file)
--- a/base/applications/cmdutils/xcopy/CMakeLists.txt
+++ b/base/applications/cmdutils/xcopy/CMakeLists.txt
@@ -1,11 +1,9 @@
-add_executable(xcopy
-    xcopy.c
-    rsrc.rc)
 
-set_module_type(xcopy win32cui)
+set_unicode()
 
-set_unicode(xcopy yes)
+add_executable(xcopy xcopy.c rsrc.rc)
 
-add_importlibs(xcopy shell32 user32 msvcrt ntdll)
+target_link_libraries(xcopy wine)
 
-target_link_libraries(xcopy wine)
\ No newline at end of file
+set_module_type(xcopy win32cui)
+add_importlibs(xcopy shell32 user32 msvcrt)

diff --git a/base/applications/control/CMakeLists.txt b/base/applications/control/CMakeLists.txt
index 6e4a2db..a545694 100644 (file)
--- a/base/applications/control/CMakeLists.txt
+++ b/base/applications/control/CMakeLists.txt
@@ -1,10 +1,7 @@
 
-add_executable(control
-    control.c
-    control.rc)
+set_unicode()
 
-set_unicode(control yes)
+add_executable(control control.c control.rc)
 
 set_module_type(control win32gui)
-
-add_importlibs(control advapi32 shell32 kernel32 msvcrt)
\ No newline at end of file
+add_importlibs(control advapi32 shell32 msvcrt)

diff --git a/base/applications/extrac32/CMakeLists.txt b/base/applications/extrac32/CMakeLists.txt
index 7f5f58e..edc4205 100644 (file)
--- a/base/applications/extrac32/CMakeLists.txt
+++ b/base/applications/extrac32/CMakeLists.txt
@@ -1,10 +1,9 @@
 
-add_executable(extrac32 extrac32.c)
-
-set_unicode(extrac32 yes)
+set_unicode()
 
-set_module_type(extrac32 win32gui)
+add_executable(extrac32 extrac32.c)
 
 target_link_libraries(extrac32 wine)
 
-add_importlibs(extrac32 ntdll shell32 setupapi shlwapi user32 msvcrt)
\ No newline at end of file
+set_module_type(extrac32 win32gui)
+add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt)

diff --git a/base/applications/fontview/CMakeLists.txt b/base/applications/fontview/CMakeLists.txt
index f2557f8..56adb0f 100644 (file)
--- a/base/applications/fontview/CMakeLists.txt
+++ b/base/applications/fontview/CMakeLists.txt
@@ -4,8 +4,5 @@ add_executable(fontview
     fontview.c
     fontview.rc)
 
-set_unicode(fontview no)
-
 set_module_type(fontview win32gui)
-
-add_importlibs(fontview gdi32 shell32 user32 msvcrt)
\ No newline at end of file
+add_importlibs(fontview gdi32 shell32 user32 msvcrt)

diff --git a/base/applications/games/solitaire/CMakeLists.txt b/base/applications/games/solitaire/CMakeLists.txt
index e41b503..fc41803 100644 (file)
--- a/base/applications/games/solitaire/CMakeLists.txt
+++ b/base/applications/games/solitaire/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+set_unicode()
+
 include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib)
 
 add_executable(sol
@@ -7,10 +9,7 @@ add_executable(sol
     solitaire.cpp
     rsrc.rc)
 
-set_unicode(sol yes)
-
-set_module_type(sol win32gui)
-
 target_link_libraries(sol cardlib)
 
-add_importlibs(sol advapi32 comctl32 user32 gdi32 stdc++ gcc mingw32 msvcrt)
\ No newline at end of file
+set_module_type(sol win32gui)
+add_importlibs(sol advapi32 comctl32 user32 gdi32 stdc++ gcc mingw32 msvcrt)

diff --git a/base/applications/games/winemine/CMakeLists.txt b/base/applications/games/winemine/CMakeLists.txt
index 67fc9ae..2d19c3e 100644 (file)
--- a/base/applications/games/winemine/CMakeLists.txt
+++ b/base/applications/games/winemine/CMakeLists.txt
@@ -1,14 +1,14 @@
 
+set_unicode()
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+set_rc_compiler()
 
 add_executable(winemine
     main.c
     dialog.c
     rsrc.rc)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-set_unicode(winemine yes)
-
 set_module_type(winemine win32gui)
-set_rc_compiler()
-
-add_importlibs(winemine user32 gdi32 advapi32 shell32 msvcrt)
\ No newline at end of file
+add_importlibs(winemine user32 gdi32 advapi32 shell32 msvcrt)

diff --git a/base/applications/hh/CMakeLists.txt b/base/applications/hh/CMakeLists.txt
index 5c8ed53..bad7365 100644 (file)
--- a/base/applications/hh/CMakeLists.txt
+++ b/base/applications/hh/CMakeLists.txt
@@ -1,10 +1,5 @@
 
-add_executable(hh 
-    main.c
-    hh.rc)
-
-set_unicode(hh no)
+add_executable(hh main.c hh.rc)
 
 set_module_type(hh win32gui)
-
-add_importlibs(hh gdi32 user32 msvcrt)
\ No newline at end of file
+add_importlibs(hh gdi32 user32 msvcrt)

diff --git a/base/applications/iexplore/CMakeLists.txt b/base/applications/iexplore/CMakeLists.txt
index 63b3056..eff630e 100644 (file)
--- a/base/applications/iexplore/CMakeLists.txt
+++ b/base/applications/iexplore/CMakeLists.txt
@@ -1,10 +1,5 @@
 
-add_executable(iexplore
-    main.c
-    iexplore.rc)
-
-set_unicode(iexplore no)
+add_executable(iexplore main.c iexplore.rc)
 
 set_module_type(iexplore win32gui)
-
-add_importlibs(iexplore shdocvw msvcrt)
\ No newline at end of file
+add_importlibs(iexplore shdocvw msvcrt)

diff --git a/base/shell/cmd/CMakeLists.txt b/base/shell/cmd/CMakeLists.txt
index d2492e0..4f89797 100644 (file)
--- a/base/shell/cmd/CMakeLists.txt
+++ b/base/shell/cmd/CMakeLists.txt
@@ -1,13 +1,12 @@
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+set_unicode()
 
 add_definitions(-DANONYMOUSUNIONS)
 add_definitions(-D_DEBUG_MEM)
 
-list(APPEND SOURCE
-    cmd.rc
-    main.c)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_pch(cmd ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE)
+list(APPEND SOURCE main.c cmd.rc)
 
 list(APPEND SOURCE
     alias.c
@@ -71,7 +70,9 @@ list(APPEND SOURCE
     window.c)
 
 add_executable(cmd ${CMAKE_CURRENT_BINARY_DIR}/cmd_precomp.h.gch ${SOURCE})
+
+target_link_libraries(cmd wine)
+
+add_pch(cmd ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE)
 set_module_type(cmd win32cui)
-set_unicode(cmd yes)
-target_link_libraries(cmd oldnames wine)
 add_importlibs(cmd advapi32 user32 msvcrt)
\ No newline at end of file

diff --git a/base/shell/explorer/CMakeLists.txt b/base/shell/explorer/CMakeLists.txt
index 9fe0290..54594c1 100644 (file)
--- a/base/shell/explorer/CMakeLists.txt
+++ b/base/shell/explorer/CMakeLists.txt
@@ -1,6 +1,8 @@
+
 add_subdirectory(notifyhook)
 
-add_definitions(-DUNICODE -D_UNICODE)
+set_unicode()
+
 add_definitions(-DWIN32)
 add_definitions(-D__WINDRES__)
 
@@ -46,16 +48,12 @@ list(APPEND SOURCE
 
 add_executable(explorer ${SOURCE}) #${CMAKE_CURRENT_BINARY_DIR}/explorer_precomp.h.gch ${SOURCE})
 
-set_module_type(explorer win32gui)
-
 target_link_libraries(explorer
-    mingw_wmain
-    mingw_common
-    coldname
-    oldnames
     wine
     uuid)
-    
+
+set_module_type(explorer win32gui)
+
 add_importlibs(explorer 
     advapi32
     gdi32

diff --git a/dll/directx/ksuser/CMakeLists.txt b/dll/directx/ksuser/CMakeLists.txt
index a367b47..8160b83 100644 (file)
--- a/dll/directx/ksuser/CMakeLists.txt
+++ b/dll/directx/ksuser/CMakeLists.txt
@@ -7,5 +7,5 @@ set_module_type(ksuser win32dll)
 
 target_link_libraries(ksuser ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def)
 
-add_importlibs(ksuser ntdll advapi32)
+add_importlibs(ksuser advapi32 kernel32 ntdll)
 add_dependencies(ksuser ksuser_def psdk bugcodes)

diff --git a/dll/win32/acledit/CMakeLists.txt b/dll/win32/acledit/CMakeLists.txt
index 65983d7..abd37c6 100644 (file)
--- a/dll/win32/acledit/CMakeLists.txt
+++ b/dll/win32/acledit/CMakeLists.txt
@@ -1,20 +1,18 @@
 
+set_unicode()
 
-
-add_definitions(-DUNICODE -D_UNICODE)
-
-file(GLOB_RECURSE SOURCE *.c)
+list(APPEND SOURCE
+    acledit.c
+    stubs.c
+    acledit.rc)
 
 spec2def(acledit ${CMAKE_CURRENT_SOURCE_DIR}/acledit.spec ${CMAKE_CURRENT_BINARY_DIR}/acledit.def)
 
-add_library(acledit SHARED
-    ${SOURCE}
-    ${CMAKE_CURRENT_SOURCE_DIR}/acledit.rc)
+add_library(acledit SHARED ${SOURCE})
 
-set_target_properties(acledit PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12")
+set_module_type(acledit win32dll)
 
-target_link_libraries(acledit
-    ${CMAKE_CURRENT_BINARY_DIR}/acledit.def
-    -lntdll)
+target_link_libraries(acledit ${CMAKE_CURRENT_BINARY_DIR}/acledit.def)
+add_importlibs(acledit ntdll)
 
-add_dependencies(acledit acledit_def psdk buildno_header)
+add_dependencies(acledit acledit_def)

diff --git a/dll/win32/aclui/CMakeLists.txt b/dll/win32/aclui/CMakeLists.txt
index ec3ff24..3887d58 100644 (file)
--- a/dll/win32/aclui/CMakeLists.txt
+++ b/dll/win32/aclui/CMakeLists.txt
@@ -1,7 +1,6 @@
 
+set_unicode()
 
-
-add_definitions(-DUNICODE -D_UNICODE)
 add_definitions(-DSUPPORT_UXTHEME)
 
 file(GLOB_RECURSE SOURCE *.c)
@@ -28,4 +27,4 @@ target_link_libraries(aclui
     -lntdll)
 
 add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
-add_dependencies(aclui aclui_def psdk)
+add_dependencies(aclui aclui_def psdk buildno_header)

diff --git a/dll/win32/activeds/CMakeLists.txt b/dll/win32/activeds/CMakeLists.txt
index a1d1fcb..059ac2b 100644 (file)
--- a/dll/win32/activeds/CMakeLists.txt
+++ b/dll/win32/activeds/CMakeLists.txt
@@ -16,4 +16,4 @@ target_link_libraries(activeds
      wine
      mingw_common)
 
-add_dependencies(activeds activeds_def psdk)
+add_dependencies(activeds activeds_def psdk buildno_header)

diff --git a/dll/win32/advpack/CMakeLists.txt b/dll/win32/advpack/CMakeLists.txt
index b3cb941..b903ece 100644 (file)
--- a/dll/win32/advpack/CMakeLists.txt
+++ b/dll/win32/advpack/CMakeLists.txt
@@ -22,4 +22,4 @@ target_link_libraries(advpack
     -lversion
     -ladvapi32)
 
-add_dependencies(advpack advpack_def psdk)
+add_dependencies(advpack advpack_def psdk buildno_header)

diff --git a/dll/win32/authz/CMakeLists.txt b/dll/win32/authz/CMakeLists.txt
index 4c2a62e..aab7f59 100644 (file)
--- a/dll/win32/authz/CMakeLists.txt
+++ b/dll/win32/authz/CMakeLists.txt
@@ -21,4 +21,4 @@ target_link_libraries(authz
     -lntdll)
 
 add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
-add_dependencies(authz authz_def psdk)
+add_dependencies(authz authz_def psdk buildno_header)

diff --git a/dll/win32/wdmaud.drv/CMakeLists.txt b/dll/win32/wdmaud.drv/CMakeLists.txt
index 2432cf4..fb3d962 100644 (file)
--- a/dll/win32/wdmaud.drv/CMakeLists.txt
+++ b/dll/win32/wdmaud.drv/CMakeLists.txt
@@ -1,16 +1,18 @@
 
-add_definitions(-DUNICODE -D_UNICODE)
+set_unicode()
+
 add_definitions(-DNDEBUG=1)
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
-include_directories(${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud)
-include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer)
-include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound
+    ${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud
+    ${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer
+    ${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate)
+
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def
+                   COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/wdmaud.spec --filename wdmaud.drv
+                   DEPENDS native-winebuild)
 
-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def
-    COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/wdmaud.spec --filename wdmaud.drv
-    DEPENDS native-winebuild)
 set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def PROPERTIES GENERATED TRUE)
 add_custom_target(wdmaud.drv_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def)
 
@@ -30,5 +32,5 @@ target_link_libraries(wdmaud.drv
     libsamplerate
     mmixer)
 
-add_importlibs(wdmaud.drv ntdll user32 winmm advapi32 msvcrt setupapi ksuser)
+add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll)
 add_dependencies(wdmaud.drv wdmaud.drv_def psdk)

diff --git a/dll/win32/windowscodecs/CMakeLists.txt b/dll/win32/windowscodecs/CMakeLists.txt
index 50f9666..657574e 100644 (file)
--- a/dll/win32/windowscodecs/CMakeLists.txt
+++ b/dll/win32/windowscodecs/CMakeLists.txt
@@ -1,13 +1,15 @@
 
 add_definitions(-D__WINESRC__)
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/include/reactos/wine
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff)
 
 spec2def(windowscodecs ${CMAKE_CURRENT_SOURCE_DIR}/windowscodecs.spec ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def)
 
@@ -38,5 +40,5 @@ target_link_libraries(windowscodecs
     ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def
     wine)
 
-add_importlibs(windowscodecs msvcrt uuid ole32 shlwapi advapi32)
+add_importlibs(windowscodecs uuid ole32 shlwapi advapi32 msvcrt kernel32 ntdll)
 add_dependencies(windowscodecs windowscodecs_def psdk)

diff --git a/dll/win32/winemp3.acm/CMakeLists.txt b/dll/win32/winemp3.acm/CMakeLists.txt
new file mode 100644 (file)
index 0000000..057afc9
--- /dev/null
+++ b/dll/win32/winemp3.acm/CMakeLists.txt
@@ -0,0 +1,26 @@
+
+add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(-D__WINESRC__ -DWIN32)
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123)
+
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def
+    COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/winemp3.acm.spec --filename winemp3.acm
+    DEPENDS native-winebuild)
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def PROPERTIES GENERATED TRUE)
+add_custom_target(winemp3.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def)
+
+add_library(winemp3.acm SHARED mpegl3.c)
+
+set_target_properties(winemp3.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "")
+
+target_link_libraries(winemp3.acm
+    ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def
+    mingw_common
+    wine
+    mpg123)
+
+add_importlibs(winemp3.acm msvcrt winmm user32)
+add_dependencies(winemp3.acm winemp3.acm_def psdk)

diff --git a/dll/win32/winhttp/CMakeLists.txt b/dll/win32/winhttp/CMakeLists.txt
index 4f8c1f6..d7702c9 100644 (file)
--- a/dll/win32/winhttp/CMakeLists.txt
+++ b/dll/win32/winhttp/CMakeLists.txt
@@ -20,5 +20,5 @@ target_link_libraries(winhttp
     ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def
     wine)
 
-add_importlibs(winhttp msvcrt shlwapi wininet ws2_32 ntdll)
+add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt kernel32 ntdll)
 add_dependencies(winhttp winhttp_def psdk)

diff --git a/dll/win32/wininet/CMakeLists.txt b/dll/win32/wininet/CMakeLists.txt
index 2f69325..9b84707 100644 (file)
--- a/dll/win32/wininet/CMakeLists.txt
+++ b/dll/win32/wininet/CMakeLists.txt
@@ -1,8 +1,10 @@
 
 add_definitions(-D__WINESRC__ -D_WINE)
+add_definitions(-Dclose=_close)
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/include/reactos/wine
+    ${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib)
 
 spec2def(wininet ${CMAKE_CURRENT_SOURCE_DIR}/wininet.spec ${CMAKE_CURRENT_BINARY_DIR}/wininet.def)
 
@@ -30,5 +32,5 @@ target_link_libraries(wininet
     zlib
     pseh)
 
-add_importlibs(wininet msvcrt mpr shlwapi shell32 user32 advapi32 ntdll secur32 crypt32 ws2_32)
+add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll)
 add_dependencies(wininet wininet_def psdk buildno_header)

diff --git a/dll/win32/winmm/CMakeLists.txt b/dll/win32/winmm/CMakeLists.txt
index 7fac90d..1f72118 100644 (file)
--- a/dll/win32/winmm/CMakeLists.txt
+++ b/dll/win32/winmm/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(winmm
     wine
     pseh)
 
-add_importlibs(winmm msvcrt ntdll advapi32 user32)
+add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll)
 add_dependencies(winmm winmm_def psdk)
 
 add_subdirectory(midimap)

diff --git a/dll/win32/winspool/CMakeLists.txt b/dll/win32/winspool/CMakeLists.txt
index 65febf3..2036205 100644 (file)
--- a/dll/win32/winspool/CMakeLists.txt
+++ b/dll/win32/winspool/CMakeLists.txt
@@ -16,5 +16,5 @@ target_link_libraries(winspool
     ${CMAKE_CURRENT_BINARY_DIR}/winspool.def
     wine)
 
-add_importlibs(winspool ntdll advapi32 shlwapi)
+add_importlibs(winspool advapi32 shlwapi kernel32 ntdll)
 add_dependencies(winspool winspool_def psdk)

diff --git a/dll/win32/winsta/CMakeLists.txt b/dll/win32/winsta/CMakeLists.txt
index 5eba7b5..d9adff7 100644 (file)
--- a/dll/win32/winsta/CMakeLists.txt
+++ b/dll/win32/winsta/CMakeLists.txt
@@ -21,6 +21,6 @@ target_link_libraries(winsta
     ${CMAKE_CURRENT_BINARY_DIR}/winsta.def
     wine)
 
-add_importlibs(winsta ntdll)
+add_importlibs(winsta kernel32 ntdll)
 add_pch(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.h ${SOURCE})
 add_dependencies(winsta winsta_def psdk)

diff --git a/dll/win32/wintrust/CMakeLists.txt b/dll/win32/wintrust/CMakeLists.txt
index 7a07cb9..5c5a429 100644 (file)
--- a/dll/win32/wintrust/CMakeLists.txt
+++ b/dll/win32/wintrust/CMakeLists.txt
@@ -19,5 +19,5 @@ target_link_libraries(wintrust
     wine
     pseh)
 
-add_importlibs(wintrust msvcrt crypt32 cryptui user32 advapi32 imagehlp ntdll)
-add_dependencies(wintrust wintrust_def psdk)
+add_importlibs(wintrust crypt32 cryptui user32 advapi32 imagehlp msvcrt kernel32 ntdll)
+add_dependencies(wintrust wintrust_def psdk buildno_header)

diff --git a/dll/win32/wlanapi/CMakeLists.txt b/dll/win32/wlanapi/CMakeLists.txt
index 345dd2c..4f4e4e7 100644 (file)
--- a/dll/win32/wlanapi/CMakeLists.txt
+++ b/dll/win32/wlanapi/CMakeLists.txt
@@ -13,5 +13,5 @@ target_link_libraries(wlanapi
     wine
     pseh)
 
-add_importlibs(wlanapi kernel32 rpcrt4 ntdll)
+add_importlibs(wlanapi rpcrt4 kernel32 ntdll)
 add_dependencies(wlanapi wlanapi_def psdk)

diff --git a/dll/win32/wldap32/CMakeLists.txt b/dll/win32/wldap32/CMakeLists.txt
index ad71bc5..e9765f7 100644 (file)
--- a/dll/win32/wldap32/CMakeLists.txt
+++ b/dll/win32/wldap32/CMakeLists.txt
@@ -33,5 +33,5 @@ target_link_libraries(wldap32
      ${CMAKE_CURRENT_BINARY_DIR}/wldap32.def
      wine)
 
-add_importlibs(wldap32 ntdll user32)
+add_importlibs(wldap32 user32 kernel32 ntdll)
 add_dependencies(wldap32 wldap32_def psdk)

diff --git a/dll/win32/ws2_32/CMakeLists.txt b/dll/win32/ws2_32/CMakeLists.txt
index 3798b30..61f8b87 100644 (file)
--- a/dll/win32/ws2_32/CMakeLists.txt
+++ b/dll/win32/ws2_32/CMakeLists.txt
@@ -30,6 +30,6 @@ target_link_libraries(ws2_32
      ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def
      wine)
 
-add_importlibs(ws2_32 ntdll user32 advapi32 dnsapi ws2help)
+add_importlibs(ws2_32 user32 advapi32 dnsapi ws2help kernel32 ntdll)
 add_pch(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/include/ws2_32.h ${SOURCE})
 add_dependencies(ws2_32 ws2_32_def psdk)

diff --git a/dll/win32/ws2_32_new/CMakeLists.txt b/dll/win32/ws2_32_new/CMakeLists.txt
index 6549965..e598b41 100644 (file)
--- a/dll/win32/ws2_32_new/CMakeLists.txt
+++ b/dll/win32/ws2_32_new/CMakeLists.txt
@@ -51,5 +51,5 @@ target_link_libraries(ws2_32_new
      ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def
      wine)
 
-add_importlibs(ws2_32_new ntdll user32 advapi32 dnsapi ws2help)
+add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help kernel32 ntdll)
 add_dependencies(ws2_32_new ws2_32_new_def psdk)

diff --git a/dll/win32/ws2help/CMakeLists.txt b/dll/win32/ws2help/CMakeLists.txt
index cce5dd6..96dddc2 100644 (file)
--- a/dll/win32/ws2help/CMakeLists.txt
+++ b/dll/win32/ws2help/CMakeLists.txt
@@ -13,5 +13,5 @@ add_library(ws2help SHARED
 set_module_type(ws2help win32dll)
 
 target_link_libraries(ws2help ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def)
-add_importlibs(ws2help advapi32 ntdll ws2_32)
+add_importlibs(ws2help advapi32 ws2_32 kernel32 ntdll)
 add_dependencies(ws2help ws2help_def psdk)

diff --git a/dll/win32/wshirda/CMakeLists.txt b/dll/win32/wshirda/CMakeLists.txt
index adfddd7..cf8b05e 100644 (file)
--- a/dll/win32/wshirda/CMakeLists.txt
+++ b/dll/win32/wshirda/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_definitions(-DUNICODE -D_UNICODE)
+set_unicode()
 
 spec2def(wshirda ${CMAKE_CURRENT_SOURCE_DIR}/wshirda.spec ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def)
 
@@ -8,5 +8,5 @@ add_library(wshirda SHARED wshirda.c wshirda.rc)
 set_module_type(wshirda win32dll)
 
 target_link_libraries(wshirda ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def)
-add_importlibs(wshirda ntdll ws2_32)
+add_importlibs(wshirda ws2_32 kernel32 ntdll)
 add_dependencies(wshirda wshirda_def psdk)

diff --git a/dll/win32/wshtcpip/CMakeLists.txt b/dll/win32/wshtcpip/CMakeLists.txt
index 84688a8..2a6a703 100644 (file)
--- a/dll/win32/wshtcpip/CMakeLists.txt
+++ b/dll/win32/wshtcpip/CMakeLists.txt
@@ -1,5 +1,6 @@
 
-add_definitions(-DUNICODE -D_UNICODE)
+set_unicode()
+
 include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib)
 
 spec2def(wshtcpip ${CMAKE_CURRENT_SOURCE_DIR}/wshtcpip.spec ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def)
@@ -12,5 +13,5 @@ target_link_libraries(wshtcpip
     ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def
     tdilib)
 
-add_importlibs(wshtcpip kernel32 ntdll ws2_32)
+add_importlibs(wshtcpip kernel32 ws2_32 kernel32 ntdll)
 add_dependencies(wshtcpip wshtcpip_def psdk)

diff --git a/dll/win32/wsock32/CMakeLists.txt b/dll/win32/wsock32/CMakeLists.txt
index 1c65c3f..6cdf4be 100644 (file)
--- a/dll/win32/wsock32/CMakeLists.txt
+++ b/dll/win32/wsock32/CMakeLists.txt
@@ -1,10 +1,10 @@
 
-add_definitions(-DUNICODE -D_UNICODE)
+set_unicode()
 
 add_library(wsock32 SHARED stubs.c wsock32.rc)
 
 set_module_type(wsock32 win32dll)
 
 target_link_libraries(wsock32 ${CMAKE_CURRENT_SOURCE_DIR}/wsock32.def)
-add_importlibs(wsock32 ntdll ws2_32)
+add_importlibs(wsock32 ws2_32 kernel32 ntdll)
 add_dependencies(wsock32 psdk)

diff --git a/dll/win32/wtsapi32/CMakeLists.txt b/dll/win32/wtsapi32/CMakeLists.txt
index 0d2c16f..9e12995 100644 (file)
--- a/dll/win32/wtsapi32/CMakeLists.txt
+++ b/dll/win32/wtsapi32/CMakeLists.txt
@@ -12,5 +12,5 @@ target_link_libraries(wtsapi32
     ${CMAKE_CURRENT_BINARY_DIR}/wtsapi32.def
     wine)
 
-add_importlibs(wtsapi32 advapi32 ntdll)
+add_importlibs(wtsapi32 advapi32 kernel32 ntdll)
 add_dependencies(wtsapi32 wtsapi32_def psdk)

diff --git a/dll/win32/wuapi/CMakeLists.txt b/dll/win32/wuapi/CMakeLists.txt
index 0cbea3b..b5da933 100644 (file)
--- a/dll/win32/wuapi/CMakeLists.txt
+++ b/dll/win32/wuapi/CMakeLists.txt
@@ -23,5 +23,5 @@ target_link_libraries(wuapi
     ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def
     wine)
 
-add_importlibs(wuapi uuid ole32 advapi32 ntdll)
-add_dependencies(wuapi wuapi_def psdk)
+add_importlibs(wuapi uuid ole32 advapi32 kernel32 ntdll)
+add_dependencies(wuapi wuapi_def psdk buildno_header)

diff --git a/dll/win32/xinput1_1/CMakeLists.txt b/dll/win32/xinput1_1/CMakeLists.txt
index 7271d6e..eabc8f8 100644 (file)
--- a/dll/win32/xinput1_1/CMakeLists.txt
+++ b/dll/win32/xinput1_1/CMakeLists.txt
@@ -6,6 +6,8 @@ spec2def(xinput1_1 ${CMAKE_CURRENT_SOURCE_DIR}/xinput1_1.spec ${CMAKE_CURRENT_BI
 
 add_library(xinput1_1 SHARED xinput1_1_main.c version.rc)
 
+add_importlibs(xinput1_1 kernel32)
+
 set_module_type(xinput1_1 win32dll)
 target_link_libraries(xinput1_1 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def)
-add_dependencies(xinput1_1 xinput1_1_def psdk)
+add_dependencies(xinput1_1 xinput1_1_def psdk buildno_header)

diff --git a/dll/win32/xinput1_2/CMakeLists.txt b/dll/win32/xinput1_2/CMakeLists.txt
index 45d3f75..dffd03a 100644 (file)
--- a/dll/win32/xinput1_2/CMakeLists.txt
+++ b/dll/win32/xinput1_2/CMakeLists.txt
@@ -6,6 +6,8 @@ spec2def(xinput1_2 ${CMAKE_CURRENT_SOURCE_DIR}/xinput1_2.spec ${CMAKE_CURRENT_BI
 
 add_library(xinput1_2 SHARED xinput1_2_main.c version.rc)
 
+add_importlibs(xinput1_2 kernel32)
+
 set_module_type(xinput1_2 win32dll)
 target_link_libraries(xinput1_2 ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def)
-add_dependencies(xinput1_2 xinput1_2_def psdk)
+add_dependencies(xinput1_2 xinput1_2_def psdk buildno_header)

diff --git a/dll/win32/xinput1_3/CMakeLists.txt b/dll/win32/xinput1_3/CMakeLists.txt
index 463928f..92ec3d7 100644 (file)
--- a/dll/win32/xinput1_3/CMakeLists.txt
+++ b/dll/win32/xinput1_3/CMakeLists.txt
@@ -12,4 +12,6 @@ target_link_libraries(xinput1_3
     ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def
     wine)
 
-add_dependencies(xinput1_3 xinput1_3_def psdk)
+add_importlibs(xinput1_3 msvcrt kernel32 ntdll)
+
+add_dependencies(xinput1_3 xinput1_3_def psdk buildno_header)

diff --git a/dll/win32/xinput9_1_0/CMakeLists.txt b/dll/win32/xinput9_1_0/CMakeLists.txt
index bd715ee..f59aa61 100644 (file)
--- a/dll/win32/xinput9_1_0/CMakeLists.txt
+++ b/dll/win32/xinput9_1_0/CMakeLists.txt
@@ -6,6 +6,8 @@ spec2def(xinput9_1_0 ${CMAKE_CURRENT_SOURCE_DIR}/xinput9_1_0.spec ${CMAKE_CURREN
 
 add_library(xinput9_1_0 SHARED xinput9_1_0_main.c version.rc)
 
+add_importlibs(xinput9_1_0 kernel32)
+
 set_module_type(xinput9_1_0 win32dll)
 target_link_libraries(xinput9_1_0 ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def)
-add_dependencies(xinput9_1_0 xinput9_1_0_def psdk)
+add_dependencies(xinput9_1_0 xinput9_1_0_def psdk buildno_header)

diff --git a/dll/win32/xmllite/CMakeLists.txt b/dll/win32/xmllite/CMakeLists.txt
index b63cffa..f716647 100644 (file)
--- a/dll/win32/xmllite/CMakeLists.txt
+++ b/dll/win32/xmllite/CMakeLists.txt
@@ -12,4 +12,6 @@ target_link_libraries(xmllite
     ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def
     wine)
 
-add_dependencies(xmllite xmllite_def psdk)
+add_importlibs(xmllite msvcrt kernel32 ntdll)
+
+add_dependencies(xmllite xmllite_def psdk buildno_header)

diff --git a/gcc.cmake b/gcc.cmake
index 1dc23f2..62c6fda 100644 (file)
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -53,44 +53,49 @@ macro(set_subsystem MODULE SUBSYSTEM)
 endmacro()\r
 \r
 macro(add_importlibs MODULE)\r
-  FOREACH(LIB ${ARGN})\r
+  foreach(LIB ${ARGN})\r
     target_link_libraries(${MODULE} ${LIB}.a)\r
-  ENDFOREACH()\r
+  endforeach()\r
 endmacro()\r
 \r
 macro(set_module_type MODULE TYPE)\r
 \r
-  add_dependencies(${MODULE} builno_header psdk)\r
+    add_dependencies(${MODULE} psdk buildno_header)\r
   \r
-  if(${TYPE} MATCHES nativecui)\r
-    set_subsystem(${MODULE} native)\r
-    set_entrypoint(${MODULE} NtProcessStartup@4)\r
-  endif()\r
-  if(${TYPE} MATCHES win32gui)\r
-    set_subsystem(${MODULE} windows)\r
-    set_entrypoint(${MODULE} WinMainCRTStartup)\r
-  endif()\r
-  if(${TYPE} MATCHES win32cui)\r
-    set_subsystem(${MODULE} console)\r
-    set_entrypoint(${MODULE} mainCRTStartup)\r
-  endif()\r
-  if(${TYPE} MATCHES win32dll)\r
-    target_link_libraries(${MODULE} mingw_dllmain mingw_common)\r
-    set_entrypoint(${MODULE} DllMain@12)\r
-  endif()\r
+    if(${TYPE} MATCHES nativecui)\r
+        set_subsystem(${MODULE} native)\r
+        set_entrypoint(${MODULE} NtProcessStartup@4)\r
+    endif()\r
+    if(${TYPE} MATCHES win32gui)\r
+        set_subsystem(${MODULE} windows)\r
+        set_entrypoint(${MODULE} WinMainCRTStartup)\r
+        if(NOT IS_UNICODE)\r
+            target_link_libraries(${MODULE} mingw_main)\r
+        else()\r
+            target_link_libraries(${MODULE} mingw_wmain)\r
+        endif(NOT IS_UNICODE)\r
+        target_link_libraries(${MODULE} mingw_common)\r
+    endif()\r
+    if(${TYPE} MATCHES win32cui)\r
+        set_subsystem(${MODULE} console)\r
+        set_entrypoint(${MODULE} mainCRTStartup)\r
+        if(NOT IS_UNICODE)\r
+            target_link_libraries(${MODULE} mingw_main)\r
+        else()\r
+            target_link_libraries(${MODULE} mingw_wmain)\r
+        endif(NOT IS_UNICODE)\r
+        target_link_libraries(${MODULE} mingw_common)\r
+    endif()\r
+    if(${TYPE} MATCHES win32dll)\r
+        set_entrypoint(${MODULE} DllMain@12)\r
+    endif()\r
 endmacro()\r
 \r
 endif()\r
 \r
-macro(set_unicode MODULE STATE)\r
-   if(${STATE} MATCHES yes)\r
-       add_definitions(-DUNICODE -D_UNICODE)\r
-       target_link_libraries(${MODULE} mingw_wmain)\r
-   else()\r
-       target_link_libraries(${MODULE} mingw_main)\r
-   endif()\r
-   \r
-  target_link_libraries(${MODULE} mingw_common)\r
+macro(set_unicode)\r
+   add_definitions(-DUNICODE -D_UNICODE)\r
+   set(IS_UNICODE 1)\r
 endmacro()\r
 \r
 # Workaround lack of mingw RC support in cmake\r
@@ -106,20 +111,18 @@ macro(set_rc_compiler)
         set(result_incs "-I${arg} ${result_incs}")\r
     endforeach(arg ${includes})\r
 \r
-    SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${result_defs} ${result_incs} -i <SOURCE> -O coff -o <OBJECT>")\r
+    set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${result_defs} ${result_incs} -i <SOURCE> -O coff -o <OBJECT>")\r
 endmacro()\r
 \r
 #typelib support\r
 macro(ADD_TYPELIB TARGET)\r
-  FOREACH(SOURCE ${ARGN})\r
-    GET_FILENAME_COMPONENT(FILE ${SOURCE} NAME_WE)\r
-    SET(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb)\r
-    ADD_CUSTOM_COMMAND(\r
-      OUTPUT ${OBJECT}\r
-      COMMAND native-widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -t -T ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}\r
-      DEPENDS native-widl\r
-    )\r
-    LIST(APPEND OBJECTS ${OBJECT})\r
-  ENDFOREACH()\r
-  ADD_CUSTOM_TARGET(${TARGET} ALL DEPENDS ${OBJECTS})\r
-ENDMACRO()\r
+  foreach(SOURCE ${ARGN})\r
+    get_filename_component(FILE ${SOURCE} NAME_WE)\r
+    set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb)\r
+    add_custom_command(OUTPUT ${OBJECT}\r
+                       COMMAND native-widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -t -T ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}\r
+                       DEPENDS native-widl)\r
+    list(APPEND OBJECTS ${OBJECT})\r
+  endforeach()\r
+  add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS})\r
+endmacro()\r

diff --git a/importlibs/libcrypt32.a b/importlibs/libcrypt32.a
new file mode 100644 (file)
index 0000000..6a73c62
Binary files /dev/null and b/importlibs/libcrypt32.a differ

diff --git a/msc.cmake b/msc.cmake
index e1e7e06..a83a607 100644 (file)
--- a/msc.cmake
+++ b/msc.cmake
@@ -1,6 +1,6 @@
 \r
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86")\r
-  add_definitions(-D__i386__)\r
+    add_definitions(-D__i386__)\r
 endif()\r
 \r
 add_definitions(-Dinline=__inline)\r
@@ -33,34 +33,32 @@ macro(set_subsystem MODULE SUBSYSTEM)
 endmacro()\r
 \r
 macro(add_importlibs MODULE)\r
-  FOREACH(LIB ${ARGN})\r
-    target_link_libraries(${MODULE} ${LIB}.LIB)\r
-  ENDFOREACH()\r
+    foreach(LIB ${ARGN})\r
+        target_link_libraries(${MODULE} ${LIB}.LIB)\r
+    endforeach()\r
 endmacro()\r
 \r
 macro(set_module_type MODULE TYPE)\r
-  if(${TYPE} MATCHES nativecui)\r
-    set_subsystem(${MODULE} native)\r
-    add_importlibs(${MODULE} ntdll)\r
-  endif()\r
-  if (${TYPE} MATCHES win32gui)\r
-    set_subsystem(${MODULE} windows)\r
-  endif ()\r
-  if (${TYPE} MATCHES win32cui)\r
-    set_subsystem(${MODULE} console)\r
-  endif ()\r
+    if(${TYPE} MATCHES nativecui)\r
+        set_subsystem(${MODULE} native)\r
+        add_importlibs(${MODULE} ntdll)\r
+    endif()\r
+    if (${TYPE} MATCHES win32gui)\r
+        set_subsystem(${MODULE} windows)\r
+    endif ()\r
+    if (${TYPE} MATCHES win32cui)\r
+        set_subsystem(${MODULE} console)\r
+    endif ()\r
 endmacro()\r
 \r
-macro(set_unicode MODULE STATE)\r
-   if(${STATE} MATCHES yes)\r
-       add_definitions(-DUNICODE -D_UNICODE)\r
-   endif()\r
+macro(set_unicode)\r
+    add_definitions(-DUNICODE -D_UNICODE)\r
 endmacro()\r
 \r
 endif()\r
 \r
 set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi  /Ob0 /Od")\r
-SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")\r
+set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")\r
 \r
 macro(set_rc_compiler)\r
 # dummy, this workaround is only needed in mingw due to lack of RC support in cmake\r
@@ -68,14 +66,12 @@ endmacro()
 \r
 #typelib support\r
 macro(ADD_TYPELIB TARGET)\r
-  FOREACH(SOURCE ${ARGN})\r
-    GET_FILENAME_COMPONENT(FILE ${SOURCE} NAME_WE)\r
-    SET(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb)\r
-    ADD_CUSTOM_COMMAND(\r
-      OUTPUT ${OBJECT}\r
-      COMMAND midl /I ${REACTOS_SOURCE_DIR}/include/dxsdk /I . /I ${REACTOS_SOURCE_DIR}/include /I ${REACTOS_SOURCE_DIR}/include/psdk /win32 /tlb ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}\r
-    )\r
-    LIST(APPEND OBJECTS ${OBJECT})\r
-  ENDFOREACH()\r
-  ADD_CUSTOM_TARGET(${TARGET} ALL DEPENDS ${OBJECTS})\r
-ENDMACRO()
\ No newline at end of file
+    foreach(SOURCE ${ARGN})\r
+        get_filename_component(FILE ${SOURCE} NAME_WE)\r
+        set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb)\r
+        add_custom_command(OUTPUT ${OBJECT}\r
+                           COMMAND midl /I ${REACTOS_SOURCE_DIR}/include/dxsdk /I . /I ${REACTOS_SOURCE_DIR}/include /I ${REACTOS_SOURCE_DIR}/include/psdk /win32 /tlb ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE})\r
+        list(APPEND OBJECTS ${OBJECT})\r
+    endforeach()\r
+    add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS})\r
+endmacro()
\ No newline at end of file