Add MSVFW32 and MSWSOCK to the build.

svn path=/trunk/; revision=15680
This commit is contained in:
Filip Navara 2005-05-30 12:52:38 +00:00
parent b84060f8e3
commit 5417e5d19c
8 changed files with 42 additions and 69 deletions

View file

@ -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" />

View file

@ -107,6 +107,8 @@ lib\msi\msi.dll 1
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

View file

@ -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>

View file

@ -1,9 +0,0 @@
# $Id$
PATH_TO_TOP = ../..
TARGET_TYPE = winedll
include $(PATH_TO_TOP)/rules.mak
include $(TOOLS_PATH)/helper.mk

View file

@ -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

View file

@ -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>

View file

@ -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

View file

@ -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>