[CMAKE]
authorAmine Khaldi <amine.khaldi@reactos.org>
Mon, 4 Oct 2010 22:19:49 +0000 (22:19 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Mon, 4 Oct 2010 22:19:49 +0000 (22:19 +0000)
- More work on the base modules. By Alexey Komarov.

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

21 files changed:
base/CMakeLists.txt
base/system/CMakeLists.txt
base/system/autochk/CMakeLists.txt [new file with mode: 0644]
base/system/bootok/CMakeLists.txt [new file with mode: 0644]
base/system/expand/CMakeLists.txt [new file with mode: 0644]
base/system/format/CMakeLists.txt [new file with mode: 0644]
base/system/lsass/CMakeLists.txt [new file with mode: 0644]
base/system/msiexec/CMakeLists.txt [new file with mode: 0644]
base/system/regsvr32/CMakeLists.txt [new file with mode: 0644]
base/system/rundll32/CMakeLists.txt [new file with mode: 0644]
base/system/runonce/CMakeLists.txt [new file with mode: 0644]
base/system/services/CMakeLists.txt [new file with mode: 0644]
base/system/smss/CMakeLists.txt [new file with mode: 0644]
base/system/userinit/CMakeLists.txt [new file with mode: 0644]
base/system/winlogon/CMakeLists.txt [new file with mode: 0644]
importlibs/libnotifyhook.a [new file with mode: 0644]
importlibs/librpcrt4.a [new file with mode: 0644]
lib/3rdparty/CMakeLists.txt
lib/3rdparty/libmpg123/CMakeLists.txt [new file with mode: 0644]
lib/CMakeLists.txt
lib/ppcmmu/CMakeLists.txt [new file with mode: 0644]

index d8da807..42f541d 100644 (file)
@@ -3,4 +3,4 @@ add_subdirectory(applications)
 #add_subdirectory(services)
 add_subdirectory(setup)
 add_subdirectory(shell)
-#add_subdirectory(system)
+add_subdirectory(system)
index 8e19f3c..60fcd27 100644 (file)
@@ -1,14 +1,14 @@
 
-#add_subdirectory(autochk)
-#add_subdirectory(bootok)
-#add_subdirectory(expand)
-#add_subdirectory(format)
-#add_subdirectory(lsass)
-#add_subdirectory(msiexec)
+add_subdirectory(autochk)
+add_subdirectory(bootok)
+add_subdirectory(expand)
+add_subdirectory(format)
+add_subdirectory(lsass)
+add_subdirectory(msiexec)
 #add_subdirectory(regsvr32)
-#add_subdirectory(rundll32)
-#add_subdirectory(runonce)
-#add_subdirectory(services)
-#add_subdirectory(smss)
-#add_subdirectory(userinit)
-#add_subdirectory(winlogon)
+add_subdirectory(rundll32)
+add_subdirectory(runonce)
+add_subdirectory(services)
+add_subdirectory(smss)
+add_subdirectory(userinit)
+add_subdirectory(winlogon)
diff --git a/base/system/autochk/CMakeLists.txt b/base/system/autochk/CMakeLists.txt
new file mode 100644 (file)
index 0000000..74e2f72
--- /dev/null
@@ -0,0 +1,6 @@
+
+add_executable(autochk WIN32 autochk.c autochk.rc)
+
+set_module_type(autochk nativecui)
+
+target_link_libraries(autochk mingw_common nt)
diff --git a/base/system/bootok/CMakeLists.txt b/base/system/bootok/CMakeLists.txt
new file mode 100644 (file)
index 0000000..ec95471
--- /dev/null
@@ -0,0 +1,8 @@
+
+set_unicode()
+
+add_executable(bootok bootok.c bootok.rc)
+
+set_module_type(bootok win32cui)
+
+add_importlibs(bootok advapi32 msvcrt)
diff --git a/base/system/expand/CMakeLists.txt b/base/system/expand/CMakeLists.txt
new file mode 100644 (file)
index 0000000..67dad66
--- /dev/null
@@ -0,0 +1,8 @@
+
+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)
diff --git a/base/system/format/CMakeLists.txt b/base/system/format/CMakeLists.txt
new file mode 100644 (file)
index 0000000..67d6997
--- /dev/null
@@ -0,0 +1,9 @@
+
+include_directories(.)
+set_rc_compiler()
+
+add_executable(format format.c format.rc)
+
+set_module_type(format win32cui)
+
+add_importlibs(format ntdll user32 fmifs msvcrt)
diff --git a/base/system/lsass/CMakeLists.txt b/base/system/lsass/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8ffd022
--- /dev/null
@@ -0,0 +1,10 @@
+
+set_unicode()
+
+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)
diff --git a/base/system/msiexec/CMakeLists.txt b/base/system/msiexec/CMakeLists.txt
new file mode 100644 (file)
index 0000000..cde608b
--- /dev/null
@@ -0,0 +1,13 @@
+
+include_directories(${REACTOS_SOURCE_DIR}/include/wine)
+add_definitions(-D__WINESRC__)
+
+add_executable(msiexec
+    msiexec.c
+    service.c
+    rsrc.rc)
+
+set_module_type(msiexec win32gui)
+
+add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt)
+target_link_libraries(msiexec uuid wine)
diff --git a/base/system/regsvr32/CMakeLists.txt b/base/system/regsvr32/CMakeLists.txt
new file mode 100644 (file)
index 0000000..452bdd6
--- /dev/null
@@ -0,0 +1,10 @@
+
+set_unicode()
+include_directories(.)
+set_rc_compiler()
+
+add_executable(regsvr32 regsvr32.c regsvr32.rc)
+
+set_module_type(regsvr32 win32gui)
+
+add_importlibs(regsvr32 user32 shell32 ole32 msvcrt)
diff --git a/base/system/rundll32/CMakeLists.txt b/base/system/rundll32/CMakeLists.txt
new file mode 100644 (file)
index 0000000..6d5723e
--- /dev/null
@@ -0,0 +1,10 @@
+
+set_unicode()
+include_directories(.)
+set_rc_compiler()
+
+add_executable(rundll32 rundll32.c rundll32.rc)
+
+set_module_type(rundll32 win32gui)
+
+add_importlibs(rundll32 user32 msvcrt)
diff --git a/base/system/runonce/CMakeLists.txt b/base/system/runonce/CMakeLists.txt
new file mode 100644 (file)
index 0000000..27a6cc1
--- /dev/null
@@ -0,0 +1,8 @@
+
+set_unicode()
+
+add_executable(runonce runonce.c runonce.rc)
+
+set_module_type(runonce win32gui)
+
+add_importlibs(runonce advapi32 user32 msvcrt)
diff --git a/base/system/services/CMakeLists.txt b/base/system/services/CMakeLists.txt
new file mode 100644 (file)
index 0000000..fa91364
--- /dev/null
@@ -0,0 +1,26 @@
+
+set_unicode()
+include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
+
+list(APPEND SOURCE
+    config.c
+    database.c
+    driver.c
+    groupdb.c
+    rpcserver.c
+    services.c
+    services.rc)
+
+add_executable(services ${CMAKE_CURRENT_BINARY_DIR}/services_services.h.gch ${SOURCE})
+
+target_link_libraries(services
+    svcctl_server
+    pseh)
+
+add_pch(services ${CMAKE_CURRENT_SOURCE_DIR}/services.h ${SOURCE})
+
+set_module_type(services win32cui)
+
+add_importlibs(services user32 advapi32 rpcrt4 msvcrt)
+
diff --git a/base/system/smss/CMakeLists.txt b/base/system/smss/CMakeLists.txt
new file mode 100644 (file)
index 0000000..61dff08
--- /dev/null
@@ -0,0 +1,31 @@
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
+
+list(APPEND SOURCE
+    client.c
+    debug.c
+    init.c
+    initdosdev.c
+    initenv.c
+    initheap.c
+    initmv.c
+    initobdir.c
+    initpage.c
+    initreg.c
+    initrun.c
+    initss.c
+    initwkdll.c
+    print.c
+    smapi.c
+    smapicomp.c
+    smapiexec.c
+    smapiquery.c
+    smss.c
+    smss.rc)
+
+add_executable(smss WIN32 ${CMAKE_CURRENT_BINARY_DIR}/smss_smss.h.gch ${SOURCE})
+
+add_pch(smss ${CMAKE_CURRENT_SOURCE_DIR}/smss.h ${SOURCE})
+
+set_module_type(smss nativecui)
+add_importlibs(smss ntdll)
+target_link_libraries(smss mingw_common nt smlib)
diff --git a/base/system/userinit/CMakeLists.txt b/base/system/userinit/CMakeLists.txt
new file mode 100644 (file)
index 0000000..000d7b6
--- /dev/null
@@ -0,0 +1,11 @@
+
+set_unicode()
+include_directories(.)
+set_rc_compiler()
+
+add_executable(userinit userinit.c userinit.rc)
+
+set_module_type(userinit win32gui)
+
+add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt)
+target_link_libraries(userinit wine)
diff --git a/base/system/winlogon/CMakeLists.txt b/base/system/winlogon/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5d6f934
--- /dev/null
@@ -0,0 +1,18 @@
+
+list(APPEND SOURCE
+    environment.c
+    sas.c
+    screensaver.c
+    setup.c
+    winlogon.c
+    wlx.c
+    winlogon.rc)
+
+add_executable(winlogon ${CMAKE_CURRENT_BINARY_DIR}/winlogon_winlogon.h.gch ${SOURCE})
+
+add_pch(winlogon ${CMAKE_CURRENT_SOURCE_DIR}/winlogon.h ${SOURCE})
+
+set_module_type(winlogon win32gui)
+
+add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt)
+target_link_libraries(winlogon wine)
diff --git a/importlibs/libnotifyhook.a b/importlibs/libnotifyhook.a
new file mode 100644 (file)
index 0000000..5f5a3a5
Binary files /dev/null and b/importlibs/libnotifyhook.a differ
diff --git a/importlibs/librpcrt4.a b/importlibs/librpcrt4.a
new file mode 100644 (file)
index 0000000..37d4fea
Binary files /dev/null and b/importlibs/librpcrt4.a differ
index 66f5724..b59d959 100644 (file)
@@ -6,6 +6,7 @@ add_subdirectory(expat)
 add_subdirectory(freetype)
 add_subdirectory(fullfat)
 add_subdirectory(icu4ros)
+#add_subdirectory(libmpg123)
 add_subdirectory(libsamplerate)
 add_subdirectory(libwine)
 add_subdirectory(libxml2)
diff --git a/lib/3rdparty/libmpg123/CMakeLists.txt b/lib/3rdparty/libmpg123/CMakeLists.txt
new file mode 100644 (file)
index 0000000..3b97ae5
--- /dev/null
@@ -0,0 +1,37 @@
+add_definitions(-DOPT_I386)
+add_definitions(-DREAL_IS_FLOAT)
+add_definitions(-DNOXFERMEM)
+add_definitions(-DHAVE_CONFIG_H)
+add_definitions(-DEOVERFLOW=75)
+add_definitions(-Dlseek=_lseek)
+add_definitions(-Dread=_read)
+add_definitions(-Dstrdup=_strdup)
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123)
+
+add_library(libmpg123
+    compat.c
+    dct64.c
+    dct64_i386.c
+    equalizer.c
+    feature.c
+    format.c
+    frame.c
+    icy.c
+    icy2utf8.c
+    id3.c
+    index.c
+    layer1.c
+    layer2.c
+    layer3.c
+    libmpg123.c
+    ntom.c
+    optimize.c
+    parse.c
+    readers.c
+    stringbuf.c
+    synth.c
+    synth_8bit.c
+    synth_real.c
+    synth_s32.c
+    tabinit.c)
index d85be97..7e60675 100644 (file)
@@ -15,6 +15,7 @@ add_subdirectory(fslib)
 add_subdirectory(lsalib)
 add_subdirectory(nls)
 add_subdirectory(ntdllsys)
+add_subdirectory(ppcmmu)
 add_subdirectory(pseh)
 add_subdirectory(recyclebin)
 add_subdirectory(rossym)
diff --git a/lib/ppcmmu/CMakeLists.txt b/lib/ppcmmu/CMakeLists.txt
new file mode 100644 (file)
index 0000000..fa6cd42
--- /dev/null
@@ -0,0 +1,9 @@
+
+list(APPEND SOURCE dummy.c)
+
+if(ARCH MATCHES powerpc)
+list(APPEND SOURCE
+    mmuutil.c)
+endif(ARCH MATCHES powerpc)
+
+add_library(ppcmmu ${SOURCE})