X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=reactos%2Fwin32ss%2FCMakeLists.txt;h=b4b9cfaa7603d6f1de7450db01d6381c180fe357;hp=cbed7b8590546f1bffe7c95be9e0528abc438e5b;hb=a681850f566e98a25821ded8ba10c377da98a389;hpb=594e534dd0793191cc4371ab08e719417e8cd9ae

diff --git a/reactos/win32ss/CMakeLists.txt b/reactos/win32ss/CMakeLists.txt
index cbed7b85905..b4b9cfaa760 100644
--- a/reactos/win32ss/CMakeLists.txt
+++ b/reactos/win32ss/CMakeLists.txt
@@ -1,6 +1,10 @@
 
 set(USE_DIBLIB FALSE)
-set(USE_NEW_CURSORICON TRUE)
+
+if(NOT MSVC)
+    # HACK: this should be enabled globally!
+    add_compile_flags_language("-std=c++11" "CXX")
+endif()
 
 # Give WIN32 subsystem its own project.
 PROJECT(WIN32SS)
@@ -11,10 +15,6 @@ if(USE_DIBLIB)
     add_subdirectory(gdi/diblib)
 endif()
 
-if(USE_NEW_CURSORICON)
-    add_definitions(-DNEW_CURSORICON)
-endif()
-
 add_subdirectory(gdi/gdi32)
 add_subdirectory(reactx)
 add_subdirectory(user/user32)
@@ -105,7 +105,10 @@ list(APPEND SOURCE
     user/ntuser/caret.c
     user/ntuser/class.c
     user/ntuser/clipboard.c
+    user/ntuser/console.c
     user/ntuser/csr.c
+    user/ntuser/cursoricon.c
+    user/ntuser/dde.c
     user/ntuser/defwnd.c
     user/ntuser/desktop.c
     user/ntuser/display.c
@@ -119,6 +122,7 @@ list(APPEND SOURCE
     user/ntuser/ime.c
     user/ntuser/keyboard.c
     user/ntuser/kbdlayout.c
+    user/ntuser/layered.c
     user/ntuser/menu.c
     user/ntuser/message.c
     user/ntuser/metric.c
@@ -126,11 +130,13 @@ list(APPEND SOURCE
     user/ntuser/monitor.c
     user/ntuser/mouse.c
     user/ntuser/msgqueue.c
+    user/ntuser/nonclient.c
     user/ntuser/ntstubs.c
     user/ntuser/ntuser.c
     user/ntuser/painting.c
     user/ntuser/prop.c
     user/ntuser/scrollbar.c
+    user/ntuser/scrollex.c
     user/ntuser/session.c
     user/ntuser/shutdown.c
     user/ntuser/simplecall.c
@@ -144,11 +150,11 @@ list(APPEND SOURCE
     user/ntuser/winpos.c
     user/ntuser/winsta.c
     user/ntuser/object.c
+    user/rtl/text.c
     gdi/ntgdi/arc.c
     gdi/ntgdi/bezier.c
     gdi/ntgdi/bitblt.c
     gdi/ntgdi/bitmaps.c
-    gdi/ntgdi/brush.c
     gdi/ntgdi/cliprgn.c
     gdi/ntgdi/coord.c
     gdi/ntgdi/dcattr.c
@@ -167,6 +173,7 @@ list(APPEND SOURCE
     gdi/ntgdi/gdiobj.c
     gdi/ntgdi/gdipool.c
     gdi/ntgdi/icm.c
+    gdi/ntgdi/init.c
     gdi/ntgdi/line.c
     gdi/ntgdi/metafile.c
     gdi/ntgdi/palette.c
@@ -196,12 +203,6 @@ else()
         ${GENDIB_FILES})
 endif()
 
-if(USE_NEW_CURSORICON)
-    list(APPEND SOURCE user/ntuser/cursoricon_new.c)
-else()
-    list(APPEND SOURCE user/ntuser/cursoricon.c)
-endif()
-
 if(ARCH STREQUAL "i386")
 list(APPEND ASM_SOURCE
     gdi/dib/i386/dib24bpp_hline.s
@@ -222,6 +223,7 @@ add_asm_files(win32k_asm ${ASM_SOURCE})
 
 add_library(win32k SHARED
     ${SOURCE}
+    gdi/ntgdi/brush.cpp
     ${win32k_asm}
     win32k.rc
     ${CMAKE_CURRENT_BINARY_DIR}/win32k.def)