[CMAKE]

  - Add win32cui module type to gcc toolchain
  - Add cacls to build

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

diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt
index d8308db..5db98b4 100644 (file)
--- a/base/applications/CMakeLists.txt
+++ b/base/applications/CMakeLists.txt
@@ -1,5 +1,5 @@
 
 

-#add_subdirectory(cacls)
+add_subdirectory(cacls)

 add_subdirectory(calc)
 #add_subdirectory(charmap)
 #add_subdirectory(cmdutils)
 add_subdirectory(calc)
 #add_subdirectory(charmap)
 #add_subdirectory(cmdutils)

diff --git a/base/applications/cacls/CMakeLists.txt b/base/applications/cacls/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0358e34
--- /dev/null
+++ b/base/applications/cacls/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+add_definitions(-DUNICODE -D_UNICODE)
+
+add_executable(cacls 
+    cacls.c
+    cacls.rc)
+
+set_module_type(cacls win32cui)
+
+add_importlibs(cacls advapi32 ntdll user32 shell32 msvcrt)
+
+add_dependencies(cacls psdk)

diff --git a/gcc.cmake b/gcc.cmake
index 267ec93..700cf87 100644 (file)
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -57,6 +57,10 @@ macro(set_module_type MODULE TYPE)
     set_subsystem(${MODULE} windows)\r
     set_entrypoint(${MODULE} wWinMainCRTStartup)\r
   endif()\r
     set_subsystem(${MODULE} windows)\r
     set_entrypoint(${MODULE} wWinMainCRTStartup)\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
 endmacro()\r
 \r
 endif()\r