[cgutman] 53077: - Make the branch buildable with rbuild - For all those cmake lovers out there in a panic, remember that we still use rbuild in trunk so we need this in order to merge for now
Author: cgutman Date: Fri Aug 5 03:06:00 2011 New Revision: 53077
URL: http://svn.reactos.org/svn/reactos?rev=53077&view=rev Log: - Make the branch buildable with rbuild - For all those cmake lovers out there in a panic, remember that we still use rbuild in trunk so we need this in order to merge for now
Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip.rbuild branches/GSoC_2011/TcpIpDriver/lib/drivers/directory.rbuild branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/ip.rbuild branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/lwip.rbuild
Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/ne... ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] Fri Aug 5 03:06:00 2011 @@ -3,11 +3,12 @@ <module name="tcpip" type="kernelmodedriver" installbase="system32/drivers" installname="tcpip.sys"> <importlibrary definition="tcpip.spec" /> <include base="tcpip">include</include> - <include base="oskittcp">include</include> + <include base="lwip">src/include</include> + <include base="lwip">src/include/ipv4</include> <define name="NDIS40" /> <define name="_NTDRIVER_" /> <library>ip</library> - <library>oskittcp</library> + <library>lwip</library> <library>ndis</library> <library>pseh</library> <library>chew</library>
Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/driver... ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/directory.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/directory.rbuild [iso-8859-1] Fri Aug 5 03:06:00 2011 @@ -7,8 +7,8 @@ <directory name="ip"> <xi:include href="ip/ip.rbuild" /> </directory> - <directory name="oskittcp"> - <xi:include href="oskittcp/oskittcp.rbuild" /> + <directory name="lwip"> + <xi:include href="lwip/lwip.rbuild" /> </directory> <directory name="chew"> <xi:include href="chew/chew.rbuild" />
Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/ip.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/driver... ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/ip.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/ip.rbuild [iso-8859-1] Fri Aug 5 03:06:00 2011 @@ -3,7 +3,8 @@ <module name="ip" type="staticlibrary"> <define name="__NTDRIVER__"/> <include base="tcpip">include</include> - <include base="oskittcp">include</include> + <include base="lwip">src/include</include> + <include base="lwip">src/include/ipv4</include> <directory name="network"> <if property="ARCH" value="i386"> <directory name="i386">
Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/lwip.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/driver... ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/lwip.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/lwip.rbuild [iso-8859-1] Fri Aug 5 03:06:00 2011 @@ -1,8 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="lwip" type="staticlibrary"> +<module name="lwip" type="staticlibrary" allowwarnings="true"> <include base="lwip">src/include</include> <include base="lwip">src/include/ipv4</include> + <include base="tcpip">include</include> <directory name="src"> <file>rosip.c</file> <file>rostcp.c</file>
-
cgutman＠svn.reactos.org