From b82a314189143eaddef5c463b91fafe6af88f540 Mon Sep 17 00:00:00 2001
From: Daniel Reimer <reimer.daniel@freenet.de>
Date: Sat, 25 Apr 2015 17:41:44 +0000
Subject: [PATCH] [ROSAPPS] Add part of missing sysutils folder and needed
 win32err lib to build.

svn path=/trunk/; revision=67421
---
 rosapps/CMakeLists.txt                               | 2 +-
 rosapps/applications/sysutils/CMakeLists.txt         | 6 +++---
 rosapps/applications/sysutils/chkdsk/CMakeLists.txt  | 7 +++++++
 rosapps/applications/sysutils/chkdsk/chkdsk.c        | 4 ++--
 rosapps/applications/sysutils/chklib/CMakeLists.txt  | 6 ++++++
 rosapps/applications/sysutils/chklib/chklib.c        | 2 +-
 rosapps/applications/sysutils/gettype/CMakeLists.txt | 5 +++++
 rosapps/lib/CMakeLists.txt                           | 1 +
 rosapps/lib/win32err/CMakeLists.txt                  | 3 +++
 9 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 rosapps/applications/sysutils/chkdsk/CMakeLists.txt
 create mode 100644 rosapps/applications/sysutils/chklib/CMakeLists.txt
 create mode 100644 rosapps/applications/sysutils/gettype/CMakeLists.txt
 create mode 100644 rosapps/lib/CMakeLists.txt
 create mode 100644 rosapps/lib/win32err/CMakeLists.txt

diff --git a/rosapps/CMakeLists.txt b/rosapps/CMakeLists.txt
index 1ef8103909a..9010ab6b0a6 100644
--- a/rosapps/CMakeLists.txt
+++ b/rosapps/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_subdirectory(applications)
 add_subdirectory(demos)
 add_subdirectory(drivers)
-# add_subdirectory(lib)
+add_subdirectory(lib)
diff --git a/rosapps/applications/sysutils/CMakeLists.txt b/rosapps/applications/sysutils/CMakeLists.txt
index f93dfdd66ae..b3b800dc8fd 100644
--- a/rosapps/applications/sysutils/CMakeLists.txt
+++ b/rosapps/applications/sysutils/CMakeLists.txt
@@ -1,7 +1,7 @@
-#add_subdirectory(chkdsk)
-#add_subdirectory(chklib)
+add_subdirectory(chkdsk)
+add_subdirectory(chklib)
 add_subdirectory(ctm)
-#add_subdirectory(gettype)
+add_subdirectory(gettype)
 add_subdirectory(kill)
 #add_subdirectory(logevent)
 #add_subdirectory(lsdd)
diff --git a/rosapps/applications/sysutils/chkdsk/CMakeLists.txt b/rosapps/applications/sysutils/chkdsk/CMakeLists.txt
new file mode 100644
index 00000000000..4e7221b1a6c
--- /dev/null
+++ b/rosapps/applications/sysutils/chkdsk/CMakeLists.txt
@@ -0,0 +1,7 @@
+
+add_executable(chkdsk chkdsk.c chkdsk.rc)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fmifs)
+set_module_type(chkdsk win32cui UNICODE)
+target_link_libraries(chkdsk win32err)
+add_importlibs(chkdsk fmifs msvcrt kernel32 ntdll)
+add_cd_file(TARGET chkdsk DESTINATION reactos/system32 FOR all)
diff --git a/rosapps/applications/sysutils/chkdsk/chkdsk.c b/rosapps/applications/sysutils/chkdsk/chkdsk.c
index c81a2045a11..d037761a0de 100644
--- a/rosapps/applications/sysutils/chkdsk/chkdsk.c
+++ b/rosapps/applications/sysutils/chkdsk/chkdsk.c
@@ -46,8 +46,8 @@
 #include <fmifs/fmifs.h>
 #define _UNICODE 1
 #include <tchar.h>
-#include "config.h"
-#include "win32err.h"
+#include "../config.h"
+#include "../win32err.h"
 
 //
 // Globals
diff --git a/rosapps/applications/sysutils/chklib/CMakeLists.txt b/rosapps/applications/sysutils/chklib/CMakeLists.txt
new file mode 100644
index 00000000000..059e6588412
--- /dev/null
+++ b/rosapps/applications/sysutils/chklib/CMakeLists.txt
@@ -0,0 +1,6 @@
+
+add_executable(chklib chklib.c chklib.rc)
+set_module_type(chklib win32cui)
+target_link_libraries(chklib win32err)
+add_importlibs(chklib msvcrt kernel32)
+add_cd_file(TARGET chklib DESTINATION reactos/system32 FOR all)
diff --git a/rosapps/applications/sysutils/chklib/chklib.c b/rosapps/applications/sysutils/chklib/chklib.c
index f5d25f4c7e5..e100e5edeb8 100644
--- a/rosapps/applications/sysutils/chklib/chklib.c
+++ b/rosapps/applications/sysutils/chklib/chklib.c
@@ -34,7 +34,7 @@
 #include <windef.h>
 #include <winbase.h>
 
-#include "win32err.h"
+#include "../win32err.h"
 
 #ifdef DISPLAY_VERSION
 static
diff --git a/rosapps/applications/sysutils/gettype/CMakeLists.txt b/rosapps/applications/sysutils/gettype/CMakeLists.txt
new file mode 100644
index 00000000000..83031d71291
--- /dev/null
+++ b/rosapps/applications/sysutils/gettype/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+add_executable(gettype gettype.c)
+set_module_type(gettype win32cui UNICODE)
+add_importlibs(gettype shell32 mpr netapi32 msvcrt kernel32)
+add_cd_file(TARGET gettype DESTINATION reactos/system32 FOR all)
diff --git a/rosapps/lib/CMakeLists.txt b/rosapps/lib/CMakeLists.txt
new file mode 100644
index 00000000000..0df7b79d950
--- /dev/null
+++ b/rosapps/lib/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(win32err)
diff --git a/rosapps/lib/win32err/CMakeLists.txt b/rosapps/lib/win32err/CMakeLists.txt
new file mode 100644
index 00000000000..548ec326f11
--- /dev/null
+++ b/rosapps/lib/win32err/CMakeLists.txt
@@ -0,0 +1,3 @@
+
+add_library(win32err win32err.c)
+add_dependencies(win32err psdk)