[CMAKE]

- Some work on the dlls. By Alexey Komarov.

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

diff --git a/CMakeMacros.cmake b/CMakeMacros.cmake
index 5c0ce53..b006cca 100644 (file)
--- a/CMakeMacros.cmake
+++ b/CMakeMacros.cmake
@@ -122,7 +122,7 @@ MACRO(add_minicd_target _targetname _dir _nameoncd)
     add_custom_command(\r
         OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcd/${_dir}/${_nameoncd}        \r
         COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd})\r
-        \r
+\r
     add_custom_target(${_targetname}_minicd DEPENDS ${BOOTCD_DIR}/${_dir}/${_nameoncd})\r
 \r
     add_dependencies(${_targetname}_minicd ${_targetname})\r

diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt
index 8c363d6..d5a4947 100644 (file)
--- a/dll/win32/CMakeLists.txt
+++ b/dll/win32/CMakeLists.txt
@@ -54,7 +54,7 @@ add_subdirectory(imm32)
 #add_subdirectory(inetcomm)
 #add_subdirectory(inetmib1)
 add_subdirectory(initpki)
-#add_subdirectory(inseng)
+add_subdirectory(inseng)
 add_subdirectory(iphlpapi)
 #add_subdirectory(iprtprio)
 add_subdirectory(itircl)
@@ -62,10 +62,10 @@ add_subdirectory(itircl)
 #add_subdirectory(jscript)
 add_subdirectory(kernel32)
 add_subdirectory(loadperf)
-#add_subdirectory(localspl)
-#add_subdirectory(localui)
+add_subdirectory(localspl)
+add_subdirectory(localui)
 add_subdirectory(lpk)
-#add_subdirectory(lsasrv)
+add_subdirectory(lsasrv)
 add_subdirectory(lz32)
 add_subdirectory(mapi32)
 add_subdirectory(mciavi32)
@@ -73,18 +73,18 @@ add_subdirectory(mcicda)
 add_subdirectory(mciqtz32)
 add_subdirectory(mciseq)
 add_subdirectory(mciwave)
-#add_subdirectory(mlang)
+add_subdirectory(mlang)
 add_subdirectory(mmdrv)
 add_subdirectory(modemui)
 add_subdirectory(mpr)
 add_subdirectory(mprapi)
-#add_subdirectory(msacm32)
+add_subdirectory(msacm32)
 add_subdirectory(msadp32.acm)
 add_subdirectory(msafd)
 add_subdirectory(mscat32)
 add_subdirectory(mscms)
 add_subdirectory(mscoree)
-#add_subdirectory(msctf)
+add_subdirectory(msctf)
 add_subdirectory(msftedit)
 add_subdirectory(msg711.acm)
 add_subdirectory(msgina)
@@ -211,7 +211,7 @@ add_subdirectory(winsta)
 add_subdirectory(wintrust)
 add_subdirectory(wlanapi)
 add_subdirectory(wldap32)
-#add_subdirectory(wmi)
+add_subdirectory(wmi)
 add_subdirectory(ws2_32)
 add_subdirectory(ws2_32_new)
 add_subdirectory(ws2help)

diff --git a/dll/win32/inseng/CMakeLists.txt b/dll/win32/inseng/CMakeLists.txt
new file mode 100644 (file)
index 0000000..cad5592
--- /dev/null
+++ b/dll/win32/inseng/CMakeLists.txt
@@ -0,0 +1,24 @@
+
+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 ${CMAKE_CURRENT_SOURCE_DIR}/inseng.spec ${CMAKE_CURRENT_BINARY_DIR}/inseng.def)
+
+add_library(inseng SHARED inseng_main.c regsvr.c)
+
+set_module_type(inseng win32dll)
+
+target_link_libraries(inseng
+    ${CMAKE_CURRENT_BINARY_DIR}/inseng.def
+    uuid
+    wine)
+
+add_importlibs(inseng
+    ole32
+    advapi32
+    kernel32
+    ntdll)
+
+add_dependencies(inseng inseng_def)

diff --git a/dll/win32/itss/CMakeLists.txt b/dll/win32/itss/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a791dfe
--- /dev/null
+++ b/dll/win32/itss/CMakeLists.txt
@@ -0,0 +1,30 @@
+
+add_definitions(-D__WINESRC__)
+add_definitions(-D_DLL -D__USE_CRTIMP)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(itss ${CMAKE_CURRENT_SOURCE_DIR}/itss.spec ${CMAKE_CURRENT_BINARY_DIR}/itss.def)
+
+add_library(itss SHARED
+    chm_lib.c
+    lzx.c
+    itss.c
+    moniker.c
+    protocol.c
+    storage.c
+    rsrc.rc)
+
+set_module_type(itss win32dll)
+
+target_link_libraries(itss
+    ${CMAKE_CURRENT_BINARY_DIR}/itss.def
+    uuid
+    wine)
+
+add_importlibs(itss
+    urlmon
+    shlwapi
+    ole32
+    ntdll)
+
+add_dependencies(itss itss_def wineheaders)

diff --git a/dll/win32/localspl/CMakeLists.txt b/dll/win32/localspl/CMakeLists.txt
new file mode 100644 (file)
index 0000000..ffbd9b2
--- /dev/null
+++ b/dll/win32/localspl/CMakeLists.txt
@@ -0,0 +1,28 @@
+
+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(localspl ${CMAKE_CURRENT_SOURCE_DIR}/localspl.spec ${CMAKE_CURRENT_BINARY_DIR}/localspl.def)
+
+add_library(localspl SHARED
+    localmon.c
+    localspl_main.c
+    provider.c
+    localspl.rc)
+
+set_module_type(localspl win32dll)
+
+target_link_libraries(localspl
+    ${CMAKE_CURRENT_BINARY_DIR}/localspl.def
+    wine)
+
+add_importlibs(localspl
+    spoolss
+    user32
+    advapi32
+    kernel32
+    ntdll)
+
+add_dependencies(localspl localspl_def)

diff --git a/dll/win32/localui/CMakeLists.txt b/dll/win32/localui/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0177a9e
--- /dev/null
+++ b/dll/win32/localui/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+add_definitions(-D__WINESRC__)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(localui ${CMAKE_CURRENT_SOURCE_DIR}/localui.spec ${CMAKE_CURRENT_BINARY_DIR}/localui.def)
+
+add_library(localui SHARED localui.c localui.rc)
+
+set_module_type(localui win32dll)
+
+target_link_libraries(localui
+    ${CMAKE_CURRENT_BINARY_DIR}/localui.def
+    uuid
+    wine)
+
+add_importlibs(localui winspool user32 kernel32 ntdll)
+add_dependencies(localui localui_def)

diff --git a/dll/win32/lsasrv/CMakeLists.txt b/dll/win32/lsasrv/CMakeLists.txt
new file mode 100644 (file)
index 0000000..50cb137
--- /dev/null
+++ b/dll/win32/lsasrv/CMakeLists.txt
@@ -0,0 +1,26 @@
+
+set_unicode()
+
+include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys/lsass)
+
+spec2def(lsasrv ${CMAKE_CURRENT_SOURCE_DIR}/lsasrv.spec ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def)
+
+add_library(lsasrv SHARED
+    authport.c
+    lsarpc.c
+    lsasrv.c
+    privileges.c
+    sids.c
+    lsasrv.rc)
+
+set_entrypoint(lsasrv 0)
+
+target_link_libraries(lsasrv
+    ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def
+    lsa_server
+    wine
+    pseh)
+
+add_importlibs(lsasrv rpcrt4 kernel32 ntdll)
+add_dependencies(lsasrv lsasrv_def  psdk buildno_header)

diff --git a/dll/win32/mlang/CMakeLists.txt b/dll/win32/mlang/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a31ec82
--- /dev/null
+++ b/dll/win32/mlang/CMakeLists.txt
@@ -0,0 +1,27 @@
+
+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(mlang ${CMAKE_CURRENT_SOURCE_DIR}/mlang.spec ${CMAKE_CURRENT_BINARY_DIR}/mlang.def)
+
+add_library(mlang SHARED mlang.c regsvr.c)
+
+set_entrypoint(mlang 0)
+
+target_link_libraries(mlang
+    ${CMAKE_CURRENT_BINARY_DIR}/mlang.def
+    uuid
+    wine)
+
+add_importlibs(mlang
+    ole32
+    user32
+    gdi32
+    advapi32
+    oleaut32
+    kernel32
+    ntdll)
+
+add_dependencies(mlang mlang_def  psdk buildno_header)

diff --git a/dll/win32/msacm32/CMakeLists.txt b/dll/win32/msacm32/CMakeLists.txt
new file mode 100644 (file)
index 0000000..59b3522
--- /dev/null
+++ b/dll/win32/msacm32/CMakeLists.txt
@@ -0,0 +1,27 @@
+
+set_unicode()
+
+add_definitions(-D_DLL -D__USE_CRTIMP)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+spec2def(msacm32 ${CMAKE_CURRENT_SOURCE_DIR}/msacm32.spec ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def)
+
+add_library(msacm32 SHARED
+    driver.c
+    filter.c
+    format.c
+    internal.c
+    msacm32_main.c
+    pcmconverter.c
+    stream.c)
+
+set_module_type(msacm32 win32dll)
+
+target_link_libraries(msacm32
+    ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def
+    wine)
+
+add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll)
+add_dependencies(msacm32 msacm32_def)
+
+add_subdirectory(msacm32.drv)

diff --git a/dll/win32/msacm32/msacm32.drv/CMakeLists.txt b/dll/win32/msacm32/msacm32.drv/CMakeLists.txt
new file mode 100644 (file)
index 0000000..663065f
--- /dev/null
+++ b/dll/win32/msacm32/msacm32.drv/CMakeLists.txt
@@ -0,0 +1,23 @@
+
+set_unicode()
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def
+    COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/msacm32.drv.spec --filename msacm32.drv
+    DEPENDS native-winebuild)
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def PROPERTIES GENERATED TRUE)
+add_custom_target(msacm32.drv_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def)
+
+add_library(msacm32.drv SHARED wavemap.c wavemap.rc)
+
+set_entrypoint(msacm32.drv 0)
+set_target_properties(msacm32.drv PROPERTIES SUFFIX "")
+
+target_link_libraries(msacm32.drv
+    ${CMAKE_CURRENT_BINARY_DIR}/msacm32.drv.def
+    wine)
+
+add_importlibs(msacm32.drv msacm32 user32 winmm advapi32 kernel32 ntdll)
+add_dependencies(msacm32.drv msacm32.drv_def psdk buildno_header)

diff --git a/dll/win32/msctf/CMakeLists.txt b/dll/win32/msctf/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5c43388
--- /dev/null
+++ b/dll/win32/msctf/CMakeLists.txt
@@ -0,0 +1,32 @@
+
+add_definitions(-D__WINESRC__)
+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(msctf ${CMAKE_CURRENT_SOURCE_DIR}/msctf.spec ${CMAKE_CURRENT_BINARY_DIR}/msctf.def)
+
+add_library(msctf SHARED
+    categorymgr.c
+    compartmentmgr.c
+    context.c
+    displayattributemgr.c
+    documentmgr.c
+    inputprocessor.c
+    langbarmgr.c
+    msctf.c
+    range.c
+    regsvr.c
+    threadmgr.c
+    version.rc)
+
+set_module_type(msctf win32dll)
+
+target_link_libraries(msctf
+    ${CMAKE_CURRENT_BINARY_DIR}/msctf.def
+    uuid
+    wine)
+
+add_importlibs(msctf ole32 oleaut32 user32 advapi32 kernel32 ntdll)
+add_dependencies(msctf msctf_def)

diff --git a/dll/win32/ufatx/CMakeLists.txt b/dll/win32/ufatx/CMakeLists.txt
index 42b7ed4..157dbdd 100644 (file)
--- a/dll/win32/ufatx/CMakeLists.txt
+++ b/dll/win32/ufatx/CMakeLists.txt
@@ -10,4 +10,4 @@ target_link_libraries(ufatx
     vfatxlib)
 
 add_importlibs(ufatx gcc kernel32 ntdll)
-add_dependencies(ufatx ufatx_def)
+add_dependencies(ufatx ufatx_def psdk buildno_header)

diff --git a/dll/win32/wmi/CMakeLists.txt b/dll/win32/wmi/CMakeLists.txt
new file mode 100644 (file)
index 0000000..16da180
--- /dev/null
+++ b/dll/win32/wmi/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+spec2def(wmi ${CMAKE_CURRENT_SOURCE_DIR}/wmi.spec ${CMAKE_CURRENT_BINARY_DIR}/wmi.def)
+
+add_library(wmi SHARED wmi.rc)
+
+set_entrypoint(wmi 0)
+
+target_link_libraries(wmi ${CMAKE_CURRENT_BINARY_DIR}/wmi.def)
+
+add_importlibs(wmi advapi32)
+add_dependencies(wmi wmi_def psdk buildno_header)

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