65 modified files
reactos
diff -u -r1.15 -r1.16
--- baseaddress.cfg 24 Mar 2004 09:39:37 -0000 1.15
+++ baseaddress.cfg 29 May 2004 21:24:42 -0000 1.16
@@ -1,62 +1,92 @@
+# $Id: baseaddress.cfg,v 1.16 2004/05/29 21:24:42 hbirr Exp $
+#
# Please try to keep this up2date. Please clean up
# after yourself.
-REACTOS
+# REACTOS
-lib/advapi32 TARGET_BASE=0x77dc0000
-lib/comctl32 TARGET_BASE=0x76160000
-lib/comdlg32 TARGET_BASE=0x76200000
-lib/cabinet TARGET_BASE=0x75120000
-lib/crtdll TARGET_BASE=0x77630000
-lib/expat TARGET_BASE=0x79000000
-lib/fmifs TARGET_BASE=0x76df0000
-lib/gdi32 TARGET_BASE=0x77ed0000
-lib/imagehlp TARGET_BASE=0x76c90000
-lib/imm32 TARGET_BASE=0x75e60000
-lib/kernel32 TARGET_BASE=0x77f00000
-lib/lzexpand TARGET_BASE=0x73d80000
-lib/mpr TARGET_BASE=0x76620000
-lib/msafd TARGET_BASE=0x777a0000
-lib/msvcrt TARGET_BASE=0x78000000
-lib/mswsock TARGET_BASE=0x71a30000
-lib/ntdll TARGET_BASE=0x77f80000
-lib/ole32 TARGET_BASE=0x77a50000
-lib/oleaut32 TARGET_BASE=0x76260000
-lib/oledlg TARGET_BASE=0x74d00000
-lib/psapi TARGET_BASE=0x68F70000
-lib/richedit TARGET_BASE=0x76340000
-lib/rpcrt4 TARGET_BASE=0x76000000
-lib/samlib TARGET_BASE=0x750C0000
-lib/secur32 TARGET_BASE=0x10000000
-lib/setupapi TARGET_BASE=0x76660000
-lib/shell32 TARGET_BASE=0x77260000
-lib/shlwapi TARGET_BASE=0x76120000
-lib/syssetup TARGET_BASE=0x74A30000
-lib/user32 TARGET_BASE=0x77e70000
-lib/userenv TARGET_BASE=0x74850000
-lib/version TARGET_BASE=0x77a90000
-lib/winspool TARGET_BASE=0x77800000
-lib/ws2_32 TARGET_BASE=0x77780000
-lib/wsock32 TARGET_BASE=0x71ab0000
-services/dd/vga/display TARGET_BASE=0x70000000
-services/net/wshtcpip TARGET_BASE=0x777c0000
-subsys/psx/lib/psxdll TARGET_BASE=0x68EB0000
-subsys/psx/lib/psxx # TARGET_BASE=0x77dc0000
-subsys/win32k TARGET_BASE=0x0
+TARGET_BASE_LIB_ADVAPI32 =0x77dc0000
+TARGET_BASE_LIB_CABINET =0x75120000
+TARGET_BASE_LIB_CARDS =0x701a0000
+TARGET_BASE_LIB_COMCTL32 =0x76160000
+TARGET_BASE_LIB_COMDLG32 =0x76200000
+TARGET_BASE_LIB_COMMCTRL =0x75e60000
+TARGET_BASE_LIB_COREDLL =0x73D80000
+TARGET_BASE_LIB_CPL_SYSDM =0x58760000
+TARGET_BASE_LIB_CRTDLL =0x77630000
+TARGET_BASE_LIB_D3D8THK =0x76340000
+TARGET_BASE_LIB_DEVMGR =0x72A90000
+TARGET_BASE_LIB_DINPUT =0x50000000
+TARGET_BASE_LIB_DNSAPI =0x78000000
+TARGET_BASE_LIB_DSOUND =0x50000000
+TARGET_BASE_LIB_EXPAT =0x79000000
+TARGET_BASE_LIB_FMIFS =0x76df0000
+TARGET_BASE_LIB_GDI32 =0x77ed0000
+TARGET_BASE_LIB_GLU32 =0x50000000
+TARGET_BASE_LIB_IMAGEHLP =0x76c90000
+TARGET_BASE_LIB_IMM32 =0x75e60000
+TARGET_BASE_LIB_IPHLPAPI =0x77300000
+TARGET_BASE_LIB_IPRTPRIO =0x777c0000
+TARGET_BASE_LIB_KERNEL32 =0x77f00000
+TARGET_BASE_LIB_LZEXPAND =0x73d80000
+TARGET_BASE_LIB_MMDRV =0x50000000
+TARGET_BASE_LIB_MPR =0x76620000
+TARGET_BASE_LIB_MSACM =0x77300000
+TARGET_BASE_LIB_MSAFD =0x777a0000
+TARGET_BASE_LIB_MSGINA =0x75970000
+TARGET_BASE_LIB_MSIMG32 =0x69cc0000
+TARGET_BASE_LIB_MSVCRT =0x78000000
+TARGET_BASE_LIB_MSVCRT20 =0x78000000
+TARGET_BASE_LIB_MSWSOCK =0x71a30000
+TARGET_BASE_LIB_NETAPI32 =0x71C00000
+TARGET_BASE_LIB_NTDLL =0x77f80000
+TARGET_BASE_LIB_ODBC32 =0x76660000
+TARGET_BASE_LIB_OLE32 =0x77a50000
+TARGET_BASE_LIB_OLEAUT32 =0x76260000
+TARGET_BASE_LIB_OLEDLG =0x74d00000
+TARGET_BASE_LIB_OLEPRO32 =0x77a50000
+TARGET_BASE_LIB_OPENGL32 =0x50000000
+TARGET_BASE_LIB_PACKET =0x77780000
+TARGET_BASE_LIB_PSAPI =0x68F70000
+TARGET_BASE_LIB_RICHEDIT =0x76340000
+TARGET_BASE_LIB_RPCRT4 =0x76000000
+TARGET_BASE_LIB_SAMLIB =0x750C0000
+TARGET_BASE_LIB_SECURE32 =0x10000000
+TARGET_BASE_LIB_SETUPAPI =0x76660000
+TARGET_BASE_LIB_SHELL32 =0x77260000
+TARGET_BASE_LIB_SHLWAPI =0x76120000
+TARGET_BASE_LIB_SNMPAPI =0x777c0000
+TARGET_BASE_LIB_SYSSETUP =0x74A30000
+TARGET_BASE_LIB_TWAIN_32 =0x76380000
+TARGET_BASE_LIB_UNICODE =0x6b200000
+TARGET_BASE_LIB_USER32 =0x77e60000
+TARGET_BASE_LIB_USERENV =0x74850000
+TARGET_BASE_LIB_VERSION =0x77a90000
+TARGET_BASE_LIB_WININET =0x70200000
+TARGET_BASE_LIB_WINMM =0x777c0000
+TARGET_BASE_LIB_WINSPOOL =0x77800000
+TARGET_BASE_LIB_W2_32 =0x77780000
+TARGET_BASE_LIB_WS2HELP =0x777c0000
+TARGET_BASE_LIB_WSHIRDA =0x777c0000
+TARGET_BASE_LIB_WSOCK32 =0x71ab0000
+TARGET_BASE_VGA_DISPLAY =0x70000000
+TARGET_BASE_NET_WSHTCPIP =0x777c0000
+TARGET_BASE_PSX_LIB_PSXDLL =0x68EB0000
+# TARGET_BASE_PSX_LIB_PSXX =0x77dc0000
-WINE
+# WINE
-dlls/ddraw TARGET_BASE=0x76240000
-dlls/dinput TARGET_BASE=0x76280000
-dlls/dplay TARGET_BASE=0x76320000
-dlls/dplayx TARGET_BASE=0x76310000
-dlls/mapi32 TARGET_BASE=0x76430000
-dlls/olecli TARGET_BASE=0x76070000
-dlls/olepro32 TARGET_BASE=0x76060000
-dlls/olesvr TARGET_BASE=0x76080000
-dlls/url TARGET_BASE=0x76530000
-dlls/urlmon TARGET_BASE=0x76730000
-dlls/serialui TARGET_BASE=0x76370000
-dlls/shdocvw TARGET_BASE=0x76190000
-dlls/shfolder TARGET_BASE=0x76180000
-unicode/wine_unicode TARGET_BASE=0x76590000 #Do not use
+#dlls/ddraw TARGET_BASE=0x76240000
+#dlls/dinput TARGET_BASE=0x76280000
+#dlls/dplay TARGET_BASE=0x76320000
+#dlls/dplayx TARGET_BASE=0x76310000
+#dlls/mapi32 TARGET_BASE=0x76430000
+#dlls/olecli TARGET_BASE=0x76070000
+#dlls/olepro32 TARGET_BASE=0x76060000
+#dlls/olesvr TARGET_BASE=0x76080000
+#dlls/url TARGET_BASE=0x76530000
+#dlls/urlmon TARGET_BASE=0x76730000
+#dlls/serialui TARGET_BASE=0x76370000
+#dlls/shdocvw TARGET_BASE=0x76190000
+#dlls/shfolder TARGET_BASE=0x76180000
+#unicode/wine_unicode TARGET_BASE=0x76590000 #Do not use
reactos/lib/advapi32
diff -u -r1.39 -r1.40
--- makefile 25 Mar 2004 11:30:07 -0000 1.39
+++ makefile 29 May 2004 21:24:42 -0000 1.40
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.39 2004/03/25 11:30:07 ekohl Exp $
+# $Id: makefile,v 1.40 2004/05/29 21:24:42 hbirr Exp $
PATH_TO_TOP = ../..
@@ -13,7 +13,7 @@
TARGET_SDKLIBS = ntdll.a kernel32.a libwine.a msvcrt.a
-TARGET_BASE = 0x77DB0000
+TARGET_BASE = $(TARGET_BASE_LIB_ADVAPI32)
MISC_OBJECTS = \
misc/dllmain.o \
reactos/lib/cabinet
diff -u -r1.2 -r1.3
--- Makefile.ros-template 28 Jan 2004 19:34:44 -0000 1.2
+++ Makefile.ros-template 29 May 2004 21:24:42 -0000 1.3
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.2 2004/01/28 19:34:44 navaraf Exp $
+# $Id: Makefile.ros-template,v 1.3 2004/05/29 21:24:42 hbirr Exp $
TARGET_NAME = cabinet
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a
-TARGET_BASE = 0x75120000
+TARGET_BASE = $(TARGET_BASE_LIB_CABINET)
TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
reactos/lib/cards
diff -u -r1.2 -r1.3
--- Makefile 12 Sep 2003 17:51:46 -0000 1.2
+++ Makefile 29 May 2004 21:24:42 -0000 1.3
@@ -4,7 +4,7 @@
TARGET_NAME = cards
-TARGET_BASE = 0x701a0000
+TARGET_BASE = $(TARGET_BASE_LIB_CARDS)
TARGET_CFLAGS = -fno-builtin -D__USE_W32API
reactos/lib/comctl32
diff -u -r1.2 -r1.3
--- Makefile.ros-template 12 Jan 2004 23:48:37 -0000 1.2
+++ Makefile.ros-template 29 May 2004 21:24:42 -0000 1.3
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.2 2004/01/12 23:48:37 sedwards Exp $
+# $Id: Makefile.ros-template,v 1.3 2004/05/29 21:24:42 hbirr Exp $
TARGET_NAME = comctl32
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = @IMPORTS@ winmm.a libwine.a wine_uuid.a ntdll.a
-TARGET_BASE = 0x76160000
+TARGET_BASE = $(TARGET_BASE_LIB_COMCTL32)
TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
reactos/lib/comdlg32
diff -u -r1.2 -r1.3
--- Makefile.ros-template 28 Jan 2004 19:34:44 -0000 1.2
+++ Makefile.ros-template 29 May 2004 21:24:42 -0000 1.3
@@ -7,7 +7,7 @@
TARGET_SDKLIBS = @IMPORTS@ libwine.a libwine_unicode.a wine_uuid.a ntdll.a winspool.a
-TARGET_BASE = 0x76200000
+TARGET_BASE = $(TARGET_BASE_LIB_COMDLG32)
TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
reactos/lib/commctrl
diff -u -r1.1 -r1.2
--- Makefile 4 Mar 2004 18:54:21 -0000 1.1
+++ Makefile 29 May 2004 21:24:43 -0000 1.2
@@ -5,7 +5,7 @@
TARGET_NAME = commctrl
-TARGET_BASE=0x75e60000
+TARGET_BASE=$(TARGET_BASE_LIB_COMMCTRL)
# require os code to explicitly request A/W version of structs/functions
TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror
reactos/lib/coredll
diff -u -r1.1 -r1.2
--- Makefile 3 Mar 2004 19:11:20 -0000 1.1
+++ Makefile 29 May 2004 21:24:43 -0000 1.2
@@ -5,7 +5,7 @@
TARGET_NAME = coredll
-TARGET_BASE=0x73D80000
+TARGET_BASE=$(TARGET_BASE_LIB_COREDLL)
# require os code to explicitly request A/W version of structs/functions
TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror
reactos/lib/cpl/sysdm
diff -u -r1.1 -r1.2
--- Makefile 8 Mar 2004 14:24:47 -0000 1.1
+++ Makefile 29 May 2004 21:24:43 -0000 1.2
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 2004/03/08 14:24:47 weiden Exp $
+# $Id: Makefile,v 1.2 2004/05/29 21:24:43 hbirr Exp $
PATH_TO_TOP = ../../..
@@ -10,7 +10,7 @@
TARGET_INSTALLDIR = system32
-TARGET_BASE = 0x58760000
+TARGET_BASE = $(TARGET_BASE_LIB_CPL_SYSDM)
TARGET_CFLAGS = \
-I./include \
reactos/lib/crtdll
diff -u -r1.63 -r1.64
--- makefile 26 Feb 2004 12:23:29 -0000 1.63
+++ makefile 29 May 2004 21:24:43 -0000 1.64
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.63 2004/02/26 12:23:29 ekohl Exp $
+# $Id: makefile,v 1.64 2004/05/29 21:24:43 hbirr Exp $
PATH_TO_TOP = ../..
@@ -10,7 +10,7 @@
TARGET_NAME = crtdll
-TARGET_BASE = 0x77630000
+TARGET_BASE = $(TARGET_BASE_LIB_CRTDLL)
TARGET_LFLAGS = -nostartfiles -nostdlib
reactos/lib/d3d8thk
diff -u -r1.4 -r1.5
--- Makefile 2 Dec 2003 18:12:04 -0000 1.4
+++ Makefile 29 May 2004 21:24:43 -0000 1.5
@@ -4,7 +4,7 @@
TARGET_NAME = d3d8thk
-#TARGET_BASE = 0x76340000
+TARGET_BASE = $(TARGET_BASE_LIB_D3D8THK)
# require os code to explicitly request A/W version of structs/functions
TARGET_CFLAGS += -D_DISABLE_TIDENTS -Werror -Wall
reactos/lib/devmgr
diff -u -r1.1 -r1.2
--- Makefile 4 Apr 2004 21:49:15 -0000 1.1
+++ Makefile 29 May 2004 21:24:43 -0000 1.2
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 2004/04/04 21:49:15 weiden Exp $
+# $Id: Makefile,v 1.2 2004/05/29 21:24:43 hbirr Exp $
PATH_TO_TOP = ../..
@@ -8,7 +8,7 @@
TARGET_INSTALLDIR = system32
-TARGET_BASE = 0x72A90000
+TARGET_BASE = $(TARGET_BASE_LIB_DEVMGR)
TARGET_CFLAGS = \
-I./include \
reactos/lib/dinput
diff -u -r1.1 -r1.2
--- Makefile 3 Feb 2004 23:09:48 -0000 1.1
+++ Makefile 29 May 2004 21:24:43 -0000 1.2
@@ -14,6 +14,8 @@
TARGET_SDKLIBS = ntdll.a gdi32.a
+TARGET_BASE = $(TARGET_BASE_LIB_DINPUT)
+
TARGET_OBJECTS = \
dinput.o
reactos/lib/dnsapi
diff -u -r1.4 -r1.5
--- Makefile 25 Dec 2003 09:52:44 -0000 1.4
+++ Makefile 29 May 2004 21:24:43 -0000 1.5
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2003/12/25 09:52:44 arty Exp $
+# $Id: Makefile,v 1.5 2004/05/29 21:24:43 hbirr Exp $
PATH_TO_TOP = ../..
@@ -8,7 +8,7 @@
TARGET_NAME = dnsapi
-TARGET_BASE = 0x78000000
+TARGET_BASE = $(TARGET_BASE_LIB_DNSAPI)
TARGET_LFLAGS = -nostartfiles -g --kill-at
reactos/lib/dsound
diff -u -r1.1 -r1.2
--- Makefile 3 Feb 2004 23:09:48 -0000 1.1
+++ Makefile 29 May 2004 21:24:43 -0000 1.2
@@ -14,6 +14,8 @@
TARGET_SDKLIBS = ntdll.a gdi32.a
+TARGET_BASE = $(TARGET_BASE_LIB_DSOUND)
+
TARGET_OBJECTS = \
dsound.o
reactos/lib/expat
diff -u -r1.2 -r1.3
--- Makefile 24 Mar 2004 09:39:37 -0000 1.2
+++ Makefile 29 May 2004 21:24:43 -0000 1.3
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.2 2004/03/24 09:39:37 mf Exp $
+# $Id: Makefile,v 1.3 2004/05/29 21:24:43 hbirr Exp $
PATH_TO_TOP = ../..
TARGET_NAME = libexpat
TARGET_TYPE = dynlink
-TARGET_BASE = 0x79000000
+TARGET_BASE = $(TARGET_BASE_LIB_EXPAT)
TARGET_NORC = yes
TARGET_DEFONLY = yes
TARGET_DEFNAME = lib/libexpat
reactos/lib/fmifs
diff -u -r1.21 -r1.22
--- makefile 23 Feb 2004 11:55:12 -0000 1.21
+++ makefile 29 May 2004 21:24:43 -0000 1.22
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.21 2004/02/23 11:55:12 ekohl Exp $
+# $Id: makefile,v 1.22 2004/05/29 21:24:43 hbirr Exp $
PATH_TO_TOP = ../..
@@ -6,7 +6,7 @@
TARGET_NAME = fmifs
-TARGET_BASE = 0x76df0000
+TARGET_BASE = $(TARGET_BASE_LIB_FMIFS)
TARGET_ENTRY = _InitializeFmIfs@12
reactos/lib/gdi32
diff -u -r1.37 -r1.38
--- makefile 9 Apr 2004 20:03:11 -0000 1.37
+++ makefile 29 May 2004 21:24:43 -0000 1.38
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.37 2004/04/09 20:03:11 navaraf Exp $
+# $Id: makefile,v 1.38 2004/05/29 21:24:43 hbirr Exp $
PATH_TO_TOP = ../..
@@ -6,7 +6,7 @@
TARGET_NAME = gdi32
-TARGET_BASE = 0x77ed0000
+TARGET_BASE = $(TARGET_BASE_LIB_GDI32)
TARGET_SDKLIBS = rosrtl.a ntdll.a advapi32.a kernel32.a
reactos/lib/glu32
diff -u -r1.1 -r1.2
--- Makefile 2 Feb 2004 16:39:07 -0000 1.1
+++ Makefile 29 May 2004 21:24:43 -0000 1.2
@@ -6,6 +6,8 @@
TARGET_NAME = glu32
+TARGET_BASE = $(TARGET_BASE_LIB_GLU32)
+
TARGET_CFLAGS = -D__USE_W32API -DRESOLVE_3D_TEXTURE_SUPPORT -DBUILD_GL32 -DLIBRARYBUILD -Wall -Werror -Iinclude -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess
TARGET_CPPFLAGS = $(TARGET_CFLAGS)
reactos/lib/imagehlp
diff -u -r1.4 -r1.5
--- makefile 28 Jan 2004 19:34:45 -0000 1.4
+++ makefile 29 May 2004 21:24:43 -0000 1.5
@@ -36,7 +36,7 @@
TARGET_SDKLIBS = libwine.a ntdll.a kernel32.a
-TARGET_BASE = 0x76C90000
+TARGET_BASE = $(TARGET_BASE_LIB_IMAGEHLP)
TARGET_OBJECTS = \
debug.o \
reactos/lib/imm32
diff -u -r1.4 -r1.5
--- Makefile 28 Jan 2004 19:34:45 -0000 1.4
+++ Makefile 29 May 2004 21:24:44 -0000 1.5
@@ -5,7 +5,7 @@
TARGET_NAME = imm32
-TARGET_BASE=0x75e60000
+TARGET_BASE=$(TARGET_BASE_LIB_IMM32)
# require os code to explicitly request A/W version of structs/functions
TARGET_CFLAGS += -D_DISABLE_TIDENTS -D__USE_W32API
reactos/lib/iphlpapi
diff -u -r1.1 -r1.2
--- Makefile.ros-template 25 Feb 2004 07:41:50 -0000 1.1
+++ Makefile.ros-template 29 May 2004 21:24:44 -0000 1.2
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.1 2004/02/25 07:41:50 arty Exp $
+# $Id: Makefile.ros-template,v 1.2 2004/05/29 21:24:44 hbirr Exp $
TARGET_NAME = iphlpapi
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = @IMPORTS@ libwine.a advapi32.a kernel32.a ws2_32.a wine_uuid.a ntdll.a
-TARGET_BASE = 0x77300000
+TARGET_BASE = $(TARGET_BASE_LIB_IPHLPAPI)
TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
reactos/lib/iprtprio
diff -u -r1.3 -r1.4
--- makefile 7 Aug 2003 04:03:23 -0000 1.3
+++ makefile 29 May 2004 21:24:44 -0000 1.4
@@ -6,7 +6,7 @@
TARGET_NAME = iprtprio
-TARGET_BASE = 0x777c0000
+TARGET_BASE = $(TARGET_BASE_LIB_IPRTPRIO)
TARGET_CFLAGS = -DUNICODE
reactos/lib/kernel32
diff -u -r1.79 -r1.80
--- makefile 2 May 2004 14:47:05 -0000 1.79
+++ makefile 29 May 2004 21:24:44 -0000 1.80
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.79 2004/05/02 14:47:05 weiden Exp $
+# $Id: makefile,v 1.80 2004/05/29 21:24:44 hbirr Exp $
PATH_TO_TOP = ../..
@@ -8,7 +8,7 @@
TARGET_NAME = kernel32
-TARGET_BASE = 0x77f00000
+TARGET_BASE = $(TARGET_BASE_LIB_KERNEL32)
# require os code to explicitly request A/W version of structs/functions
TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror
reactos/lib/lzexpand
diff -u -r1.6 -r1.7
--- Makefile 28 Jan 2004 19:34:45 -0000 1.6
+++ Makefile 29 May 2004 21:24:44 -0000 1.7
@@ -5,7 +5,7 @@
TARGET_NAME = lz32
-TARGET_BASE=0x73D80000
+TARGET_BASE=$(TARGET_BASE_LIB_LZEXPAND)
# require os code to explicitly request A/W version of structs/functions
TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror
reactos/lib/mmdrv
diff -u -r1.2 -r1.3
--- Makefile 19 Mar 2004 06:11:28 -0000 1.2
+++ Makefile 29 May 2004 21:24:44 -0000 1.3
@@ -16,6 +16,8 @@
TARGET_SDKLIBS = winmm.a
+TARGET_BASE = $(TARGET_BASE_LIB_MMDRV)
+
TARGET_OBJECTS = \
auxil.o \
entry.o \
reactos/lib/mpr
diff -u -r1.1 -r1.2
--- Makefile.ros-template 1 Feb 2004 19:48:44 -0000 1.1
+++ Makefile.ros-template 29 May 2004 21:24:44 -0000 1.2
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.1 2004/02/01 19:48:44 gvg Exp $
+# $Id: Makefile.ros-template,v 1.2 2004/05/29 21:24:44 hbirr Exp $
TARGET_NAME = mpr
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = @IMPORTS@ kernel32.a libwine.a ntdll.a
-TARGET_BASE = 0x76620000
+TARGET_BASE = $(TARGET_BASE_LIB_MPR)
TARGET_NORC = yes
reactos/lib/msacm
diff -u -r1.1 -r1.2
--- Makefile.ros-template 10 Mar 2004 15:22:44 -0000 1.1
+++ Makefile.ros-template 29 May 2004 21:24:44 -0000 1.2
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.1 2004/03/10 15:22:44 silverblade Exp $
+# $Id: Makefile.ros-template,v 1.2 2004/05/29 21:24:44 hbirr Exp $
TARGET_NAME = iphlpapi
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = @IMPORTS@ libwine.a advapi32.a kernel32.a ws2_32.a wine_uuid.a ntdll.a
-TARGET_BASE = 0x77300000
+TARGET_BASE = $(TARGET_BASE_LIB_MSACM)
TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
reactos/lib/msafd
diff -u -r1.12 -r1.13
--- makefile 11 Jan 2004 20:46:05 -0000 1.12
+++ makefile 29 May 2004 21:24:44 -0000 1.13
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.12 2004/01/11 20:46:05 navaraf Exp $
+# $Id: makefile,v 1.13 2004/05/29 21:24:44 hbirr Exp $
PATH_TO_TOP = ../..
@@ -6,7 +6,7 @@
TARGET_NAME = msafd
-TARGET_BASE = 0x777a0000
+TARGET_BASE = $(TARGET_BASE_LIB_MSAFD)
TARGET_SDKLIBS = ntdll.a kernel32.a
reactos/lib/msgina
diff -u -r1.6 -r1.7
--- Makefile 7 Dec 2003 01:12:58 -0000 1.6
+++ Makefile 29 May 2004 21:24:44 -0000 1.7
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 2003/12/07 01:12:58 weiden Exp $
+# $Id: Makefile,v 1.7 2004/05/29 21:24:44 hbirr Exp $
PATH_TO_TOP = ../..
@@ -8,7 +8,7 @@
TARGET_INSTALLDIR = system32
-TARGET_BASE = 0x75970000
+TARGET_BASE = $(TARGET_BASE_LIB_MSGINA)
TARGET_CFLAGS = \
-I./include \
reactos/lib/msimg32
diff -u -r1.2 -r1.3
--- Makefile 14 Nov 2003 17:13:30 -0000 1.2
+++ Makefile 29 May 2004 21:24:44 -0000 1.3
@@ -4,7 +4,7 @@
TARGET_NAME = msimg32
-TARGET_BASE = 0x69cc0000
+TARGET_BASE = $(TARGET_BASE_LIB_MSIMG32)
TARGET_CFLAGS = -fno-builtin -D__USE_W32API
reactos/lib/msvcrt
diff -u -r1.43 -r1.44
--- Makefile 15 May 2004 12:55:47 -0000 1.43
+++ Makefile 29 May 2004 21:24:44 -0000 1.44
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.43 2004/05/15 12:55:47 jfilby Exp $
+# $Id: Makefile,v 1.44 2004/05/29 21:24:44 hbirr Exp $
PATH_TO_TOP = ../..
@@ -8,7 +8,7 @@
TARGET_NAME = msvcrt
-TARGET_BASE = 0x78000000
+TARGET_BASE = $(TARGET_BASE_LIB_MSVCRT)
TARGET_LFLAGS = -nostartfiles --enable-stdcall-fixup
reactos/lib/msvcrt20
diff -u -r1.1 -r1.2
--- Makefile 1 Jan 2004 15:27:58 -0000 1.1
+++ Makefile 29 May 2004 21:24:44 -0000 1.2
@@ -7,7 +7,7 @@
TARGET_NAME = msvcrt20
-TARGET_BASE = 0x78000000
+TARGET_BASE = $(TARGET_BASE_LIB_MSVCRT20)
TARGET_LFLAGS = -nostartfiles --enable-stdcall-fixup
reactos/lib/mswsock
diff -u -r1.3 -r1.4
--- Makefile 11 Jan 2004 20:46:05 -0000 1.3
+++ Makefile 29 May 2004 21:24:44 -0000 1.4
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2004/01/11 20:46:05 navaraf Exp $
+# $Id: Makefile,v 1.4 2004/05/29 21:24:44 hbirr Exp $
PATH_TO_TOP = ../..
@@ -6,7 +6,7 @@
TARGET_NAME = mswsock
-TARGET_BASE = 0x71a30000
+TARGET_BASE = $(TARGET_BASE_LIB_MSWSOCK)
TARGET_CFLAGS = \
-I./include \
reactos/lib/netapi32
diff -u -r1.2 -r1.3
--- Makefile.ros-template 7 Mar 2004 14:33:13 -0000 1.2
+++ Makefile.ros-template 29 May 2004 21:24:44 -0000 1.3
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.2 2004/03/07 14:33:13 navaraf Exp $
+# $Id: Makefile.ros-template,v 1.3 2004/05/29 21:24:44 hbirr Exp $
TARGET_NAME = netapi32
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = @IMPORTS@ libwine.a ntdll.a
-TARGET_BASE = 0x71C00000
+TARGET_BASE = $(TARGET_BASE_LIB_NETAPI32)
TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
reactos/lib/odbc32
diff -u -r1.1 -r1.2
--- Makefile.ros-template 25 Feb 2004 20:09:39 -0000 1.1
+++ Makefile.ros-template 29 May 2004 21:24:45 -0000 1.2
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.1 2004/02/25 20:09:39 sedwards Exp $
+# $Id: Makefile.ros-template,v 1.2 2004/05/29 21:24:45 hbirr Exp $
TARGET_NAME = odbc32
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = @IMPORTS@ libwine.a ntdll.a
-TARGET_BASE = 0x76660000
+TARGET_BASE = $(TARGET_BASE_LIB_ODBC32)
TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
reactos/lib/ole32
diff -u -r1.1 -r1.2
--- Makefile.ros-template 2 Jan 2004 19:49:45 -0000 1.1
+++ Makefile.ros-template 29 May 2004 21:24:45 -0000 1.2
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.1 2004/01/02 19:49:45 gvg Exp $
+# $Id: Makefile.ros-template,v 1.2 2004/05/29 21:24:45 hbirr Exp $
TARGET_NAME = ole32
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a
-TARGET_BASE = 0x77a50000
+TARGET_BASE = $(TARGET_BASE_LIB_OLE32)
TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
reactos/lib/oleaut32
diff -u -r1.3 -r1.4
--- Makefile.ros-template 7 Mar 2004 14:33:13 -0000 1.3
+++ Makefile.ros-template 29 May 2004 21:24:45 -0000 1.4
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.3 2004/03/07 14:33:13 navaraf Exp $
+# $Id: Makefile.ros-template,v 1.4 2004/05/29 21:24:45 hbirr Exp $
TARGET_NAME = oleaut32
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = @IMPORTS@ winmm.a libwine.a wine_uuid.a libwine_unicode.a ntdll.a
-TARGET_BASE = 0x76260000
+TARGET_BASE = $(TARGET_BASE_LIB_OLEAUT32)
TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
reactos/lib/oledlg
diff -u -r1.2 -r1.3
--- Makefile.ros-template 28 Jan 2004 19:34:45 -0000 1.2
+++ Makefile.ros-template 29 May 2004 21:24:45 -0000 1.3
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.2 2004/01/28 19:34:45 navaraf Exp $
+# $Id: Makefile.ros-template,v 1.3 2004/05/29 21:24:45 hbirr Exp $
TARGET_NAME = oledlg
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a
-TARGET_BASE = 0x74D00000
+TARGET_BASE = $(TARGET_BASE_LIB_OLEDLG)
TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
reactos/lib/olepro32
diff -u -r1.1 -r1.2
--- Makefile.ros-template 26 Feb 2004 02:01:13 -0000 1.1
+++ Makefile.ros-template 29 May 2004 21:24:45 -0000 1.2
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.1 2004/02/26 02:01:13 sedwards Exp $
+# $Id: Makefile.ros-template,v 1.2 2004/05/29 21:24:45 hbirr Exp $
TARGET_NAME = olepro32
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a oleaut32.a
-TARGET_BASE = 0x77a50000
+TARGET_BASE = $(TARGET_BASE_LIB_OLEPRO32)
TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
reactos/lib/opengl32
diff -u -r1.8 -r1.9
--- Makefile 15 Feb 2004 18:37:35 -0000 1.8
+++ Makefile 29 May 2004 21:24:46 -0000 1.9
@@ -14,6 +14,8 @@
TARGET_LFLAGS = -lgdi32 -lntdll
+TARGET_BASE = $(TARGET_BASE_LIB_OPENGL32)
+
TARGET_SDKLIBS = gdi32.a ntdll.a
# ntdll.a gdi32.a - may still need these
reactos/lib/packet
diff -u -r1.6 -r1.7
--- makefile 11 Jan 2004 20:46:06 -0000 1.6
+++ makefile 29 May 2004 21:24:46 -0000 1.7
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.6 2004/01/11 20:46:06 navaraf Exp $
+# $Id: makefile,v 1.7 2004/05/29 21:24:46 hbirr Exp $
PATH_TO_TOP = ../..
@@ -6,7 +6,7 @@
TARGET_NAME = packet
-TARGET_BASE = 0x77780000
+TARGET_BASE = $(TARGET_BASE_LIB_PACKET)
TARGET_CFLAGS = -I./include -DUNICODE -D_UNICODE -DLE -DDBG -D_DEBUG -D__USE_W32API -Wall -Werror
reactos/lib/psapi
diff -u -r1.9 -r1.10
--- makefile 12 Sep 2003 17:51:48 -0000 1.9
+++ makefile 29 May 2004 21:24:46 -0000 1.10
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.9 2003/09/12 17:51:48 vizzini Exp $
+# $Id: makefile,v 1.10 2004/05/29 21:24:46 hbirr Exp $
PATH_TO_TOP = ../..
@@ -15,7 +15,7 @@
TARGET_LFLAGS = -nostartfiles -nostdlib
-TARGET_BASE = 0x68F70000
+TARGET_BASE = $(TARGET_BASE_LIB_PSAPI)
TARGET_OBJECTS = \
misc/dllmain.o \
reactos/lib/richedit
diff -u -r1.1 -r1.2
--- Makefile.ros-template 1 Feb 2004 21:20:05 -0000 1.1
+++ Makefile.ros-template 29 May 2004 21:24:46 -0000 1.2
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.1 2004/02/01 21:20:05 gvg Exp $
+# $Id: Makefile.ros-template,v 1.2 2004/05/29 21:24:46 hbirr Exp $
TARGET_NAME = riched32
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = @IMPORTS@ libwine.a ntdll.a
-TARGET_BASE = 0x76340000
+TARGET_BASE = $(TARGET_BASE_LIB_RICHEDIT)
TARGET_NORC = yes
reactos/lib/rpcrt4
diff -u -r1.2 -r1.3
--- Makefile.ros-template 5 May 2004 18:30:13 -0000 1.2
+++ Makefile.ros-template 29 May 2004 21:24:46 -0000 1.3
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.2 2004/05/05 18:30:13 navaraf Exp $
+# $Id: Makefile.ros-template,v 1.3 2004/05/29 21:24:46 hbirr Exp $
TARGET_NAME = rpcrt4
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = @IMPORTS@ winmm.a libwine.a wine_uuid.a ntdll.a
-TARGET_BASE = 0x76000000
+TARGET_BASE = $(TARGET_BASE_LIB_RPCRT4)
TARGET_RC_BINSRC = @RC_BINSRC@
TARGET_RC_BINARIES = @RC_BINARIES@
reactos/lib/samlib
diff -u -r1.2 -r1.3
--- makefile 1 Feb 2004 15:56:37 -0000 1.2
+++ makefile 29 May 2004 21:24:46 -0000 1.3
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.2 2004/02/01 15:56:37 ekohl Exp $
+# $Id: makefile,v 1.3 2004/05/29 21:24:46 hbirr Exp $
PATH_TO_TOP = ../..
@@ -6,7 +6,7 @@
TARGET_NAME = samlib
-TARGET_BASE = 0x750C0000
+TARGET_BASE = $(TARGET_BASE_LIB_SAMLIB)
TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a
reactos/lib/secur32
diff -u -r1.11 -r1.12
--- Makefile 7 Aug 2003 04:03:23 -0000 1.11
+++ Makefile 29 May 2004 21:24:46 -0000 1.12
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.11 2003/08/07 04:03:23 royce Exp $
+# $Id: Makefile,v 1.12 2004/05/29 21:24:46 hbirr Exp $
PATH_TO_TOP = ../..
@@ -7,7 +7,7 @@
TARGET_NAME = secur32
-TARGET_BASE = 0x10000000
+TARGET_BASE = $(TARGET_BASE_LIB_SECURE32)
TARGET_SDKLIBS = ntdll.a
reactos/lib/setupapi
diff -u -r1.3 -r1.4
--- Makefile.ros-template 10 Feb 2004 23:46:24 -0000 1.3
+++ Makefile.ros-template 29 May 2004 21:24:46 -0000 1.4
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.3 2004/02/10 23:46:24 gvg Exp $
+# $Id: Makefile.ros-template,v 1.4 2004/05/29 21:24:46 hbirr Exp $
TARGET_NAME = setupapi
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = @IMPORTS@ libwine.a ntdll.a libwine_unicode.a
-TARGET_BASE = 0x76660000
+TARGET_BASE = $(TARGET_BASE_LIB_SETUPAPI)
TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
reactos/lib/shell32
diff -u -r1.2 -r1.3
--- Makefile.ros-template 25 Jan 2004 18:42:49 -0000 1.2
+++ Makefile.ros-template 29 May 2004 21:24:46 -0000 1.3
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.2 2004/01/25 18:42:49 gvg Exp $
+# $Id: Makefile.ros-template,v 1.3 2004/05/29 21:24:46 hbirr Exp $
TARGET_NAME = shell32
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = libwine.a @IMPORTS@ wine_uuid.a
-TARGET_BASE = 0x77260000
+TARGET_BASE = $(TARGET_BASE_LIB_SHELL32)
TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
reactos/lib/shlwapi
diff -u -r1.5 -r1.6
--- Makefile.ros-template 28 Feb 2004 15:12:28 -0000 1.5
+++ Makefile.ros-template 29 May 2004 21:24:47 -0000 1.6
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.5 2004/02/28 15:12:28 navaraf Exp $
+# $Id: Makefile.ros-template,v 1.6 2004/05/29 21:24:47 hbirr Exp $
TARGET_NAME = shlwapi
@@ -13,7 +13,7 @@
TARGET_NORC = yes
-TARGET_BASE = 0x76120000
+TARGET_BASE = $(TARGET_BASE_LIB_SHLWAPI)
default: all
reactos/lib/snmpapi
diff -u -r1.2 -r1.3
--- makefile 7 Aug 2003 04:03:23 -0000 1.2
+++ makefile 29 May 2004 21:24:47 -0000 1.3
@@ -6,7 +6,7 @@
TARGET_NAME = snmpapi
-TARGET_BASE = 0x777c0000
+TARGET_BASE = $(TARGET_BASE_LIB_SNMPAPI)
TARGET_CFLAGS = -DUNICODE
reactos/lib/syssetup
diff -u -r1.8 -r1.9
--- Makefile 19 Apr 2004 10:54:23 -0000 1.8
+++ Makefile 29 May 2004 21:24:47 -0000 1.9
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 2004/04/19 10:54:23 ekohl Exp $
+# $Id: Makefile,v 1.9 2004/05/29 21:24:47 hbirr Exp $
PATH_TO_TOP = ../..
@@ -6,7 +6,7 @@
TARGET_NAME = syssetup
-TARGET_BASE = 0x74A30000
+TARGET_BASE = $(TARGET_BASE_LIB_SYSSETUP)
TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a gdi32.a user32.a samlib.a userenv.a comctl32.a
reactos/lib/twain
diff -u -r1.6 -r1.7
--- Makefile 2 Dec 2003 18:12:05 -0000 1.6
+++ Makefile 29 May 2004 21:24:47 -0000 1.7
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 2003/12/02 18:12:05 navaraf Exp $
+# $Id: Makefile,v 1.7 2004/05/29 21:24:47 hbirr Exp $
PATH_TO_TOP = ../..
@@ -9,7 +9,7 @@
# require os code to explicitly request A/W version of structs/functions
TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror
-TARGET_BASE=0x76380000
+TARGET_BASE=$(TARGET_BASE_LIB_TWAIN_32)
TARGET_SDKLIBS = ntdll.a libwine.a
reactos/lib/unicode
diff -u -r1.1 -r1.2
--- Makefile.ros-template 2 Jan 2004 19:49:46 -0000 1.1
+++ Makefile.ros-template 29 May 2004 21:24:47 -0000 1.2
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.1 2004/01/02 19:49:46 gvg Exp $
+# $Id: Makefile.ros-template,v 1.2 2004/05/29 21:24:47 hbirr Exp $
TARGET_NAME = libwine_unicode
@@ -23,7 +23,7 @@
TARGET_NORC = yes
-TARGET_BASE = 0x6b200000
+TARGET_BASE = $(TARGET_BASE_LIB_UNICODE)
TARGET_DEFNAME = wine_unicode
reactos/lib/user32
diff -u -r1.37 -r1.38
--- Makefile 9 Apr 2004 20:03:13 -0000 1.37
+++ Makefile 29 May 2004 21:24:47 -0000 1.38
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.37 2004/04/09 20:03:13 navaraf Exp $
+# $Id: Makefile,v 1.38 2004/05/29 21:24:47 hbirr Exp $
PATH_TO_TOP = ../..
@@ -6,7 +6,7 @@
TARGET_NAME = user32
-TARGET_BASE = 0x77e70000
+TARGET_BASE = $(TARGET_BASE_LIB_USER32)
TARGET_SDKLIBS = libwine.a ntdll.a kernel32.a gdi32.a rosrtl.a
reactos/lib/userenv
diff -u -r1.6 -r1.7
--- makefile 29 Apr 2004 14:41:26 -0000 1.6
+++ makefile 29 May 2004 21:24:47 -0000 1.7
@@ -4,7 +4,7 @@
TARGET_NAME = userenv
-TARGET_BASE = 0x74850000
+TARGET_BASE = $(TARGET_BASE_LIB_USERENV)
TARGET_CFLAGS = -fno-builtin -D__USE_W32API -D_WIN32_IE=0x0400
reactos/lib/version
diff -u -r1.14 -r1.15
--- makefile 29 Dec 2003 22:50:59 -0000 1.14
+++ makefile 29 May 2004 21:24:47 -0000 1.15
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.14 2003/12/29 22:50:59 sedwards Exp $
+# $Id: makefile,v 1.15 2004/05/29 21:24:47 hbirr Exp $
PATH_TO_TOP = ../..
@@ -6,7 +6,7 @@
TARGET_NAME = version
-TARGET_BASE = 0x77a90000
+TARGET_BASE = $(TARGET_BASE_LIB_VERSION)
TARGET_CFLAGS = -fno-builtin -Wall
reactos/lib/wininet
diff -u -r1.1 -r1.2
--- Makefile 1 Feb 2004 21:33:56 -0000 1.1
+++ Makefile 29 May 2004 21:24:47 -0000 1.2
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 2004/02/01 21:33:56 gvg Exp $
+# $Id: Makefile,v 1.2 2004/05/29 21:24:47 hbirr Exp $
PATH_TO_TOP = ../..
@@ -6,7 +6,7 @@
TARGET_NAME = wininet
-TARGET_BASE = 0x70200000
+TARGET_BASE = $(TARGET_BASE_LIB_WININET)
# require os code to explicitly request A/W version of structs/functions
TARGET_CFLAGS += -Wall -Werror
reactos/lib/winmm
diff -u -r1.2 -r1.3
--- Makefile.ros-template 7 Mar 2004 14:33:13 -0000 1.2
+++ Makefile.ros-template 29 May 2004 21:24:47 -0000 1.3
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.2 2004/03/07 14:33:13 navaraf Exp $
+# $Id: Makefile.ros-template,v 1.3 2004/05/29 21:24:47 hbirr Exp $
TARGET_NAME = winmm
@@ -8,7 +8,7 @@
TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a
-TARGET_BASE = 0x777c0000
+TARGET_BASE = $(TARGET_BASE_LIB_WINMM)
TARGET_RC_SRCS = @RC_SRCS@
TARGET_RC_BINSRC = @RC_BINSRC@
reactos/lib/winspool
diff -u -r1.4 -r1.5
--- Makefile 13 Jan 2004 17:24:41 -0000 1.4
+++ Makefile 29 May 2004 21:24:47 -0000 1.5
@@ -10,7 +10,7 @@
TARGET_EXTENSION = .drv
-TARGET_BASE = 0x77800000
+TARGET_BASE = $(TARGET_BASE_LIB_WINSPOOL)
TARGET_CFLAGS = \
-I./include \
reactos/lib/ws2_32
diff -u -r1.13 -r1.14
--- makefile 11 Jan 2004 20:46:06 -0000 1.13
+++ makefile 29 May 2004 21:24:47 -0000 1.14
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.13 2004/01/11 20:46:06 navaraf Exp $
+# $Id: makefile,v 1.14 2004/05/29 21:24:47 hbirr Exp $
PATH_TO_TOP = ../..
@@ -6,7 +6,7 @@
TARGET_NAME = ws2_32
-TARGET_BASE = 0x77780000
+TARGET_BASE = $(TARGET_BASE_LIB_W2_32)
TARGET_CFLAGS = \
-I./include \
reactos/lib/ws2help
diff -u -r1.5 -r1.6
--- makefile 11 Jan 2004 20:46:06 -0000 1.5
+++ makefile 29 May 2004 21:24:47 -0000 1.6
@@ -6,7 +6,7 @@
TARGET_NAME = ws2help
-TARGET_BASE = 0x777c0000
+TARGET_BASE = $(TARGET_BASE_LIB_WS2HELP)
TARGET_CFLAGS = \
-I./include \
reactos/lib/wshirda
diff -u -r1.5 -r1.6
--- makefile 11 Jan 2004 20:46:06 -0000 1.5
+++ makefile 29 May 2004 21:24:47 -0000 1.6
@@ -6,7 +6,7 @@
TARGET_NAME = wshirda
-TARGET_BASE = 0x777c0000
+TARGET_BASE = $(TARGET_BASE_LIB_WSHIRDA)
TARGET_CFLAGS = -DUNICODE -D__USE_W32API -Werror -Wall
reactos/lib/wsock32
diff -u -r1.5 -r1.6
--- Makefile 11 Jan 2004 20:46:06 -0000 1.5
+++ Makefile 29 May 2004 21:24:48 -0000 1.6
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 2004/01/11 20:46:06 navaraf Exp $
+# $Id: Makefile,v 1.6 2004/05/29 21:24:48 hbirr Exp $
PATH_TO_TOP = ../..
@@ -6,7 +6,7 @@
TARGET_NAME = wsock32
-TARGET_BASE = 0x71ab0000
+TARGET_BASE = $(TARGET_BASE_LIB_WSOCK32)
TARGET_CFLAGS = \
-I./include \
reactos/tools
diff -u -r1.63 -r1.64
--- helper.mk 28 May 2004 18:16:46 -0000 1.63
+++ helper.mk 29 May 2004 21:24:48 -0000 1.64
@@ -1,4 +1,4 @@
-# $Id: helper.mk,v 1.63 2004/05/28 18:16:46 gvg Exp $
+# $Id: helper.mk,v 1.64 2004/05/29 21:24:48 hbirr Exp $
#
# Helper makefile for ReactOS modules
# Variables this makefile accepts:
@@ -55,7 +55,7 @@
# $SUBDIRS = Subdirs in which to run make (optional)
include $(PATH_TO_TOP)/config
-
+include $(PATH_TO_TOP)/baseaddress.cfg
ifeq ($(TARGET_PATH),)
TARGET_PATH := .
CVSspam 0.2.8