reactos
diff -u -r1.271 -r1.272
--- Makefile 15 Dec 2004 05:08:44 -0000 1.271
+++ Makefile 18 Dec 2004 22:28:41 -0000 1.272
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.271 2004/12/15 05:08:44 sedwards Exp $
+# $Id: Makefile,v 1.272 2004/12/18 22:28:41 gvg Exp $
#
# Global makefile
#
@@ -6,6 +6,7 @@
PATH_TO_TOP = .
include $(PATH_TO_TOP)/rules.mak
+include $(PATH_TO_TOP)/config
#
# Define to build ReactOS external targets
@@ -53,11 +54,10 @@
# libpcap packet epsapi
DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll comdlg32 d3d8thk expat fmifs freetype \
gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 midimap mmdrv mpr msacm msafd \
- msgina msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg opengl32 packet psapi \
- riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi snmpapi syssetup twain unicode user32 \
- userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda \
- dnsapi dinput dinput8 dsound \
- $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT)
+ msgina msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \
+ packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi snmpapi syssetup twain \
+ unicode user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi dinput \
+ dinput8 dsound $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT)
SUBSYS = smss win32k csrss ntvdm
@@ -773,6 +773,12 @@
#
# Hardware Abstraction Layers
#
+ifeq ($(MP),1)
+halx86: halx86/mp
+else
+halx86: halx86/up
+endif
+
$(HALS): %: $(IMPLIB)
$(MAKE) -C hal/$*
reactos/doc
diff -u -r1.23 -r1.24
--- README.WINE 12 Dec 2004 04:43:36 -0000 1.23
+++ README.WINE 18 Dec 2004 22:28:42 -0000 1.24
@@ -53,7 +53,7 @@
reactos/lib/ole32 # Synced to Wine-20041201
reactos/lib/oleaut32 # Synced to Wine-20041201
reactos/lib/oledlg # Synced to Wine-20041201
-reactos/lib/oldpro32 # Out of sync
+reactos/lib/oldpro32 # Synced to Wine-20041201
reactos/lib/richedit # Synced to Wine-20041201
reactos/lib/rpcrt4 # Synced to Wine-20041201
reactos/lib/setupapi # Out of sync
reactos/bootdata/packages
diff -u -r1.57 -r1.58
--- reactos.dff 15 Dec 2004 06:10:24 -0000 1.57
+++ reactos.dff 18 Dec 2004 22:28:42 -0000 1.58
@@ -102,6 +102,7 @@
lib\ntdll\ntdll.dll 1
lib\ole32\ole32.dll 1
lib\oleaut32\oleaut32.dll 1
+lib\olepro32\olepro32.dll 1
lib\psapi\psapi.dll 1
lib\richedit\riched32.dll 1
lib\rpcrt4\rpcrt4.dll 1