From 0c577da443bdd2c6b09cdcb2fcab684cfc802d73 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 10 Aug 2011 22:40:12 +0000 Subject: [PATCH] [WS2_32_NEW][WS2HELP] * Add PCHs. svn path=/trunk/; revision=53168 --- reactos/dll/win32/ws2_32_new/CMakeLists.txt | 4 ++-- reactos/dll/win32/ws2_32_new/inc/ws2_32.h | 4 ++-- reactos/dll/win32/ws2_32_new/src/getxbyxx.c | 1 - reactos/dll/win32/ws2_32_new/ws2_32.rbuild | 3 +++ reactos/dll/win32/ws2help/CMakeLists.txt | 2 +- reactos/dll/win32/ws2help/precomp.h | 2 +- reactos/dll/win32/ws2help/ws2help.rbuild | 1 + 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/reactos/dll/win32/ws2_32_new/CMakeLists.txt b/reactos/dll/win32/ws2_32_new/CMakeLists.txt index 5999316ca9a..e8634301f58 100644 --- a/reactos/dll/win32/ws2_32_new/CMakeLists.txt +++ b/reactos/dll/win32/ws2_32_new/CMakeLists.txt @@ -48,8 +48,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def) add_library(ws2_32_new SHARED ${SOURCE}) - set_module_type(ws2_32_new win32dll) -target_link_libraries(ws2_32_new wine) add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) +add_pch(ws2_32_new inc/ws2_32.h) +target_link_libraries(ws2_32_new wine) add_cd_file(TARGET ws2_32_new DESTINATION reactos/system32 FOR all) diff --git a/reactos/dll/win32/ws2_32_new/inc/ws2_32.h b/reactos/dll/win32/ws2_32_new/inc/ws2_32.h index 35cbb5bd542..e680d3a8502 100644 --- a/reactos/dll/win32/ws2_32_new/inc/ws2_32.h +++ b/reactos/dll/win32/ws2_32_new/inc/ws2_32.h @@ -5,8 +5,6 @@ * PURPOSE: WinSock 2.2 Main Header */ -#pragma once - /* Definitions for NDK Usage */ #define WIN32_NO_STATUS //#define _WIN32_WINNT 0x502 @@ -28,6 +26,8 @@ /* Winsock Helper Header */ #include +#include + /* Missing definitions */ #define SO_OPENTYPE 0x7008 #define SO_SYNCHRONOUS_NONALERT 0x20 diff --git a/reactos/dll/win32/ws2_32_new/src/getxbyxx.c b/reactos/dll/win32/ws2_32_new/src/getxbyxx.c index 53489e07d24..eae2f24345b 100644 --- a/reactos/dll/win32/ws2_32_new/src/getxbyxx.c +++ b/reactos/dll/win32/ws2_32_new/src/getxbyxx.c @@ -8,7 +8,6 @@ /* INCLUDES ******************************************************************/ #include "ws2_32.h" -#include //#define NDEBUG #include diff --git a/reactos/dll/win32/ws2_32_new/ws2_32.rbuild b/reactos/dll/win32/ws2_32_new/ws2_32.rbuild index 2fee79c1a9e..58aa1b294fa 100644 --- a/reactos/dll/win32/ws2_32_new/ws2_32.rbuild +++ b/reactos/dll/win32/ws2_32_new/ws2_32.rbuild @@ -9,6 +9,9 @@ advapi32 dnsapi ws2help + + ws2_32.h + addrconv.c addrinfo.c diff --git a/reactos/dll/win32/ws2help/CMakeLists.txt b/reactos/dll/win32/ws2help/CMakeLists.txt index 6de001c474c..52c5e9ed9a9 100644 --- a/reactos/dll/win32/ws2help/CMakeLists.txt +++ b/reactos/dll/win32/ws2help/CMakeLists.txt @@ -12,8 +12,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def) add_library(ws2help SHARED ${SOURCE}) - set_module_type(ws2help win32dll) add_importlibs(ws2help advapi32 ws2_32 msvcrt kernel32 ntdll) +add_pch(ws2help precomp.h) add_cd_file(TARGET ws2help DESTINATION reactos/system32 FOR all) add_importlib_target(ws2help.spec) diff --git a/reactos/dll/win32/ws2help/precomp.h b/reactos/dll/win32/ws2help/precomp.h index ce5f0f83b23..85fdef32407 100644 --- a/reactos/dll/win32/ws2help/precomp.h +++ b/reactos/dll/win32/ws2help/precomp.h @@ -20,7 +20,7 @@ /* Shared Winsock Helper headers */ #include -#include +#include "wshdrv.h" /* Missing definition */ #define SO_OPENTYPE 0x20 diff --git a/reactos/dll/win32/ws2help/ws2help.rbuild b/reactos/dll/win32/ws2help/ws2help.rbuild index 045c924e7ff..8f6180d6971 100644 --- a/reactos/dll/win32/ws2help/ws2help.rbuild +++ b/reactos/dll/win32/ws2help/ws2help.rbuild @@ -11,4 +11,5 @@ handle.c notify.c ws2help.rc + precomp.h