[IP][LWIP][TCPIP] Move ip and lwip libraries to drivers/network/tcpip

These libraries are used only inside tcpip.sys driver so move them close
to it.

drivers/network/tcpip/CMakeLists.txt

@@ -1,8 +1,6 @@
 
-include_directories(
+add_subdirectory(lwip)
-    BEFORE include
+add_subdirectory(ip)
-    ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/lwip/src/include
-    ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/lwip/src/include/ipv4)
 
 add_definitions(
     -DNDIS40
@@ -11,6 +9,7 @@ add_definitions(
 spec2def(tcpip.sys tcpip.spec)
 
 list(APPEND SOURCE
+    chew/workqueue.c
     datalink/lan.c
     tcpip/ainfo.c
     tcpip/buffer.c
@@ -33,7 +32,12 @@ add_library(tcpip MODULE
     tcpip.rc
     ${CMAKE_CURRENT_BINARY_DIR}/tcpip.def)
 
-target_link_libraries(tcpip ip lwip ${PSEH_LIB} chew)
+target_include_directories(tcpip BEFORE
+    PRIVATE include
+    PRIVATE lwip/src/include
+    PRIVATE lwip/src/include/ipv4)
+
+target_link_libraries(tcpip ip lwip ${PSEH_LIB})
 set_module_type(tcpip kernelmodedriver)
 add_importlibs(tcpip ndis ntoskrnl hal)
 add_pch(tcpip include/precomp.h SOURCE)

drivers/network/tcpip/chew/workqueue.c

@@ -7,11 +7,7 @@
  * PROGRAMMERS:     arty (ayerkes@speakeasy.net)
  */
 
-#include <ntddk.h>
+#include <wdm.h>
-#include <chew/chew.h>
-
-#define NDEBUG
-//#include <debug.h>
 
 #define FOURCC(w,x,y,z) (((w) << 24) | ((x) << 16) | ((y) << 8) | (z))
 #define CHEW_TAG FOURCC('C','H','E','W')

drivers/network/tcpip/include/precomp.h

@@ -16,7 +16,7 @@
 #include <lock.h>
 #include <interface.h>
 #include <fileobjs.h>
-#include <chew/chew.h>
+#include "chew.h"
 #include <pseh/pseh2.h>
 #include <psdk/ipexport.h>
 

drivers/network/tcpip/ip/CMakeLists.txt

@@ -28,9 +28,13 @@ list(APPEND SOURCE
     transport/tcp/event.c
     transport/tcp/if.c
     transport/tcp/tcp.c
-    transport/udp/udp.c
+    transport/udp/udp.c)
-    precomp.h)
 
 add_library(ip ${SOURCE} ${ip_asm})
+
+target_include_directories(ip BEFORE
+    PRIVATE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include
+    PRIVATE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/lwip/src/include
+    PRIVATE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/lwip/src/include/ipv4)
+
 add_pch(ip precomp.h SOURCE)
-add_dependencies(ip asm)

drivers/network/tcpip/ip/precomp.h

@@ -19,6 +19,6 @@
 #include <lock.h>
 #include <interface.h>
 #include <ports.h>
-#include <chew/chew.h>
+#include <chew.h>
 
 #endif /* _IP_PCH_ */

drivers/network/tcpip/lwip/CMakeLists.txt

@@ -1,14 +1,4 @@
 
-include_directories(
-    BEFORE include
-    ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include
-    ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/lwip/src/include
-    ${REACTOS_SOURCE_DIR}/sdk/lib/drivers/lwip/src/include/ipv4)
-
-include_directories(
-    src/include
-    src/include/ipv4)
-
 list(APPEND SOURCE
     src/rosip.c
     src/rostcp.c
@@ -55,13 +45,18 @@ list(APPEND SOURCE
     src/core/snmp/mib_structs.c
     src/core/snmp/mib2.c
     src/core/snmp/msg_in.c
-    src/core/snmp/msg_out.c
+    src/core/snmp/msg_out.c)
-    precomp.h)
 
 add_library(lwip ${SOURCE})
+
+target_include_directories(lwip BEFORE
+    PRIVATE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include
+    PRIVATE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/lwip/src/include
+    PRIVATE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/lwip/src/include/ipv4)
+
 add_dependencies(lwip bugcodes xdk)
 add_pch(lwip precomp.h SOURCE)
 
-if((NOT MSVC) AND LTCG)
+if(NOT MSVC)
     target_compile_options(lwip PRIVATE -fno-builtin-malloc -fno-builtin-free)
 endif()