From f5731a41f8f8fa4b010eae682cd6fe04c36a0d70 Mon Sep 17 00:00:00 2001 From: Mark Jansen Date: Tue, 16 Apr 2019 22:39:36 +0200 Subject: [PATCH] [SHELL32] Use the same definitions for shell32 and it's static libs --- dll/win32/shell32/shelldesktop/CMakeLists.txt | 9 +++++++-- dll/win32/shell32/shellmenu/CMakeLists.txt | 7 +++++-- dll/win32/shell32/shellrecyclebin/CMakeLists.txt | 6 ++++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/shelldesktop/CMakeLists.txt b/dll/win32/shell32/shelldesktop/CMakeLists.txt index b1eb11f57e7..df1fc738425 100644 --- a/dll/win32/shell32/shelldesktop/CMakeLists.txt +++ b/dll/win32/shell32/shelldesktop/CMakeLists.txt @@ -1,7 +1,12 @@ - project(SHELL) + set_cpp(WITH_RUNTIME) -add_definitions(-DUNICODE -D_UNICODE) + +add_definitions( + -DUNICODE + -D_UNICODE + -D_ATL_NO_EXCEPTIONS) + include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) list(APPEND SOURCE diff --git a/dll/win32/shell32/shellmenu/CMakeLists.txt b/dll/win32/shell32/shellmenu/CMakeLists.txt index 7899b583527..ebca89a0226 100644 --- a/dll/win32/shell32/shellmenu/CMakeLists.txt +++ b/dll/win32/shell32/shellmenu/CMakeLists.txt @@ -1,8 +1,11 @@ -PROJECT(SHELL) +project(SHELL) set_cpp(WITH_RUNTIME) -add_definitions(-DUNICODE -D_UNICODE) +add_definitions( + -DUNICODE + -D_UNICODE + -D_ATL_NO_EXCEPTIONS) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) diff --git a/dll/win32/shell32/shellrecyclebin/CMakeLists.txt b/dll/win32/shell32/shellrecyclebin/CMakeLists.txt index 6a07441ec7e..5607bdbece2 100644 --- a/dll/win32/shell32/shellrecyclebin/CMakeLists.txt +++ b/dll/win32/shell32/shellrecyclebin/CMakeLists.txt @@ -1,3 +1,9 @@ +project(SHELL) + +add_definitions( + -DUNICODE + -D_UNICODE + -D_ATL_NO_EXCEPTIONS) list(APPEND SOURCE recyclebin.c -- 2.17.1