From 3d596d154ac17f1218944b69606549f669bb4190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Fri, 6 Mar 2015 00:31:01 +0000
Subject: [PATCH] Really fix build this time (otherwise that means my full
 clean builds are broken). Also remove that strange win32k dependency from
 ntdll (that appeared only via the headers inclusion, and nothing else).

svn path=/trunk/; revision=66578
---
 reactos/dll/cpl/console/CMakeLists.txt             | 4 ++--
 reactos/dll/ntdll/CMakeLists.txt                   | 3 +--
 reactos/win32ss/base/CMakeLists.txt                | 1 +
 reactos/win32ss/core/gdi/gdi32/CMakeLists.txt      | 2 +-
 reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt | 2 +-
 reactos/win32ss/core/user/user32/CMakeLists.txt    | 2 +-
 reactos/win32ss/core/user/winsrv/CMakeLists.txt    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/reactos/dll/cpl/console/CMakeLists.txt b/reactos/dll/cpl/console/CMakeLists.txt
index c65229af0f8..809a6baf6a2 100644
--- a/reactos/dll/cpl/console/CMakeLists.txt
+++ b/reactos/dll/cpl/console/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 include_directories(
-    ${REACTOS_SOURCE_DIR}/win32ss/user/winsrv/consrv
-    ${REACTOS_SOURCE_DIR}/win32ss/user/winsrv/consrv/frontends/gui)
+    ${REACTOS_SOURCE_DIR}/win32ss/core/user/winsrv/consrv
+    ${REACTOS_SOURCE_DIR}/win32ss/core/user/winsrv/consrv/frontends/gui)
 
 spec2def(console.dll console.spec)
 
diff --git a/reactos/dll/ntdll/CMakeLists.txt b/reactos/dll/ntdll/CMakeLists.txt
index 982e260f57e..038d786ba08 100644
--- a/reactos/dll/ntdll/CMakeLists.txt
+++ b/reactos/dll/ntdll/CMakeLists.txt
@@ -8,8 +8,7 @@ add_definitions(
 
 include_directories(
     BEFORE include
-    ${REACTOS_SOURCE_DIR}/include/reactos/subsys
-    ${REACTOS_SOURCE_DIR}/win32ss/include)
+    ${REACTOS_SOURCE_DIR}/include/reactos/subsys)
 
 list(APPEND SOURCE
     csr/api.c
diff --git a/reactos/win32ss/base/CMakeLists.txt b/reactos/win32ss/base/CMakeLists.txt
index 70efe77cfd7..170794f3001 100644
--- a/reactos/win32ss/base/CMakeLists.txt
+++ b/reactos/win32ss/base/CMakeLists.txt
@@ -3,3 +3,4 @@ add_subdirectory(advapi32)
 add_subdirectory(basesrv)
 add_subdirectory(kernel32)
 add_subdirectory(kernel32_vista)
+add_subdirectory(scm)
diff --git a/reactos/win32ss/core/gdi/gdi32/CMakeLists.txt b/reactos/win32ss/core/gdi/gdi32/CMakeLists.txt
index 796b50d658c..d10f7c5af4e 100644
--- a/reactos/win32ss/core/gdi/gdi32/CMakeLists.txt
+++ b/reactos/win32ss/core/gdi/gdi32/CMakeLists.txt
@@ -5,7 +5,7 @@ add_definitions(-DLANGPACK)
 
 include_directories(
     include
-    ${REACTOS_SOURCE_DIR}/win32ss/include)
+    ${REACTOS_SOURCE_DIR}/win32ss/core/include)
 
 add_definitions(-DLANGPACK)
 spec2def(gdi32.dll gdi32.spec ADD_IMPORTLIB)
diff --git a/reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt b/reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt
index 040e6a4607a..892555c992e 100644
--- a/reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt
+++ b/reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/wine
-    ${REACTOS_SOURCE_DIR}/win32ss/include
+    ${REACTOS_SOURCE_DIR}/win32ss/core/include
     ../include
     .)
 
diff --git a/reactos/win32ss/core/user/user32/CMakeLists.txt b/reactos/win32ss/core/user/user32/CMakeLists.txt
index 409d325255a..c74e0db3a1f 100644
--- a/reactos/win32ss/core/user/user32/CMakeLists.txt
+++ b/reactos/win32ss/core/user/user32/CMakeLists.txt
@@ -4,7 +4,7 @@ spec2def(user32.dll user32.spec ADD_IMPORTLIB)
 include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/subsys
     include
-    ${REACTOS_SOURCE_DIR}/win32ss/include)
+    ${REACTOS_SOURCE_DIR}/win32ss/core/include)
 
 list(APPEND SOURCE
     controls/appswitch.c
diff --git a/reactos/win32ss/core/user/winsrv/CMakeLists.txt b/reactos/win32ss/core/user/winsrv/CMakeLists.txt
index 1444c839737..67af25e8104 100644
--- a/reactos/win32ss/core/user/winsrv/CMakeLists.txt
+++ b/reactos/win32ss/core/user/winsrv/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/subsys
-    ${REACTOS_SOURCE_DIR}/win32ss/include)
+    ${REACTOS_SOURCE_DIR}/win32ss/core/include)
 
 spec2def(winsrv.dll winsrv.spec)