[ros-diffs] [hbelusca] 66578: 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 inclus...

Author: hbelusca
Date: Fri Mar  6 00:31:01 2015
New Revision: 66578

URL: http://svn.reactos.org/svn/reactos?rev=66578&view=rev
Log:
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).

Modified:
    trunk/reactos/dll/cpl/console/CMakeLists.txt
    trunk/reactos/dll/ntdll/CMakeLists.txt
    trunk/reactos/win32ss/base/CMakeLists.txt
    trunk/reactos/win32ss/core/gdi/gdi32/CMakeLists.txt
    trunk/reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt
    trunk/reactos/win32ss/core/user/user32/CMakeLists.txt
    trunk/reactos/win32ss/core/user/winsrv/CMakeLists.txt

Modified: trunk/reactos/dll/cpl/console/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/CMakeLists....
==============================================================================
--- trunk/reactos/dll/cpl/console/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/console/CMakeLists.txt	[iso-8859-1] Fri Mar  6 00:31:01 2015
@@ -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)

Modified: trunk/reactos/dll/ntdll/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?re...
==============================================================================
--- trunk/reactos/dll/ntdll/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/CMakeLists.txt	[iso-8859-1] Fri Mar  6 00:31:01 2015
@@ -8,8 +8,7 @@

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

Modified: trunk/reactos/win32ss/base/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/base/CMakeLists.txt...
==============================================================================
--- trunk/reactos/win32ss/base/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/base/CMakeLists.txt	[iso-8859-1] Fri Mar  6 00:31:01 2015
@@ -3,3 +3,4 @@
 add_subdirectory(basesrv)
 add_subdirectory(kernel32)
 add_subdirectory(kernel32_vista)
+add_subdirectory(scm)

Modified: trunk/reactos/win32ss/core/gdi/gdi32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/core/gdi/gdi32/CMak...
==============================================================================
--- trunk/reactos/win32ss/core/gdi/gdi32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/core/gdi/gdi32/CMakeLists.txt	[iso-8859-1] Fri Mar  6 00:31:01 2015
@@ -5,7 +5,7 @@

include_directories(
     include
-    ${REACTOS_SOURCE_DIR}/win32ss/include)
+    ${REACTOS_SOURCE_DIR}/win32ss/core/include)

add_definitions(-DLANGPACK)
 spec2def(gdi32.dll gdi32.spec ADD_IMPORTLIB)

Modified: trunk/reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/core/gdi/gdi32/wine...
==============================================================================
--- trunk/reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt	[iso-8859-1] Fri Mar  6 00:31:01 2015
@@ -1,7 +1,7 @@

include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/wine
-    ${REACTOS_SOURCE_DIR}/win32ss/include
+    ${REACTOS_SOURCE_DIR}/win32ss/core/include
     ../include
     .)

Modified: trunk/reactos/win32ss/core/user/user32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/core/user/user32/CM...
==============================================================================
--- trunk/reactos/win32ss/core/user/user32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/core/user/user32/CMakeLists.txt	[iso-8859-1] Fri Mar  6 00:31:01 2015
@@ -4,7 +4,7 @@
 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

Modified: trunk/reactos/win32ss/core/user/winsrv/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/core/user/winsrv/CM...
==============================================================================
--- trunk/reactos/win32ss/core/user/winsrv/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/core/user/winsrv/CMakeLists.txt	[iso-8859-1] Fri Mar  6 00:31:01 2015
@@ -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)