[CMAKE]
authorJérôme Gardou <jerome.gardou@reactos.org>
Sat, 25 Sep 2010 15:31:18 +0000 (15:31 +0000)
committerJérôme Gardou <jerome.gardou@reactos.org>
Sat, 25 Sep 2010 15:31:18 +0000 (15:31 +0000)
  - 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.

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

14 files changed:
base/applications/CMakeLists.txt
base/applications/cacls/CMakeLists.txt
base/applications/charmap/CMakeLists.txt [new file with mode: 0644]
base/applications/cmdutils/CMakeLists.txt
base/applications/cmdutils/dbgprint/CMakeLists.txt [new file with mode: 0644]
base/applications/cmdutils/doskey/CMakeLists.txt [new file with mode: 0644]
base/applications/cmdutils/find/CMakeLists.txt [new file with mode: 0644]
base/applications/cmdutils/hostname/CMakeLists.txt [new file with mode: 0644]
base/applications/cmdutils/lodctr/CMakeLists.txt [new file with mode: 0644]
base/applications/cmdutils/more/CMakeLists.txt [new file with mode: 0644]
base/applications/cmdutils/reg/CMakeLists.txt [new file with mode: 0644]
base/applications/cmdutils/xcopy/CMakeLists.txt [new file with mode: 0644]
importlibs/libloadperf.a [new file with mode: 0644]
msc.cmake

index 5db98b4..38b3f41 100644 (file)
@@ -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)
index 0358e34..9b7f17e 100644 (file)
@@ -1,12 +1,12 @@
 
-add_definitions(-DUNICODE -D_UNICODE)
-
 add_executable(cacls 
     cacls.c
     cacls.rc)
 
 set_module_type(cacls win32cui)
 
+set_unicode(cacls yes)
+
 add_importlibs(cacls advapi32 ntdll user32 shell32 msvcrt)
 
 add_dependencies(cacls psdk)
diff --git a/base/applications/charmap/CMakeLists.txt b/base/applications/charmap/CMakeLists.txt
new file mode 100644 (file)
index 0000000..e6f2253
--- /dev/null
@@ -0,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)
\ No newline at end of file
index 60cad46..4b218c3 100644 (file)
@@ -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)
diff --git a/base/applications/cmdutils/dbgprint/CMakeLists.txt b/base/applications/cmdutils/dbgprint/CMakeLists.txt
new file mode 100644 (file)
index 0000000..aef0a8b
--- /dev/null
@@ -0,0 +1,7 @@
+add_executable(dbgprint dbgprint.c)
+
+set_module_type(dbgprint win32cui)
+
+set_unicode(dbgprint no)
+
+add_importlibs(dbgprint msvcrt)
\ No newline at end of file
diff --git a/base/applications/cmdutils/doskey/CMakeLists.txt b/base/applications/cmdutils/doskey/CMakeLists.txt
new file mode 100644 (file)
index 0000000..4bedb26
--- /dev/null
@@ -0,0 +1,9 @@
+add_executable(doskey
+    doskey.c
+    doskey.rc)
+
+set_module_type(doskey win32cui)
+
+set_unicode(doskey yes)
+
+add_importlibs(doskey user32 msvcrt)
\ No newline at end of file
diff --git a/base/applications/cmdutils/find/CMakeLists.txt b/base/applications/cmdutils/find/CMakeLists.txt
new file mode 100644 (file)
index 0000000..c5e5e12
--- /dev/null
@@ -0,0 +1,9 @@
+add_executable(find
+    find.c
+    find.rc)
+
+set_module_type(find win32cui)
+
+set_unicode(find no)
+
+add_importlibs(find user32 msvcrt)
\ No newline at end of file
diff --git a/base/applications/cmdutils/hostname/CMakeLists.txt b/base/applications/cmdutils/hostname/CMakeLists.txt
new file mode 100644 (file)
index 0000000..80f4d8d
--- /dev/null
@@ -0,0 +1,9 @@
+add_executable(hostname
+    hostname.c
+    hostname.rc)
+
+set_module_type(hostname win32cui)
+
+set_unicode(hostname no)
+
+add_importlibs(hostname msvcrt)
\ No newline at end of file
diff --git a/base/applications/cmdutils/lodctr/CMakeLists.txt b/base/applications/cmdutils/lodctr/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b287b6c
--- /dev/null
@@ -0,0 +1,7 @@
+add_executable(lodctr lodctr_main.c)
+
+set_module_type(lodctr win32cui)
+
+set_unicode(lodctr yes)
+
+add_importlibs(lodctr loadperf msvcrt)
\ No newline at end of file
diff --git a/base/applications/cmdutils/more/CMakeLists.txt b/base/applications/cmdutils/more/CMakeLists.txt
new file mode 100644 (file)
index 0000000..e164073
--- /dev/null
@@ -0,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)
\ No newline at end of file
diff --git a/base/applications/cmdutils/reg/CMakeLists.txt b/base/applications/cmdutils/reg/CMakeLists.txt
new file mode 100644 (file)
index 0000000..1155560
--- /dev/null
@@ -0,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)
\ No newline at end of file
diff --git a/base/applications/cmdutils/xcopy/CMakeLists.txt b/base/applications/cmdutils/xcopy/CMakeLists.txt
new file mode 100644 (file)
index 0000000..895a26e
--- /dev/null
@@ -0,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)
\ No newline at end of file
diff --git a/importlibs/libloadperf.a b/importlibs/libloadperf.a
new file mode 100644 (file)
index 0000000..c8de1f8
Binary files /dev/null and b/importlibs/libloadperf.a differ
index f1941d7..2707098 100644 (file)
--- a/msc.cmake
+++ b/msc.cmake
@@ -36,6 +36,10 @@ macro(set_module_type MODULE TYPE)
   if (${TYPE} MATCHES win32gui)\r
     set_subsystem(${MODULE} windows)\r
   endif ()\r
+  if (${TYPE} MATCHES win32cui)\r
+    set_subsystem(${MODULE} windows)\r
+    set_entrypoint(${MODULE} mainCRTStartup)\r
+  endif ()\r
 endmacro()\r
 \r
 endif()\r