From 76d63856afe3ee8827ae9642fb9511a2eed7822d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 11 Aug 2011 15:14:25 +0000 Subject: [PATCH] [MSVCRT] * Improve the PCH. svn path=/trunk/; revision=53184 --- reactos/dll/win32/msvcrt/CMakeLists.txt | 13 +++++-------- reactos/dll/win32/msvcrt/dllmain.c | 4 ---- reactos/dll/win32/msvcrt/precomp.h | 6 ++++++ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/reactos/dll/win32/msvcrt/CMakeLists.txt b/reactos/dll/win32/msvcrt/CMakeLists.txt index 20af9d7a2bf..a6ac9c8e372 100644 --- a/reactos/dll/win32/msvcrt/CMakeLists.txt +++ b/reactos/dll/win32/msvcrt/CMakeLists.txt @@ -23,24 +23,21 @@ list(APPEND SOURCE add_library(msvcrt SHARED ${SOURCE}) -if (NOT MSVC) -set_target_properties(msvcrt PROPERTIES LINK_FLAGS "-u __seh_longjmp_unwind@4") +if(NOT MSVC) + set_target_properties(msvcrt PROPERTIES LINK_FLAGS "-u __seh_longjmp_unwind@4") endif() add_dependencies(msvcrt psdk) set_entrypoint(msvcrt DllMain@12) set_image_base(msvcrt ${baseaddress_msvcrt}) -target_link_libraries(msvcrt - crt - wine) +target_link_libraries(msvcrt crt wine) if(NOT MSVC) - target_link_libraries(msvcrt pseh) + target_link_libraries(msvcrt pseh) endif() -add_pch(msvcrt precomp.h) add_importlibs(msvcrt kernel32 ntdll) +add_pch(msvcrt precomp.h) add_cd_file(TARGET msvcrt DESTINATION reactos/system32 FOR all) add_importlib_target(msvcrt.spec) - diff --git a/reactos/dll/win32/msvcrt/dllmain.c b/reactos/dll/win32/msvcrt/dllmain.c index 95efb2bbb96..ec7b2987963 100644 --- a/reactos/dll/win32/msvcrt/dllmain.c +++ b/reactos/dll/win32/msvcrt/dllmain.c @@ -21,11 +21,7 @@ */ #include -#include -#include -#include -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* EXTERNAL PROTOTYPES ********************************************************/ diff --git a/reactos/dll/win32/msvcrt/precomp.h b/reactos/dll/win32/msvcrt/precomp.h index acfc877e21c..564bd90cce4 100644 --- a/reactos/dll/win32/msvcrt/precomp.h +++ b/reactos/dll/win32/msvcrt/precomp.h @@ -6,4 +6,10 @@ #include #include +#include +#include +#include + +#include "wine/debug.h" + #endif /* _CRT_PRECOMP_H */