[CMAKE]

- Add wdmaud.drv, windowscodecs, winfax, wing32, winhttp, winmm, winspool, winsta and winsta to build. By Alexey Komarov.

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

diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt
index 6d0e94d..da4289b 100644 (file)
--- a/dll/win32/CMakeLists.txt
+++ b/dll/win32/CMakeLists.txt
@@ -197,18 +197,18 @@ add_subdirectory(usp10)
 add_subdirectory(uxtheme)
 #add_subdirectory(vdmdbg)
 #add_subdirectory(version)
 add_subdirectory(uxtheme)
 #add_subdirectory(vdmdbg)
 #add_subdirectory(version)

-#add_subdirectory(wdmaud.drv)
-#add_subdirectory(windowscodecs)
+add_subdirectory(wdmaud.drv)
+add_subdirectory(windowscodecs)

 #add_subdirectory(winemp3.acm)
 #add_subdirectory(winemp3.acm)

-#add_subdirectory(winfax)
-#add_subdirectory(wing32)
-#add_subdirectory(winhttp)
-#add_subdirectory(wininet)
-#add_subdirectory(winmm)
+add_subdirectory(winfax)
+add_subdirectory(wing32)
+add_subdirectory(winhttp)
+add_subdirectory(wininet)
+add_subdirectory(winmm)

 #add_subdirectory(winscard)
 #add_subdirectory(winscard)

-#add_subdirectory(winspool)
-#add_subdirectory(winsta)
-#add_subdirectory(wintrust)
+add_subdirectory(winspool)
+add_subdirectory(winsta)
+add_subdirectory(wintrust)

 add_subdirectory(wlanapi)
 add_subdirectory(wldap32)
 #add_subdirectory(wmi)
 add_subdirectory(wlanapi)
 add_subdirectory(wldap32)
 #add_subdirectory(wmi)

diff --git a/dll/win32/wdmaud.drv/CMakeLists.txt b/dll/win32/wdmaud.drv/CMakeLists.txt
new file mode 100644 (file)
index 0000000..2432cf4
--- /dev/null
+++ b/dll/win32/wdmaud.drv/CMakeLists.txt
@@ -0,0 +1,34 @@
+
+add_definitions(-DUNICODE -D_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)
+
+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)
+
+add_library(wdmaud.drv SHARED
+    wdmaud.c
+    mixer.c
+    mmixer.c
+    legacy.c
+    wdmaud.rc)
+
+set_module_type(wdmaud.drv win32dll)
+set_target_properties(wdmaud.drv PROPERTIES SUFFIX "")
+
+target_link_libraries(wdmaud.drv
+    ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.drv.def
+    mmebuddy
+    libsamplerate
+    mmixer)
+
+add_importlibs(wdmaud.drv ntdll user32 winmm advapi32 msvcrt setupapi ksuser)
+add_dependencies(wdmaud.drv wdmaud.drv_def psdk)

diff --git a/dll/win32/windowscodecs/CMakeLists.txt b/dll/win32/windowscodecs/CMakeLists.txt
new file mode 100644 (file)
index 0000000..50f9666
--- /dev/null
+++ b/dll/win32/windowscodecs/CMakeLists.txt
@@ -0,0 +1,42 @@
+
+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)
+
+spec2def(windowscodecs ${CMAKE_CURRENT_SOURCE_DIR}/windowscodecs.spec ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def)
+
+add_library(windowscodecs SHARED
+    bmpdecode.c
+    bmpencode.c
+    clsfactory.c
+    converter.c
+    fliprotate.c
+    gifformat.c
+    icoformat.c
+    imgfactory.c
+    info.c
+    jpegformat.c
+    main.c
+    palette.c
+    pngformat.c
+    propertybag.c
+    regsvr.c
+    stream.c
+    tiffformat.c
+    ungif.c
+    version.rc)
+
+set_module_type(windowscodecs win32dll)
+
+target_link_libraries(windowscodecs
+    ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def
+    wine)
+
+add_importlibs(windowscodecs msvcrt uuid ole32 shlwapi advapi32)
+add_dependencies(windowscodecs windowscodecs_def psdk)

diff --git a/dll/win32/winfax/CMakeLists.txt b/dll/win32/winfax/CMakeLists.txt
new file mode 100644 (file)
index 0000000..4745159
--- /dev/null
+++ b/dll/win32/winfax/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+spec2def(winfax ${CMAKE_CURRENT_SOURCE_DIR}/winfax.spec ${CMAKE_CURRENT_BINARY_DIR}/winfax.def)
+
+add_library(winfax SHARED winfax.c winfax.rc)
+
+set_target_properties(winfax PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+
+target_link_libraries(winfax ${CMAKE_CURRENT_BINARY_DIR}/winfax.def)
+
+add_importlibs(winfax kernel32 ntdll)
+add_dependencies(winfax winfax_def psdk)

diff --git a/dll/win32/wing32/CMakeLists.txt b/dll/win32/wing32/CMakeLists.txt
new file mode 100644 (file)
index 0000000..be01521
--- /dev/null
+++ b/dll/win32/wing32/CMakeLists.txt
@@ -0,0 +1,13 @@
+
+add_definitions(-DUNICODE -D_UNICODE)
+
+spec2def(wing32 ${CMAKE_CURRENT_SOURCE_DIR}/wing32.spec ${CMAKE_CURRENT_BINARY_DIR}/wing32.def)
+
+add_library(wing32 SHARED wing32.c)
+
+set_target_properties(wing32 PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+
+target_link_libraries(wing32 ${CMAKE_CURRENT_BINARY_DIR}/wing32.def)
+
+add_importlibs(wing32 user32 gdi32)
+add_dependencies(wing32 wing32_def psdk)

diff --git a/dll/win32/winhttp/CMakeLists.txt b/dll/win32/winhttp/CMakeLists.txt
new file mode 100644 (file)
index 0000000..4f8c1f6
--- /dev/null
+++ b/dll/win32/winhttp/CMakeLists.txt
@@ -0,0 +1,24 @@
+
+add_definitions(-D__WINESRC__)
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(winhttp ${CMAKE_CURRENT_SOURCE_DIR}/winhttp.spec ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def)
+
+add_library(winhttp SHARED
+    cookie.c
+    handle.c
+    main.c
+    net.c
+    request.c
+    session.c
+    url.c)
+
+set_module_type(winhttp win32dll)
+
+target_link_libraries(winhttp
+    ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def
+    wine)
+
+add_importlibs(winhttp msvcrt shlwapi wininet ws2_32 ntdll)
+add_dependencies(winhttp winhttp_def psdk)

diff --git a/dll/win32/winmm/CMakeLists.txt b/dll/win32/winmm/CMakeLists.txt
new file mode 100644 (file)
index 0000000..7fac90d
--- /dev/null
+++ b/dll/win32/winmm/CMakeLists.txt
@@ -0,0 +1,31 @@
+
+add_definitions(-D_WINE)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(winmm ${CMAKE_CURRENT_SOURCE_DIR}/winmm.spec ${CMAKE_CURRENT_BINARY_DIR}/winmm.def)
+
+set_rc_compiler()
+
+add_library(winmm SHARED
+    driver.c
+    joystick.c
+    lolvldrv.c
+    mci.c
+    mmio.c
+    playsound.c
+    registry.c
+    time.c
+    winmm.c
+    winmm_res.rc)
+
+set_module_type(winmm win32dll)
+
+target_link_libraries(winmm
+    ${CMAKE_CURRENT_BINARY_DIR}/winmm.def
+    wine
+    pseh)
+
+add_importlibs(winmm msvcrt ntdll advapi32 user32)
+add_dependencies(winmm winmm_def psdk)
+
+add_subdirectory(midimap)

diff --git a/dll/win32/winmm/midimap/CMakeLists.txt b/dll/win32/winmm/midimap/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5c4c771
--- /dev/null
+++ b/dll/win32/winmm/midimap/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+add_definitions(-DUNICODE -D_UNICODE)
+
+spec2def(midimap ${CMAKE_CURRENT_SOURCE_DIR}/midimap.spec ${CMAKE_CURRENT_BINARY_DIR}/midimap.def)
+
+add_library(midimap SHARED midimap.c midimap.rc)
+
+set_target_properties(midimap PROPERTIES LINK_FLAGS "-Wl,-entry,0")
+
+target_link_libraries(midimap
+    ${CMAKE_CURRENT_BINARY_DIR}/midimap.def
+    wine)
+
+add_importlibs(midimap kernel32 uuid ntdll advapi32 user32 winmm)
+add_dependencies(midimap midimap_def psdk)

diff --git a/dll/win32/winspool/CMakeLists.txt b/dll/win32/winspool/CMakeLists.txt
new file mode 100644 (file)
index 0000000..65febf3
--- /dev/null
+++ b/dll/win32/winspool/CMakeLists.txt
@@ -0,0 +1,20 @@
+
+add_definitions(-DUNICODE -D_UNICODE)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(winspool ${CMAKE_CURRENT_SOURCE_DIR}/winspool.spec ${CMAKE_CURRENT_BINARY_DIR}/winspool.def)
+
+add_library(winspool SHARED
+    info.c
+    stubs.c
+    winspool.rc)
+
+set_module_type(winspool win32dll)
+set_target_properties(winspool PROPERTIES SUFFIX ".drv")
+
+target_link_libraries(winspool
+    ${CMAKE_CURRENT_BINARY_DIR}/winspool.def
+    wine)
+
+add_importlibs(winspool ntdll advapi32 shlwapi)
+add_dependencies(winspool winspool_def psdk)

diff --git a/dll/win32/winsta/CMakeLists.txt b/dll/win32/winsta/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5eba7b5
--- /dev/null
+++ b/dll/win32/winsta/CMakeLists.txt
@@ -0,0 +1,26 @@
+
+spec2def(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.spec ${CMAKE_CURRENT_BINARY_DIR}/winsta.def)
+
+list(APPEND SOURCE
+    logon.c
+    main.c
+    misc.c
+    query.c
+    security.c
+    server.c
+    ws.c
+    winsta.rc)
+
+add_library(winsta SHARED
+    ${CMAKE_CURRENT_BINARY_DIR}/winsta_winsta.h.gch
+    ${SOURCE})
+    
+set_module_type(winsta win32dll)
+
+target_link_libraries(winsta
+    ${CMAKE_CURRENT_BINARY_DIR}/winsta.def
+    wine)
+
+add_importlibs(winsta 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
new file mode 100644 (file)
index 0000000..7a07cb9
--- /dev/null
+++ b/dll/win32/wintrust/CMakeLists.txt
@@ -0,0 +1,23 @@
+
+add_definitions(-D__WINESRC__)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(wintrust ${CMAKE_CURRENT_SOURCE_DIR}/wintrust.spec ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def)
+
+add_library(wintrust SHARED
+    crypt.c
+    register.c
+    wintrust_main.c
+    asn.c
+    softpub.c
+    version.rc)
+
+set_module_type(wintrust win32dll)
+
+target_link_libraries(wintrust
+    ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def
+    wine
+    pseh)
+
+add_importlibs(wintrust msvcrt crypt32 cryptui user32 advapi32 imagehlp ntdll)
+add_dependencies(wintrust wintrust_def psdk)