4 Oct
2010
4 Oct
'10
10:19 p.m.
Author: akhaldi
Date: Mon Oct 4 22:19:49 2010
New Revision: 48984
URL: http://svn.reactos.org/svn/reactos?rev=48984&view=rev
Log:
[CMAKE]
- More work on the base modules. By Alexey Komarov.
Added:
branches/cmake-bringup/base/system/autochk/CMakeLists.txt (with props)
branches/cmake-bringup/base/system/bootok/CMakeLists.txt (with props)
branches/cmake-bringup/base/system/expand/CMakeLists.txt (with props)
branches/cmake-bringup/base/system/format/CMakeLists.txt (with props)
branches/cmake-bringup/base/system/lsass/CMakeLists.txt (with props)
branches/cmake-bringup/base/system/msiexec/CMakeLists.txt (with props)
branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt (with props)
branches/cmake-bringup/base/system/rundll32/CMakeLists.txt (with props)
branches/cmake-bringup/base/system/runonce/CMakeLists.txt (with props)
branches/cmake-bringup/base/system/services/CMakeLists.txt (with props)
branches/cmake-bringup/base/system/smss/CMakeLists.txt (with props)
branches/cmake-bringup/base/system/userinit/CMakeLists.txt (with props)
branches/cmake-bringup/base/system/winlogon/CMakeLists.txt (with props)
branches/cmake-bringup/importlibs/libnotifyhook.a (with props)
branches/cmake-bringup/importlibs/librpcrt4.a (with props)
branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt (with props)
branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt (with props)
Modified:
branches/cmake-bringup/base/CMakeLists.txt
branches/cmake-bringup/base/system/CMakeLists.txt
branches/cmake-bringup/lib/3rdparty/CMakeLists.txt
branches/cmake-bringup/lib/CMakeLists.txt
Modified: branches/cmake-bringup/base/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/CMakeLists.t…
==============================================================================
--- branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010
@@ -3,4 +3,4 @@
#add_subdirectory(services)
add_subdirectory(setup)
add_subdirectory(shell)
-#add_subdirectory(system)
+add_subdirectory(system)
Modified: branches/cmake-bringup/base/system/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/CMake…
==============================================================================
--- branches/cmake-bringup/base/system/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/system/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49
2010
@@ -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)
Added: branches/cmake-bringup/base/system/autochk/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/autoc…
==============================================================================
--- branches/cmake-bringup/base/system/autochk/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/system/autochk/CMakeLists.txt [iso-8859-1] Mon Oct 4
22:19:49 2010
@@ -1,0 +1,6 @@
+
+add_executable(autochk WIN32 autochk.c autochk.rc)
+
+set_module_type(autochk nativecui)
+
+target_link_libraries(autochk mingw_common nt)
Propchange: branches/cmake-bringup/base/system/autochk/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/system/bootok/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/booto…
==============================================================================
--- branches/cmake-bringup/base/system/bootok/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/system/bootok/CMakeLists.txt [iso-8859-1] Mon Oct 4
22:19:49 2010
@@ -1,0 +1,8 @@
+
+set_unicode()
+
+add_executable(bootok bootok.c bootok.rc)
+
+set_module_type(bootok win32cui)
+
+add_importlibs(bootok advapi32 msvcrt)
Propchange: branches/cmake-bringup/base/system/bootok/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/system/expand/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/expan…
==============================================================================
--- branches/cmake-bringup/base/system/expand/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/system/expand/CMakeLists.txt [iso-8859-1] Mon Oct 4
22:19:49 2010
@@ -1,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)
Propchange: branches/cmake-bringup/base/system/expand/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/system/format/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/forma…
==============================================================================
--- branches/cmake-bringup/base/system/format/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/system/format/CMakeLists.txt [iso-8859-1] Mon Oct 4
22:19:49 2010
@@ -1,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)
Propchange: branches/cmake-bringup/base/system/format/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/system/lsass/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/lsass…
==============================================================================
--- branches/cmake-bringup/base/system/lsass/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/system/lsass/CMakeLists.txt [iso-8859-1] Mon Oct 4
22:19:49 2010
@@ -1,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)
Propchange: branches/cmake-bringup/base/system/lsass/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/system/msiexec/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/msiex…
==============================================================================
--- branches/cmake-bringup/base/system/msiexec/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1] Mon Oct 4
22:19:49 2010
@@ -1,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)
Propchange: branches/cmake-bringup/base/system/msiexec/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/regsv…
==============================================================================
--- branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt [iso-8859-1] Mon Oct 4
22:19:49 2010
@@ -1,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)
Propchange: branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/system/rundll32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/rundl…
==============================================================================
--- branches/cmake-bringup/base/system/rundll32/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/system/rundll32/CMakeLists.txt [iso-8859-1] Mon Oct 4
22:19:49 2010
@@ -1,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)
Propchange: branches/cmake-bringup/base/system/rundll32/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/system/runonce/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/runon…
==============================================================================
--- branches/cmake-bringup/base/system/runonce/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/system/runonce/CMakeLists.txt [iso-8859-1] Mon Oct 4
22:19:49 2010
@@ -1,0 +1,8 @@
+
+set_unicode()
+
+add_executable(runonce runonce.c runonce.rc)
+
+set_module_type(runonce win32gui)
+
+add_importlibs(runonce advapi32 user32 msvcrt)
Propchange: branches/cmake-bringup/base/system/runonce/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/system/services/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi…
==============================================================================
--- branches/cmake-bringup/base/system/services/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/system/services/CMakeLists.txt [iso-8859-1] Mon Oct 4
22:19:49 2010
@@ -1,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)
+
Propchange: branches/cmake-bringup/base/system/services/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/system/smss/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/smss/…
==============================================================================
--- branches/cmake-bringup/base/system/smss/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/system/smss/CMakeLists.txt [iso-8859-1] Mon Oct 4
22:19:49 2010
@@ -1,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)
Propchange: branches/cmake-bringup/base/system/smss/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/system/userinit/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/useri…
==============================================================================
--- branches/cmake-bringup/base/system/userinit/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/system/userinit/CMakeLists.txt [iso-8859-1] Mon Oct 4
22:19:49 2010
@@ -1,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)
Propchange: branches/cmake-bringup/base/system/userinit/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/system/winlogon/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/winlo…
==============================================================================
--- branches/cmake-bringup/base/system/winlogon/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/system/winlogon/CMakeLists.txt [iso-8859-1] Mon Oct 4
22:19:49 2010
@@ -1,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)
Propchange: branches/cmake-bringup/base/system/winlogon/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/importlibs/libnotifyhook.a
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libnot…
==============================================================================
Binary file - no diff available.
Propchange: branches/cmake-bringup/importlibs/libnotifyhook.a
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/cmake-bringup/importlibs/librpcrt4.a
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/librpc…
==============================================================================
Binary file - no diff available.
Propchange: branches/cmake-bringup/importlibs/librpcrt4.a
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: branches/cmake-bringup/lib/3rdparty/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/CMak…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49
2010
@@ -6,6 +6,7 @@
add_subdirectory(freetype)
add_subdirectory(fullfat)
add_subdirectory(icu4ros)
+#add_subdirectory(libmpg123)
add_subdirectory(libsamplerate)
add_subdirectory(libwine)
add_subdirectory(libxml2)
Added: branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libm…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt (added)
+++ branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] Mon Oct 4
22:19:49 2010
@@ -1,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)
Propchange: branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: branches/cmake-bringup/lib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx…
==============================================================================
--- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010
@@ -15,6 +15,7 @@
add_subdirectory(lsalib)
add_subdirectory(nls)
add_subdirectory(ntdllsys)
+add_subdirectory(ppcmmu)
add_subdirectory(pseh)
add_subdirectory(recyclebin)
add_subdirectory(rossym)
Added: branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/ppcmmu/CMakeL…
==============================================================================
--- branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt (added)
+++ branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49
2010
@@ -1,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})
Propchange: branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native