Author: jgardou
Date: Sat Sep 25 15:31:18 2010
New Revision: 48875
URL: http://svn.reactos.org/svn/reactos?rev=48875&view=rev
Log:
[CMAKE]
- improve cacls build file
- add charmap, dbgprint, doskey, find, hostname, lodctr, more, reg and xcopy
build files
- add win32cui module type to msc toolchain
find is commented out for now.
Added:
branches/cmake-bringup/base/applications/charmap/CMakeLists.txt (with
props)
branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt
(with props)
branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt
(with props)
branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt
(with props)
branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt
(with props)
branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt
(with props)
branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt
(with props)
branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt
(with props)
branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt
(with props)
branches/cmake-bringup/importlibs/libloadperf.a (with props)
Modified:
branches/cmake-bringup/base/applications/CMakeLists.txt
branches/cmake-bringup/base/applications/cacls/CMakeLists.txt
branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt
branches/cmake-bringup/msc.cmake
Modified: branches/cmake-bringup/base/applications/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/CMakeLists.txt?rev=48875&r1=48874&r2=48875&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] Sat
Sep 25 15:31:18 2010
@@ -1,8 +1,8 @@
add_subdirectory(cacls)
add_subdirectory(calc)
-#add_subdirectory(charmap)
-#add_subdirectory(cmdutils)
+add_subdirectory(charmap)
+add_subdirectory(cmdutils)
#add_subdirectory(control)
#add_subdirectory(dxdiag)
#add_subdirectory(extrac32)
Modified: branches/cmake-bringup/base/applications/cacls/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/cacls/CMakeLists.txt?rev=48875&r1=48874&r2=48875&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1]
Sat Sep 25 15:31:18 2010
@@ -1,5 +1,3 @@
-
-add_definitions(-DUNICODE -D_UNICODE)
add_executable(cacls
cacls.c
@@ -7,6 +5,8 @@
set_module_type(cacls win32cui)
+set_unicode(cacls yes)
+
add_importlibs(cacls advapi32 ntdll user32 shell32 msvcrt)
add_dependencies(cacls psdk)
Added: branches/cmake-bringup/base/applications/charmap/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/charmap/CMakeLists.txt?rev=48875&view=auto
==============================================================================
--- branches/cmake-bringup/base/applications/charmap/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/applications/charmap/CMakeLists.txt
[iso-8859-1] Sat Sep 25 15:31:18 2010
@@ -1,0 +1,19 @@
+
+list(APPEND SOURCE
+ about.c
+ charmap.c
+ lrgcell.c
+ map.c
+ charmap.rc)
+
+add_executable(charmap
+ ${CMAKE_CURRENT_BINARY_DIR}/charmap_precomp.h.gch
+ ${SOURCE})
+
+add_pch(charmap ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
+
+set_unicode(charmap yes)
+
+set_module_type(charmap win32gui)
+
+add_importlibs(charmap user32 gdi32 comctl32 msvcrt)
Propchange: branches/cmake-bringup/base/applications/charmap/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt?rev=48875&r1=48874&r2=48875&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt
[iso-8859-1] Sat Sep 25 15:31:18 2010
@@ -1,9 +1,8 @@
-
-#add_subdirectory(dbgprint)
-#add_subdirectory(doskey)
+add_subdirectory(dbgprint)
+add_subdirectory(doskey)
#add_subdirectory(find)
-#add_subdirectory(hostname)
-#add_subdirectory(lodctr)
-#add_subdirectory(more)
-#add_subdirectory(reg)
-#add_subdirectory(xcopy)
+add_subdirectory(hostname)
+add_subdirectory(lodctr)
+add_subdirectory(more)
+add_subdirectory(reg)
+add_subdirectory(xcopy)
Added: branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt?rev=48875&view=auto
==============================================================================
--- branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt
(added)
+++ branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt
[iso-8859-1] Sat Sep 25 15:31:18 2010
@@ -1,0 +1,7 @@
+add_executable(dbgprint dbgprint.c)
+
+set_module_type(dbgprint win32cui)
+
+set_unicode(dbgprint no)
+
+add_importlibs(dbgprint msvcrt)
Propchange:
branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt?rev=48875&view=auto
==============================================================================
--- branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt
(added)
+++ branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt
[iso-8859-1] Sat Sep 25 15:31:18 2010
@@ -1,0 +1,9 @@
+add_executable(doskey
+ doskey.c
+ doskey.rc)
+
+set_module_type(doskey win32cui)
+
+set_unicode(doskey yes)
+
+add_importlibs(doskey user32 msvcrt)
Propchange:
branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt?rev=48875&view=auto
==============================================================================
--- branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt
(added)
+++ branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt
[iso-8859-1] Sat Sep 25 15:31:18 2010
@@ -1,0 +1,9 @@
+add_executable(find
+ find.c
+ find.rc)
+
+set_module_type(find win32cui)
+
+set_unicode(find no)
+
+add_importlibs(find user32 msvcrt)
Propchange:
branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt?rev=48875&view=auto
==============================================================================
--- branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt
(added)
+++ branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt
[iso-8859-1] Sat Sep 25 15:31:18 2010
@@ -1,0 +1,9 @@
+add_executable(hostname
+ hostname.c
+ hostname.rc)
+
+set_module_type(hostname win32cui)
+
+set_unicode(hostname no)
+
+add_importlibs(hostname msvcrt)
Propchange:
branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt?rev=48875&view=auto
==============================================================================
--- branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt
(added)
+++ branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt
[iso-8859-1] Sat Sep 25 15:31:18 2010
@@ -1,0 +1,7 @@
+add_executable(lodctr lodctr_main.c)
+
+set_module_type(lodctr win32cui)
+
+set_unicode(lodctr yes)
+
+add_importlibs(lodctr loadperf msvcrt)
Propchange:
branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt?rev=48875&view=auto
==============================================================================
--- branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt
(added)
+++ branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt
[iso-8859-1] Sat Sep 25 15:31:18 2010
@@ -1,0 +1,9 @@
+add_executable(more
+ more.c
+ more.rc)
+
+set_module_type(more win32cui)
+
+set_unicode(more no)
+
+add_importlibs(more ntdll user32 msvcrt)
Propchange:
branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt?rev=48875&view=auto
==============================================================================
--- branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt
[iso-8859-1] Sat Sep 25 15:31:18 2010
@@ -1,0 +1,11 @@
+add_definitions(-D_WIN32_WINNT=0x600)
+
+add_executable(reg
+ reg.c
+ rsrc.rc)
+
+set_module_type(reg win32cui)
+
+set_unicode(reg yes)
+
+add_importlibs(reg advapi32 user32 msvcrt)
Propchange: branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt?rev=48875&view=auto
==============================================================================
--- branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt
(added)
+++ branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt
[iso-8859-1] Sat Sep 25 15:31:18 2010
@@ -1,0 +1,11 @@
+add_executable(xcopy
+ xcopy.c
+ rsrc.rc)
+
+set_module_type(xcopy win32cui)
+
+set_unicode(xcopy yes)
+
+add_importlibs(xcopy shell32 user32 msvcrt)
+
+target_link_libraries(xcopy wine)
Propchange:
branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: branches/cmake-bringup/importlibs/libloadperf.a
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libloadperf.a?rev=48875&view=auto
==============================================================================
Binary file - no diff available.
Propchange: branches/cmake-bringup/importlibs/libloadperf.a
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: branches/cmake-bringup/msc.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=48875&r1=48874&r2=48875&view=diff
==============================================================================
--- branches/cmake-bringup/msc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sat Sep 25 15:31:18 2010
@@ -36,6 +36,10 @@
if (${TYPE} MATCHES win32gui)
set_subsystem(${MODULE} windows)
endif ()
+ if (${TYPE} MATCHES win32cui)
+ set_subsystem(${MODULE} windows)
+ set_entrypoint(${MODULE} mainCRTStartup)
+ endif ()
endmacro()
endif()
