[CMAKE]

  - improve cacls build file
  - add control and extrac32 to build

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

diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt
index 38b3f41..e547be5 100644 (file)
--- a/base/applications/CMakeLists.txt
+++ b/base/applications/CMakeLists.txt
@@ -3,9 +3,9 @@ add_subdirectory(cacls)
 add_subdirectory(calc)
 add_subdirectory(charmap)
 add_subdirectory(cmdutils)
-#add_subdirectory(control)
+add_subdirectory(control)
 #add_subdirectory(dxdiag)
-#add_subdirectory(extrac32)
+add_subdirectory(extrac32)
 #add_subdirectory(fontview)
 #add_subdirectory(games)
 #add_subdirectory(hh)

diff --git a/base/applications/cacls/CMakeLists.txt b/base/applications/cacls/CMakeLists.txt
index 9b7f17e..0d09c6b 100644 (file)
--- a/base/applications/cacls/CMakeLists.txt
+++ b/base/applications/cacls/CMakeLists.txt
@@ -1,12 +1,16 @@
 
-add_executable(cacls 
+list(APPEND SOURCE
     cacls.c
     cacls.rc)
 
-set_module_type(cacls win32cui)
+add_executable(cacls
+    ${CMAKE_CURRENT_BINARY_DIR}/cacls_precomp.h.gch
+    ${SOURCE})
+
+add_pch(cacls ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 set_unicode(cacls yes)
 
-add_importlibs(cacls advapi32 ntdll user32 shell32 msvcrt)
+set_module_type(cacls win32cui)
 
-add_dependencies(cacls psdk)
+add_importlibs(cacls advapi32 ntdll user32 shell32 msvcrt)
\ No newline at end of file

diff --git a/base/applications/control/CMakeLists.txt b/base/applications/control/CMakeLists.txt
new file mode 100644 (file)
index 0000000..6e4a2db
--- /dev/null
+++ b/base/applications/control/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+add_executable(control
+    control.c
+    control.rc)
+
+set_unicode(control yes)
+
+set_module_type(control win32gui)
+
+add_importlibs(control advapi32 shell32 kernel32 msvcrt)
\ No newline at end of file

diff --git a/base/applications/extrac32/CMakeLists.txt b/base/applications/extrac32/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f760e7b
--- /dev/null
+++ b/base/applications/extrac32/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+add_executable(extrac32 extrac32.c)
+
+set_unicode(extrac32 yes)
+
+set_module_type(extrac32 win32gui)
+
+target_link_libraries(extrac32 wine)
+
+add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt)
\ No newline at end of file

diff --git a/importlibs/libsetupapi.a b/importlibs/libsetupapi.a
new file mode 100644 (file)
index 0000000..a7e4e79
Binary files /dev/null and b/importlibs/libsetupapi.a differ

diff --git a/importlibs/libshlwapi.a b/importlibs/libshlwapi.a
new file mode 100644 (file)
index 0000000..44c3623
Binary files /dev/null and b/importlibs/libshlwapi.a differ