Add MSVFW32 and MSWSOCK to the build. Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/lib/directory.xml Deleted: trunk/reactos/lib/msvideo/Makefile Deleted: trunk/reactos/lib/msvideo/Makefile.ros-template Added: trunk/reactos/lib/msvideo/msvfw32.xml Deleted: trunk/reactos/lib/mswsock/Makefile Added: trunk/reactos/lib/mswsock/mswsock.xml _____
Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/baseaddress.xml 2005-05-30 12:52:38 UTC (rev 15680) @@ -75,6 +75,8 @@
<property name="BASEADDRESS_DNSAPI" value="0x77f00000" /> <property name="BASEADDRESS_MSVCRT" value="0x78000000" /> <property name="BASEADDRESS_MSVCRT20" value="0x78500000" /> +<property name="BASEADDRESS_MSVFW32" value="0x77400000" /> +<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> <property name="BASEADDRESS_KERNEL32" value="0x7c800000" /> <property name="BASEADDRESS_NTDLL" value="0x7C900000" /> <property name="BASEADDRESS_FREETYPE" value="0x7F000000" /> @@ -84,9 +86,7 @@ <property name="BASEADDRESS_HID" value="0x688F0000" /> <property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> <property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> -<property name="BASEADDRESS_DISPLAY" value="DISPLAY" /> <property name="BASEADDRESS_ACLUI" value="0x71550000" /> -<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> <property name="BASEADDRESS_WINFAX" value="0x722C0000" /> <property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> <property name="BASEADDRESS_WINSCARD" value="0x723D0000" /> _____
Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-05-30 12:52:38 UTC (rev 15680) @@ -107,6 +107,8 @@
lib\msimg32\msimg32.dll 1 lib\msvcrt\msvcrt.dll 1 lib\msvcrt20\msvcrt20.dll 1 +lib\msvideo\msvfw32.dll 1 +lib\mswsock\mswsock.dll 1 lib\netapi32\netapi32.dll 1 lib\ntdll\ntdll.dll 1 lib\ole32\ole32.dll 1 _____
Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/lib/directory.xml 2005-05-30 12:52:38 UTC (rev 15680) @@ -166,6 +166,12 @@
<directory name="msvcrt20"> <xi:include href="msvcrt20/msvcrt20.xml" /> </directory> +<directory name="msvideo"> + <xi:include href="msvideo/msvfw32.xml" /> +</directory> +<directory name="mswsock"> + <xi:include href="mswsock/mswsock.xml" /> +</directory> <directory name="netapi32"> <xi:include href="netapi32/netapi32.xml" /> </directory> _____
Deleted: trunk/reactos/lib/msvideo/Makefile --- trunk/reactos/lib/msvideo/Makefile 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/lib/msvideo/Makefile 2005-05-30 12:52:38 UTC (rev 15680) @@ -1,9 +0,0 @@
-# $Id$ - -PATH_TO_TOP = ../.. - -TARGET_TYPE = winedll - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____
Deleted: trunk/reactos/lib/msvideo/Makefile.ros-template --- trunk/reactos/lib/msvideo/Makefile.ros-template 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/lib/msvideo/Makefile.ros-template 2005-05-30 12:52:38 UTC (rev 15680) @@ -1,21 +0,0 @@
-# $Id$ - -TARGET_NAME = msvfw32 - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a - -TARGET_BASE = $(TARGET_BASE_LIB_WINMM) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____
Added: trunk/reactos/lib/msvideo/msvfw32.xml --- trunk/reactos/lib/msvideo/msvfw32.xml 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/lib/msvideo/msvfw32.xml 2005-05-30 12:52:38 UTC (rev 15680) @@ -0,0 +1,21 @@
+<module name="msvfw32" type="win32dll" baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32" installname="msvfw32.dll"> + <importlibrary definition="msvfw32.spec.def" /> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>winmm</library> + <library>gdi32</library> + <library>comctl32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>drawdib.c</file> + <file>mciwnd.c</file> + <file>msvfw32.rc</file> + <file>msvideo_main.c</file> + <file>msvfw32.spec</file> +</module> _____
Deleted: trunk/reactos/lib/mswsock/Makefile --- trunk/reactos/lib/mswsock/Makefile 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/lib/mswsock/Makefile 2005-05-30 12:52:38 UTC (rev 15680) @@ -1,37 +0,0 @@
-# $Id$ - -PATH_TO_TOP = ../.. - -TARGET_TYPE = dynlink - -TARGET_NAME = mswsock - -TARGET_BASE = $(TARGET_BASE_LIB_MSWSOCK) - -TARGET_CFLAGS = \ - -I./include \ - -Wall \ - -Werror \ - -fno-builtin \ - -DUNICODE \ - -DLE \ - -DDBG \ - -D__USE_W32API - -TARGET_LFLAGS = -nostartfiles -nostdlib - -TARGET_SDKLIBS = kernel32.a ws2_32.a - -TARGET_OBJECTS = stubs.o extensions.o - -TARGET_CLEAN = $(DEP_FILES) - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# Automatic dependency tracking -DEP_OBJECTS := $(TARGET_OBJECTS) -include $(PATH_TO_TOP)/tools/depend.mk - -# EOF _____
Added: trunk/reactos/lib/mswsock/mswsock.xml --- trunk/reactos/lib/mswsock/mswsock.xml 2005-05-30 08:12:30 UTC (rev 15679) +++ trunk/reactos/lib/mswsock/mswsock.xml 2005-05-30 12:52:38 UTC (rev 15680) @@ -0,0 +1,11 @@
+<module name="mswsock" type="win32dll" baseaddress="${BASEADDRESS_MSWSOCK}" installbase="system32" installname="mswsock.dll"> + <importlibrary definition="mswsock.def" /> + <define name="UNICODE" /> + <define name="LE" /> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>ws2_32</library> + <file>extensions.c</file> + <file>stubs.c</file> + <file>mswsock.rc</file> +</module>