[CMAKE]
authorAmine Khaldi <amine.khaldi@reactos.org>
Tue, 5 Oct 2010 13:03:47 +0000 (13:03 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Tue, 5 Oct 2010 13:03:47 +0000 (13:03 +0000)
Alexey Komarov:
- More work on base modules.
- Add some dlls to build.

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

25 files changed:
base/CMakeLists.txt
base/services/CMakeLists.txt
base/services/audiosrv/CMakeLists.txt [new file with mode: 0644]
base/services/eventlog/CMakeLists.txt [new file with mode: 0644]
base/services/rpcss/CMakeLists.txt [new file with mode: 0644]
base/services/spoolsv/CMakeLists.txt [new file with mode: 0644]
base/services/svchost/CMakeLists.txt [new file with mode: 0644]
base/services/tcpsvcs/CMakeLists.txt [new file with mode: 0644]
base/services/telnetd/CMakeLists.txt [new file with mode: 0644]
base/services/tftpd/CMakeLists.txt [new file with mode: 0644]
base/services/umpnpmgr/CMakeLists.txt [new file with mode: 0644]
base/services/wlansvc/CMakeLists.txt [new file with mode: 0644]
base/setup/CMakeLists.txt
base/setup/reactos/CMakeLists.txt [new file with mode: 0644]
base/setup/setup/CMakeLists.txt [new file with mode: 0644]
base/setup/vmwinst/CMakeLists.txt [new file with mode: 0644]
base/setup/welcome/CMakeLists.txt [new file with mode: 0644]
base/shell/CMakeLists.txt
base/shell/explorer-new/CMakeLists.txt [new file with mode: 0644]
dll/win32/CMakeLists.txt
dll/win32/userenv/CMakeLists.txt [new file with mode: 0644]
dll/win32/vdmdbg/CMakeLists.txt [new file with mode: 0644]
dll/win32/version/CMakeLists.txt [new file with mode: 0644]
dll/win32/wdmaud.drv/CMakeLists.txt
dll/win32/wuapi/CMakeLists.txt

index 42f541d..5dafa0b 100644 (file)
@@ -1,6 +1,6 @@
 
 add_subdirectory(applications)
-#add_subdirectory(services)
+add_subdirectory(services)
 add_subdirectory(setup)
 add_subdirectory(shell)
 add_subdirectory(system)
index 4f641f9..0672ef8 100644 (file)
@@ -1,11 +1,11 @@
 
-#add_subdirectory(audiosrv)
-#add_subdirectory(eventlog)
+add_subdirectory(audiosrv)
+add_subdirectory(eventlog)
 #add_subdirectory(rpcss)
-#add_subdirectory(spoolsv)
-#add_subdirectory(svchost)
-#add_subdirectory(tcpsvcs)
-#add_subdirectory(telnetd)
-#add_subdirectory(tftpd)
-#add_subdirectory(umpnpmgr)
-#add_subdirectory(wlansvc)
+add_subdirectory(spoolsv)
+add_subdirectory(svchost)
+add_subdirectory(tcpsvcs)
+add_subdirectory(telnetd)
+add_subdirectory(tftpd)
+add_subdirectory(umpnpmgr)
+add_subdirectory(wlansvc)
diff --git a/base/services/audiosrv/CMakeLists.txt b/base/services/audiosrv/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a48aff2
--- /dev/null
@@ -0,0 +1,15 @@
+
+set_unicode(audiosrv yes)
+
+add_executable(audiosrv
+    main.c
+    pnp_list_manager.c
+    pnp_list_lock.c
+    pnp.c
+    services.c
+    debug.c
+    audiosrv.rc)
+
+set_module_type(audiosrv win32cui)
+add_importlibs(audiosrv advapi32 user32 setupapi msvcrt)
+
diff --git a/base/services/eventlog/CMakeLists.txt b/base/services/eventlog/CMakeLists.txt
new file mode 100644 (file)
index 0000000..092589d
--- /dev/null
@@ -0,0 +1,21 @@
+
+include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl)
+
+set_unicode()
+
+list(APPEND SOURCE
+    eventlog.c
+    logport.c
+    eventlog.rc
+    rpc.c
+    file.c)
+
+add_executable(eventlog ${CMAKE_CURRENT_BINARY_DIR}/eventlog_eventlog.h.gch ${SOURCE})
+
+target_link_libraries(eventlog eventlogrpc_server pseh)
+
+add_pch(eventlog ${CMAKE_CURRENT_SOURCE_DIR}/eventlog.h ${SOURCE})
+
+set_module_type(eventlog win32cui)
+
+add_importlibs(eventlog advapi32 rpcrt4 msvcrt)
diff --git a/base/services/rpcss/CMakeLists.txt b/base/services/rpcss/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a7f96c0
--- /dev/null
@@ -0,0 +1,19 @@
+
+set_unicode()
+
+add_executable(rpcss
+    epmp.c
+    irotp.c
+    rpcss_main.c
+    service_main.c
+    epm.idl
+    irot.idl
+    rpcss.rc)
+
+target_link_libraries(rpcss rpcss_epm_server rpcss_irot_server pseh)
+
+add_pch(rpcss ${CMAKE_CURRENT_SOURCE_DIR}/rpcss.h ${SOURCE})
+
+set_module_type(rpcss win32cui)
+
+add_importlibs(rpcss advapi32 rpcrt4 msvcrt)
diff --git a/base/services/spoolsv/CMakeLists.txt b/base/services/spoolsv/CMakeLists.txt
new file mode 100644 (file)
index 0000000..30faf3d
--- /dev/null
@@ -0,0 +1,9 @@
+
+set_unicode()
+
+add_executable(spoolsv spoolsv.c spoolsv.rc)
+
+target_link_libraries(spoolsv wine)
+
+set_module_type(spoolsv win32cui)
+add_importlibs(spoolsv advapi32 msvcrt)
diff --git a/base/services/svchost/CMakeLists.txt b/base/services/svchost/CMakeLists.txt
new file mode 100644 (file)
index 0000000..9d2875a
--- /dev/null
@@ -0,0 +1,5 @@
+
+add_executable(svchost svchost.c svchost.rc)
+
+set_module_type(svchost win32cui)
+add_importlibs(svchost advapi32 msvcrt)
diff --git a/base/services/tcpsvcs/CMakeLists.txt b/base/services/tcpsvcs/CMakeLists.txt
new file mode 100644 (file)
index 0000000..e5717b2
--- /dev/null
@@ -0,0 +1,20 @@
+
+set_unicode()
+
+list(APPEND SOURCE
+    tcpsvcs.c
+    skelserver.c
+    echo.c
+    discard.c
+    daytime.c
+    qotd.c
+    chargen.c
+    tcpsvcs.rc
+    log.c)
+
+add_executable(tcpsvcs ${CMAKE_CURRENT_BINARY_DIR}/tcpsvcs_tcpsvcs.h.gch ${SOURCE})
+
+add_pch(tcpsvcs ${CMAKE_CURRENT_SOURCE_DIR}/tcpsvcs.h ${SOURCE})
+set_module_type(tcpsvcs win32cui)
+add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt)
+
diff --git a/base/services/telnetd/CMakeLists.txt b/base/services/telnetd/CMakeLists.txt
new file mode 100644 (file)
index 0000000..c29a3ad
--- /dev/null
@@ -0,0 +1,11 @@
+
+add_executable(telnetd
+    telnetd.c
+    serviceentry.c
+    telnetd.rc)
+
+target_link_libraries(telnetd wine)
+
+set_module_type(telnetd win32cui)
+add_importlibs(telnetd advapi32 ws2_32 msvcrt)
+
diff --git a/base/services/tftpd/CMakeLists.txt b/base/services/tftpd/CMakeLists.txt
new file mode 100644 (file)
index 0000000..3ed1214
--- /dev/null
@@ -0,0 +1,7 @@
+
+add_executable(tftpd tftpd.cpp)
+
+target_link_libraries(tftpd wine)
+
+set_module_type(tftpd win32cui)
+add_importlibs(tftpd advapi32 ws2_32 msvcrt)
diff --git a/base/services/umpnpmgr/CMakeLists.txt b/base/services/umpnpmgr/CMakeLists.txt
new file mode 100644 (file)
index 0000000..01341d2
--- /dev/null
@@ -0,0 +1,16 @@
+
+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)
+
+set_module_type(umpnpmgr win32cui)
+add_importlibs(umpnpmgr
+    advapi32
+    rpcrt4
+    userenv
+    msvcrt)
diff --git a/base/services/wlansvc/CMakeLists.txt b/base/services/wlansvc/CMakeLists.txt
new file mode 100644 (file)
index 0000000..d692fb8
--- /dev/null
@@ -0,0 +1,14 @@
+
+set_unicode()
+include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl)
+
+add_executable(wlansvc wlansvc.c rpcserver.c)
+
+target_link_libraries(wlansvc wlansvc_server pseh)
+
+set_module_type(wlansvc win32cui)
+add_importlibs(wlansvc
+    advapi32
+    rpcrt4
+    iphlpapi
+    msvcrt)
index 9f10fdf..02a7bc1 100644 (file)
@@ -1,6 +1,6 @@
 
-#add_subdirectory(reactos)
-#add_subdirectory(setup)
+add_subdirectory(reactos)
+add_subdirectory(setup)
 add_subdirectory(usetup)
-#add_subdirectory(vmwinst)
-#add_subdirectory(welcome)
+add_subdirectory(vmwinst)
+add_subdirectory(welcome)
diff --git a/base/setup/reactos/CMakeLists.txt b/base/setup/reactos/CMakeLists.txt
new file mode 100644 (file)
index 0000000..ed1bfa8
--- /dev/null
@@ -0,0 +1,16 @@
+
+set_unicode()
+
+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)
diff --git a/base/setup/setup/CMakeLists.txt b/base/setup/setup/CMakeLists.txt
new file mode 100644 (file)
index 0000000..edf073e
--- /dev/null
@@ -0,0 +1,9 @@
+
+set_unicode()
+
+add_executable(setup
+    setup.c
+    setup.rc)
+
+set_module_type(setup win32gui)
+add_importlibs(setup userenv msvcrt)
diff --git a/base/setup/vmwinst/CMakeLists.txt b/base/setup/vmwinst/CMakeLists.txt
new file mode 100644 (file)
index 0000000..3c6033b
--- /dev/null
@@ -0,0 +1,19 @@
+
+set_unicode()
+
+add_executable(vmwinst
+    vmwinst.c
+    vmwinst.rc)
+
+target_link_libraries(vmwinst pseh)
+
+set_module_type(vmwinst win32gui)
+add_importlibs(vmwinst
+    advapi32
+    comctl32
+    comdlg32
+    newdev
+    user32
+    setupapi
+    shell32
+    msvcrt)
diff --git a/base/setup/welcome/CMakeLists.txt b/base/setup/welcome/CMakeLists.txt
new file mode 100644 (file)
index 0000000..40f43e9
--- /dev/null
@@ -0,0 +1,9 @@
+
+set_unicode()
+
+add_executable(welcome
+    welcome.c
+    welcome.rc)
+
+set_module_type(welcome win32gui)
+add_importlibs(welcome gdi32 user32 msvcrt)
index bd375ff..dc06a56 100644 (file)
@@ -1,4 +1,4 @@
 
 add_subdirectory(cmd)
 add_subdirectory(explorer)
-#add_subdirectory(explorer_new)
+add_subdirectory(explorer-new)
diff --git a/base/shell/explorer-new/CMakeLists.txt b/base/shell/explorer-new/CMakeLists.txt
new file mode 100644 (file)
index 0000000..601bc5f
--- /dev/null
@@ -0,0 +1,34 @@
+
+set_unicode()
+
+add_definitions(-DWIN32)
+
+list(APPEND SOURCE
+    desktop.c
+    dragdrop.c
+    explorer.c
+    startmnu.c
+    taskband.c
+    taskswnd.c
+    tbsite.c
+    trayntfy.c
+    trayprop.c
+    traywnd.c
+    explorer.rc)
+
+add_executable(explorer_new ${CMAKE_CURRENT_BINARY_DIR}/explorer_new_precomp.h.gch ${SOURCE})
+
+target_link_libraries(explorer_new uuid)
+
+add_pch(explorer_new ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE)
+set_module_type(explorer_new win32gui)
+add_importlibs(explorer_new 
+    advapi32
+    gdi32
+    user32
+    comctl32
+    ole32
+    oleaut32
+    shell32
+    shlwapi
+    msvcrt)
index da4289b..ff0ba52 100644 (file)
@@ -192,11 +192,11 @@ add_subdirectory(updspapi)
 add_subdirectory(url)
 #add_subdirectory(urlmon)
 add_subdirectory(user32)
-#add_subdirectory(userenv)
+add_subdirectory(userenv)
 add_subdirectory(usp10)
 add_subdirectory(uxtheme)
-#add_subdirectory(vdmdbg)
-#add_subdirectory(version)
+add_subdirectory(vdmdbg)
+add_subdirectory(version)
 add_subdirectory(wdmaud.drv)
 add_subdirectory(windowscodecs)
 #add_subdirectory(winemp3.acm)
diff --git a/dll/win32/userenv/CMakeLists.txt b/dll/win32/userenv/CMakeLists.txt
new file mode 100644 (file)
index 0000000..538788c
--- /dev/null
@@ -0,0 +1,28 @@
+
+spec2def(userenv ${CMAKE_CURRENT_SOURCE_DIR}/userenv.spec ${CMAKE_CURRENT_BINARY_DIR}/userenv.def)
+
+list(APPEND SOURCE
+    desktop.c
+    directory.c
+    environment.c
+    gpolicy.c
+    misc.c
+    profile.c
+    registry.c
+    setup.c
+    userenv.c
+    userenv.rc)
+
+add_library(userenv SHARED
+    ${CMAKE_CURRENT_BINARY_DIR}/userenv_precomp.h.gch
+    ${SOURCE})
+
+set_module_type(userenv win32dll)
+
+target_link_libraries(userenv
+    ${CMAKE_CURRENT_BINARY_DIR}/userenv.def
+    uuid)
+
+add_importlibs(userenv advapi32 user32 kernel32 ntdll)
+add_pch(userenv ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
+add_dependencies(userenv userenv_def)
diff --git a/dll/win32/vdmdbg/CMakeLists.txt b/dll/win32/vdmdbg/CMakeLists.txt
new file mode 100644 (file)
index 0000000..98e1d29
--- /dev/null
@@ -0,0 +1,18 @@
+
+set_unicode()
+
+spec2def(vdmdbg ${CMAKE_CURRENT_SOURCE_DIR}/vdmdbg.spec ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def)
+
+list(APPEND SOURCE vdmdbg.c)
+
+add_library(vdmdbg SHARED
+    ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg_vdmdbg.h.gch
+    ${SOURCE})
+
+set_module_type(vdmdbg win32dll)
+
+target_link_libraries(vdmdbg ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def)
+
+add_importlibs(vdmdbg kernel32 ntdll)
+add_pch(vdmdbg ${CMAKE_CURRENT_SOURCE_DIR}/vdmdbg.h ${SOURCE})
+add_dependencies(vdmdbg vdmdbg_def)
diff --git a/dll/win32/version/CMakeLists.txt b/dll/win32/version/CMakeLists.txt
new file mode 100644 (file)
index 0000000..2b7f639
--- /dev/null
@@ -0,0 +1,20 @@
+
+add_definitions(-D__WINESRC__)
+spec2def(version ${CMAKE_CURRENT_SOURCE_DIR}/version.spec ${CMAKE_CURRENT_BINARY_DIR}/version.def)
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_library(version SHARED
+    info.c
+    install.c
+    resource.c
+    version.rc)
+
+set_entrypoint(version 0)
+
+target_link_libraries(version
+    ${CMAKE_CURRENT_BINARY_DIR}/version.def
+    wine)
+
+add_importlibs(version lz32 kernel32 ntdll)
+add_dependencies(version version_def psdk buildno_header)
index fb3d962..c2aa0f9 100644 (file)
@@ -33,4 +33,4 @@ target_link_libraries(wdmaud.drv
     mmixer)
 
 add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll)
-add_dependencies(wdmaud.drv wdmaud.drv_def psdk)
+add_dependencies(wdmaud.drv wdmaud.drv_def)
index b5da933..144799b 100644 (file)
@@ -24,4 +24,4 @@ target_link_libraries(wuapi
     wine)
 
 add_importlibs(wuapi uuid ole32 advapi32 kernel32 ntdll)
-add_dependencies(wuapi wuapi_def psdk buildno_header)
+add_dependencies(wuapi wuapi_def)