diff --git a/reactos/baseaddress.cfg b/reactos/baseaddress.cfg index 581caefe622..c149050787f 100644 --- a/reactos/baseaddress.cfg +++ b/reactos/baseaddress.cfg @@ -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 diff --git a/reactos/lib/advapi32/makefile b/reactos/lib/advapi32/makefile index b744dab612a..e4ff8528f03 100644 --- a/reactos/lib/advapi32/makefile +++ b/reactos/lib/advapi32/makefile @@ -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_LFLAGS = -nostartfiles -nostdlib TARGET_SDKLIBS = ntdll.a kernel32.a libwine.a msvcrt.a -TARGET_BASE = 0x77DB0000 +TARGET_BASE = $(TARGET_BASE_LIB_ADVAPI32) MISC_OBJECTS = \ misc/dllmain.o \ diff --git a/reactos/lib/cabinet/Makefile.ros-template b/reactos/lib/cabinet/Makefile.ros-template index 1703af0db2c..fb90c0d5dd5 100644 --- a/reactos/lib/cabinet/Makefile.ros-template +++ b/reactos/lib/cabinet/Makefile.ros-template @@ -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_CFLAGS = @EXTRADEFS@ -D__REACTOS__ 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@ diff --git a/reactos/lib/cards/Makefile b/reactos/lib/cards/Makefile index 39e65e71294..7453c66d5f6 100644 --- a/reactos/lib/cards/Makefile +++ b/reactos/lib/cards/Makefile @@ -4,7 +4,7 @@ TARGET_TYPE = dynlink TARGET_NAME = cards -TARGET_BASE = 0x701a0000 +TARGET_BASE = $(TARGET_BASE_LIB_CARDS) TARGET_CFLAGS = -fno-builtin -D__USE_W32API diff --git a/reactos/lib/comctl32/Makefile.ros-template b/reactos/lib/comctl32/Makefile.ros-template index fff925149ff..37272100b65 100644 --- a/reactos/lib/comctl32/Makefile.ros-template +++ b/reactos/lib/comctl32/Makefile.ros-template @@ -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_CFLAGS = @EXTRADEFS@ -D__REACTOS__ 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@ diff --git a/reactos/lib/comdlg32/Makefile.ros-template b/reactos/lib/comdlg32/Makefile.ros-template index f470da9de14..5fc6347b0f4 100644 --- a/reactos/lib/comdlg32/Makefile.ros-template +++ b/reactos/lib/comdlg32/Makefile.ros-template @@ -7,7 +7,7 @@ TARGET_CFLAGS = -D__REACTOS__ @EXTRADEFS@ 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@ diff --git a/reactos/lib/commctrl/Makefile b/reactos/lib/commctrl/Makefile index c1a29b85932..ee15267ac76 100644 --- a/reactos/lib/commctrl/Makefile +++ b/reactos/lib/commctrl/Makefile @@ -5,7 +5,7 @@ TARGET_TYPE = dynlink 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 diff --git a/reactos/lib/coredll/Makefile b/reactos/lib/coredll/Makefile index 0643ca69d63..b6c109e1393 100644 --- a/reactos/lib/coredll/Makefile +++ b/reactos/lib/coredll/Makefile @@ -5,7 +5,7 @@ TARGET_TYPE = dynlink 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 diff --git a/reactos/lib/cpl/sysdm/Makefile b/reactos/lib/cpl/sysdm/Makefile index a4640c9451f..20f88d4b9b8 100644 --- a/reactos/lib/cpl/sysdm/Makefile +++ b/reactos/lib/cpl/sysdm/Makefile @@ -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_NAME = sysdm TARGET_INSTALLDIR = system32 -TARGET_BASE = 0x58760000 +TARGET_BASE = $(TARGET_BASE_LIB_CPL_SYSDM) TARGET_CFLAGS = \ -I./include \ diff --git a/reactos/lib/crtdll/makefile b/reactos/lib/crtdll/makefile index 5c596be696d..696e3a6c342 100644 --- a/reactos/lib/crtdll/makefile +++ b/reactos/lib/crtdll/makefile @@ -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_TYPE = dynlink TARGET_NAME = crtdll -TARGET_BASE = 0x77630000 +TARGET_BASE = $(TARGET_BASE_LIB_CRTDLL) TARGET_LFLAGS = -nostartfiles -nostdlib diff --git a/reactos/lib/d3d8thk/Makefile b/reactos/lib/d3d8thk/Makefile index 7d6374518f3..ee0dd9deecc 100644 --- a/reactos/lib/d3d8thk/Makefile +++ b/reactos/lib/d3d8thk/Makefile @@ -4,7 +4,7 @@ TARGET_TYPE = dynlink 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 diff --git a/reactos/lib/devmgr/Makefile b/reactos/lib/devmgr/Makefile index 0e66fd2705d..434e610f38a 100644 --- a/reactos/lib/devmgr/Makefile +++ b/reactos/lib/devmgr/Makefile @@ -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_NAME = devmgr TARGET_INSTALLDIR = system32 -TARGET_BASE = 0x72A90000 +TARGET_BASE = $(TARGET_BASE_LIB_DEVMGR) TARGET_CFLAGS = \ -I./include \ diff --git a/reactos/lib/dinput/Makefile b/reactos/lib/dinput/Makefile index 3665693b6b7..127f4a07731 100644 --- a/reactos/lib/dinput/Makefile +++ b/reactos/lib/dinput/Makefile @@ -14,6 +14,8 @@ TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror TARGET_SDKLIBS = ntdll.a gdi32.a +TARGET_BASE = $(TARGET_BASE_LIB_DINPUT) + TARGET_OBJECTS = \ dinput.o diff --git a/reactos/lib/dnsapi/Makefile b/reactos/lib/dnsapi/Makefile index 83e88f591dc..3841062eff1 100644 --- a/reactos/lib/dnsapi/Makefile +++ b/reactos/lib/dnsapi/Makefile @@ -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_TYPE = dynlink TARGET_NAME = dnsapi -TARGET_BASE = 0x78000000 +TARGET_BASE = $(TARGET_BASE_LIB_DNSAPI) TARGET_LFLAGS = -nostartfiles -g --kill-at diff --git a/reactos/lib/dsound/Makefile b/reactos/lib/dsound/Makefile index e1176a82304..ea71955204c 100644 --- a/reactos/lib/dsound/Makefile +++ b/reactos/lib/dsound/Makefile @@ -14,6 +14,8 @@ TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror TARGET_SDKLIBS = ntdll.a gdi32.a +TARGET_BASE = $(TARGET_BASE_LIB_DSOUND) + TARGET_OBJECTS = \ dsound.o diff --git a/reactos/lib/expat/Makefile b/reactos/lib/expat/Makefile index c7c0db74b21..a1de9e0c7a0 100644 --- a/reactos/lib/expat/Makefile +++ b/reactos/lib/expat/Makefile @@ -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 diff --git a/reactos/lib/fmifs/makefile b/reactos/lib/fmifs/makefile index a04e7ea675b..7038f4ae836 100644 --- a/reactos/lib/fmifs/makefile +++ b/reactos/lib/fmifs/makefile @@ -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_TYPE = dynlink TARGET_NAME = fmifs -TARGET_BASE = 0x76df0000 +TARGET_BASE = $(TARGET_BASE_LIB_FMIFS) TARGET_ENTRY = _InitializeFmIfs@12 diff --git a/reactos/lib/gdi32/makefile b/reactos/lib/gdi32/makefile index 1e4d98f5d61..e28ca6e1ae6 100644 --- a/reactos/lib/gdi32/makefile +++ b/reactos/lib/gdi32/makefile @@ -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_TYPE = dynlink TARGET_NAME = gdi32 -TARGET_BASE = 0x77ed0000 +TARGET_BASE = $(TARGET_BASE_LIB_GDI32) TARGET_SDKLIBS = rosrtl.a ntdll.a advapi32.a kernel32.a diff --git a/reactos/lib/glu32/Makefile b/reactos/lib/glu32/Makefile index cc690069010..c29375c8f14 100644 --- a/reactos/lib/glu32/Makefile +++ b/reactos/lib/glu32/Makefile @@ -6,6 +6,8 @@ TARGET_NORC = yes 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) diff --git a/reactos/lib/imagehlp/makefile b/reactos/lib/imagehlp/makefile index 27c6b512c0d..bf310baef35 100644 --- a/reactos/lib/imagehlp/makefile +++ b/reactos/lib/imagehlp/makefile @@ -36,7 +36,7 @@ TARGET_LFLAGS = -nostartfiles -nostdlib TARGET_SDKLIBS = libwine.a ntdll.a kernel32.a -TARGET_BASE = 0x76C90000 +TARGET_BASE = $(TARGET_BASE_LIB_IMAGEHLP) TARGET_OBJECTS = \ debug.o \ diff --git a/reactos/lib/imm32/Makefile b/reactos/lib/imm32/Makefile index 43cc3a66d13..8557e798a6c 100644 --- a/reactos/lib/imm32/Makefile +++ b/reactos/lib/imm32/Makefile @@ -5,7 +5,7 @@ TARGET_TYPE = dynlink 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 diff --git a/reactos/lib/iphlpapi/Makefile.ros-template b/reactos/lib/iphlpapi/Makefile.ros-template index 622389c6314..50b1c6f7cdd 100644 --- a/reactos/lib/iphlpapi/Makefile.ros-template +++ b/reactos/lib/iphlpapi/Makefile.ros-template @@ -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_CFLAGS = @EXTRADEFS@ -D__REACTOS__ 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@ diff --git a/reactos/lib/iprtprio/makefile b/reactos/lib/iprtprio/makefile index deaab01ef7b..5f1d34d6671 100644 --- a/reactos/lib/iprtprio/makefile +++ b/reactos/lib/iprtprio/makefile @@ -6,7 +6,7 @@ TARGET_TYPE = dynlink TARGET_NAME = iprtprio -TARGET_BASE = 0x777c0000 +TARGET_BASE = $(TARGET_BASE_LIB_IPRTPRIO) TARGET_CFLAGS = -DUNICODE diff --git a/reactos/lib/kernel32/makefile b/reactos/lib/kernel32/makefile index ba3a3f9ee0a..3ac8a5e71c7 100644 --- a/reactos/lib/kernel32/makefile +++ b/reactos/lib/kernel32/makefile @@ -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_TYPE = dynlink 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 diff --git a/reactos/lib/lzexpand/Makefile b/reactos/lib/lzexpand/Makefile index 6e713ca9d4a..b7ec8925be5 100644 --- a/reactos/lib/lzexpand/Makefile +++ b/reactos/lib/lzexpand/Makefile @@ -5,7 +5,7 @@ TARGET_TYPE = dynlink 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 diff --git a/reactos/lib/mmdrv/Makefile b/reactos/lib/mmdrv/Makefile index 7f1ab6cbf92..cff30e3f81e 100644 --- a/reactos/lib/mmdrv/Makefile +++ b/reactos/lib/mmdrv/Makefile @@ -16,6 +16,8 @@ TARGET_LFLAGS = TARGET_SDKLIBS = winmm.a +TARGET_BASE = $(TARGET_BASE_LIB_MMDRV) + TARGET_OBJECTS = \ auxil.o \ entry.o \ diff --git a/reactos/lib/mpr/Makefile.ros-template b/reactos/lib/mpr/Makefile.ros-template index f11beb5deb4..410ed9a553f 100644 --- a/reactos/lib/mpr/Makefile.ros-template +++ b/reactos/lib/mpr/Makefile.ros-template @@ -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_CFLAGS = -D__REACTOS__ TARGET_SDKLIBS = @IMPORTS@ kernel32.a libwine.a ntdll.a -TARGET_BASE = 0x76620000 +TARGET_BASE = $(TARGET_BASE_LIB_MPR) TARGET_NORC = yes diff --git a/reactos/lib/msacm/Makefile.ros-template b/reactos/lib/msacm/Makefile.ros-template index 42e0d76161d..ad08d203471 100644 --- a/reactos/lib/msacm/Makefile.ros-template +++ b/reactos/lib/msacm/Makefile.ros-template @@ -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_CFLAGS = @EXTRADEFS@ -D__REACTOS__ 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@ diff --git a/reactos/lib/msafd/makefile b/reactos/lib/msafd/makefile index 7de028e97d3..e58319aef80 100644 --- a/reactos/lib/msafd/makefile +++ b/reactos/lib/msafd/makefile @@ -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_TYPE = dynlink TARGET_NAME = msafd -TARGET_BASE = 0x777a0000 +TARGET_BASE = $(TARGET_BASE_LIB_MSAFD) TARGET_SDKLIBS = ntdll.a kernel32.a diff --git a/reactos/lib/msgina/Makefile b/reactos/lib/msgina/Makefile index 395e7200c8b..8c49998ade6 100644 --- a/reactos/lib/msgina/Makefile +++ b/reactos/lib/msgina/Makefile @@ -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_NAME = msgina TARGET_INSTALLDIR = system32 -TARGET_BASE = 0x75970000 +TARGET_BASE = $(TARGET_BASE_LIB_MSGINA) TARGET_CFLAGS = \ -I./include \ diff --git a/reactos/lib/msimg32/Makefile b/reactos/lib/msimg32/Makefile index c7f4b9d093e..beb73ae5edf 100644 --- a/reactos/lib/msimg32/Makefile +++ b/reactos/lib/msimg32/Makefile @@ -4,7 +4,7 @@ TARGET_TYPE = dynlink TARGET_NAME = msimg32 -TARGET_BASE = 0x69cc0000 +TARGET_BASE = $(TARGET_BASE_LIB_MSIMG32) TARGET_CFLAGS = -fno-builtin -D__USE_W32API diff --git a/reactos/lib/msvcrt/Makefile b/reactos/lib/msvcrt/Makefile index 381e1fe61d1..4598b157c81 100644 --- a/reactos/lib/msvcrt/Makefile +++ b/reactos/lib/msvcrt/Makefile @@ -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_TYPE = dynlink TARGET_NAME = msvcrt -TARGET_BASE = 0x78000000 +TARGET_BASE = $(TARGET_BASE_LIB_MSVCRT) TARGET_LFLAGS = -nostartfiles --enable-stdcall-fixup diff --git a/reactos/lib/msvcrt20/Makefile b/reactos/lib/msvcrt20/Makefile index d69151d5c88..7b23526cd38 100644 --- a/reactos/lib/msvcrt20/Makefile +++ b/reactos/lib/msvcrt20/Makefile @@ -7,7 +7,7 @@ TARGET_TYPE = dynlink TARGET_NAME = msvcrt20 -TARGET_BASE = 0x78000000 +TARGET_BASE = $(TARGET_BASE_LIB_MSVCRT20) TARGET_LFLAGS = -nostartfiles --enable-stdcall-fixup diff --git a/reactos/lib/mswsock/Makefile b/reactos/lib/mswsock/Makefile index 4da4007311a..0c823e0af6d 100644 --- a/reactos/lib/mswsock/Makefile +++ b/reactos/lib/mswsock/Makefile @@ -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_TYPE = dynlink TARGET_NAME = mswsock -TARGET_BASE = 0x71a30000 +TARGET_BASE = $(TARGET_BASE_LIB_MSWSOCK) TARGET_CFLAGS = \ -I./include \ diff --git a/reactos/lib/netapi32/Makefile.ros-template b/reactos/lib/netapi32/Makefile.ros-template index e5f77377503..020cb509d69 100644 --- a/reactos/lib/netapi32/Makefile.ros-template +++ b/reactos/lib/netapi32/Makefile.ros-template @@ -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_CFLAGS = @EXTRADEFS@ -D__REACTOS__ 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@ diff --git a/reactos/lib/odbc32/Makefile.ros-template b/reactos/lib/odbc32/Makefile.ros-template index 3558498f02f..dd6b4e309ea 100644 --- a/reactos/lib/odbc32/Makefile.ros-template +++ b/reactos/lib/odbc32/Makefile.ros-template @@ -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_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -D__WINESRC__ 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@ diff --git a/reactos/lib/ole32/Makefile.ros-template b/reactos/lib/ole32/Makefile.ros-template index 699b5e7d552..3badc40a700 100644 --- a/reactos/lib/ole32/Makefile.ros-template +++ b/reactos/lib/ole32/Makefile.ros-template @@ -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_CFLAGS = @EXTRADEFS@ 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@ diff --git a/reactos/lib/oleaut32/Makefile.ros-template b/reactos/lib/oleaut32/Makefile.ros-template index d1d72c52409..00b2f1a5f75 100644 --- a/reactos/lib/oleaut32/Makefile.ros-template +++ b/reactos/lib/oleaut32/Makefile.ros-template @@ -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_CFLAGS = @EXTRADEFS@ -D__REACTOS__ 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@ diff --git a/reactos/lib/oledlg/Makefile.ros-template b/reactos/lib/oledlg/Makefile.ros-template index 9d93d9a4463..2e5401be943 100644 --- a/reactos/lib/oledlg/Makefile.ros-template +++ b/reactos/lib/oledlg/Makefile.ros-template @@ -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_CFLAGS = @EXTRADEFS@ 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@ diff --git a/reactos/lib/olepro32/Makefile.ros-template b/reactos/lib/olepro32/Makefile.ros-template index 833e09a6af2..8eb920c7d38 100644 --- a/reactos/lib/olepro32/Makefile.ros-template +++ b/reactos/lib/olepro32/Makefile.ros-template @@ -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_CFLAGS = @EXTRADEFS@ 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@ diff --git a/reactos/lib/opengl32/Makefile b/reactos/lib/opengl32/Makefile index 9a84d68e134..b3f181e628f 100644 --- a/reactos/lib/opengl32/Makefile +++ b/reactos/lib/opengl32/Makefile @@ -14,6 +14,8 @@ TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror TARGET_LFLAGS = -lgdi32 -lntdll +TARGET_BASE = $(TARGET_BASE_LIB_OPENGL32) + TARGET_SDKLIBS = gdi32.a ntdll.a # ntdll.a gdi32.a - may still need these diff --git a/reactos/lib/packet/makefile b/reactos/lib/packet/makefile index e5ae3e57e22..0146b1c8dfc 100644 --- a/reactos/lib/packet/makefile +++ b/reactos/lib/packet/makefile @@ -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_TYPE = dynlink 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 diff --git a/reactos/lib/psapi/makefile b/reactos/lib/psapi/makefile index 2e356b5f038..b16f5a63039 100644 --- a/reactos/lib/psapi/makefile +++ b/reactos/lib/psapi/makefile @@ -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_CFLAGS += -D_DISABLE_TIDENTS TARGET_LFLAGS = -nostartfiles -nostdlib -TARGET_BASE = 0x68F70000 +TARGET_BASE = $(TARGET_BASE_LIB_PSAPI) TARGET_OBJECTS = \ misc/dllmain.o \ diff --git a/reactos/lib/richedit/Makefile.ros-template b/reactos/lib/richedit/Makefile.ros-template index 1f793c6743d..c414a2ec84c 100644 --- a/reactos/lib/richedit/Makefile.ros-template +++ b/reactos/lib/richedit/Makefile.ros-template @@ -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_CFLAGS = @EXTRADEFS@ -D__REACTOS__ TARGET_SDKLIBS = @IMPORTS@ libwine.a ntdll.a -TARGET_BASE = 0x76340000 +TARGET_BASE = $(TARGET_BASE_LIB_RICHEDIT) TARGET_NORC = yes diff --git a/reactos/lib/rpcrt4/Makefile.ros-template b/reactos/lib/rpcrt4/Makefile.ros-template index c42d3e65d3e..eea98ecda7d 100644 --- a/reactos/lib/rpcrt4/Makefile.ros-template +++ b/reactos/lib/rpcrt4/Makefile.ros-template @@ -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_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -Wall 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@ diff --git a/reactos/lib/samlib/makefile b/reactos/lib/samlib/makefile index 3b8c34f5526..0450aa0e8dd 100644 --- a/reactos/lib/samlib/makefile +++ b/reactos/lib/samlib/makefile @@ -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_TYPE = dynlink TARGET_NAME = samlib -TARGET_BASE = 0x750C0000 +TARGET_BASE = $(TARGET_BASE_LIB_SAMLIB) TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a diff --git a/reactos/lib/secur32/Makefile b/reactos/lib/secur32/Makefile index 309d9a0f287..dbc03253b77 100644 --- a/reactos/lib/secur32/Makefile +++ b/reactos/lib/secur32/Makefile @@ -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_TYPE = dynlink TARGET_NAME = secur32 -TARGET_BASE = 0x10000000 +TARGET_BASE = $(TARGET_BASE_LIB_SECURE32) TARGET_SDKLIBS = ntdll.a diff --git a/reactos/lib/setupapi/Makefile.ros-template b/reactos/lib/setupapi/Makefile.ros-template index 3fb9999da99..c35c7be1a2c 100644 --- a/reactos/lib/setupapi/Makefile.ros-template +++ b/reactos/lib/setupapi/Makefile.ros-template @@ -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_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -D__WINESRC__ 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@ diff --git a/reactos/lib/shell32/Makefile.ros-template b/reactos/lib/shell32/Makefile.ros-template index 4273529bb6e..4f5efabbd62 100644 --- a/reactos/lib/shell32/Makefile.ros-template +++ b/reactos/lib/shell32/Makefile.ros-template @@ -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_CFLAGS = @EXTRADEFS@ -D__REACTOS__ 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@ diff --git a/reactos/lib/shlwapi/Makefile.ros-template b/reactos/lib/shlwapi/Makefile.ros-template index 484eebff1a1..b80d2f52f43 100644 --- a/reactos/lib/shlwapi/Makefile.ros-template +++ b/reactos/lib/shlwapi/Makefile.ros-template @@ -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_SDKLIBS = @IMPORTS@ msvcrt.a oleaut32.a libwine.a wine_uuid.a libwine_uni TARGET_NORC = yes -TARGET_BASE = 0x76120000 +TARGET_BASE = $(TARGET_BASE_LIB_SHLWAPI) default: all diff --git a/reactos/lib/snmpapi/makefile b/reactos/lib/snmpapi/makefile index ee30bb5fb97..f8ff755b2ac 100644 --- a/reactos/lib/snmpapi/makefile +++ b/reactos/lib/snmpapi/makefile @@ -6,7 +6,7 @@ TARGET_TYPE = dynlink TARGET_NAME = snmpapi -TARGET_BASE = 0x777c0000 +TARGET_BASE = $(TARGET_BASE_LIB_SNMPAPI) TARGET_CFLAGS = -DUNICODE diff --git a/reactos/lib/syssetup/Makefile b/reactos/lib/syssetup/Makefile index 28e11fd148e..8d774e9bf23 100644 --- a/reactos/lib/syssetup/Makefile +++ b/reactos/lib/syssetup/Makefile @@ -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_TYPE = dynlink 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 diff --git a/reactos/lib/twain/Makefile b/reactos/lib/twain/Makefile index 4bcb1adce2d..568eed8310d 100644 --- a/reactos/lib/twain/Makefile +++ b/reactos/lib/twain/Makefile @@ -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 @@ TARGET_NAME = twain_32 # 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 diff --git a/reactos/lib/unicode/Makefile.ros-template b/reactos/lib/unicode/Makefile.ros-template index 7cd7be5f5f1..dcd8e45abcb 100644 --- a/reactos/lib/unicode/Makefile.ros-template +++ b/reactos/lib/unicode/Makefile.ros-template @@ -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_SDKLIBS = @IMPORTS@ TARGET_NORC = yes -TARGET_BASE = 0x6b200000 +TARGET_BASE = $(TARGET_BASE_LIB_UNICODE) TARGET_DEFNAME = wine_unicode diff --git a/reactos/lib/user32/Makefile b/reactos/lib/user32/Makefile index fce7cbb080d..569239727e2 100644 --- a/reactos/lib/user32/Makefile +++ b/reactos/lib/user32/Makefile @@ -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_TYPE = dynlink TARGET_NAME = user32 -TARGET_BASE = 0x77e70000 +TARGET_BASE = $(TARGET_BASE_LIB_USER32) TARGET_SDKLIBS = libwine.a ntdll.a kernel32.a gdi32.a rosrtl.a diff --git a/reactos/lib/userenv/makefile b/reactos/lib/userenv/makefile index 571786f411d..18c5e800746 100644 --- a/reactos/lib/userenv/makefile +++ b/reactos/lib/userenv/makefile @@ -4,7 +4,7 @@ TARGET_TYPE = dynlink TARGET_NAME = userenv -TARGET_BASE = 0x74850000 +TARGET_BASE = $(TARGET_BASE_LIB_USERENV) TARGET_CFLAGS = -fno-builtin -D__USE_W32API -D_WIN32_IE=0x0400 diff --git a/reactos/lib/version/makefile b/reactos/lib/version/makefile index bd6ce205d55..241c563a66a 100644 --- a/reactos/lib/version/makefile +++ b/reactos/lib/version/makefile @@ -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_TYPE = dynlink TARGET_NAME = version -TARGET_BASE = 0x77a90000 +TARGET_BASE = $(TARGET_BASE_LIB_VERSION) TARGET_CFLAGS = -fno-builtin -Wall diff --git a/reactos/lib/wininet/Makefile b/reactos/lib/wininet/Makefile index 09155a774f9..f4af16c74ff 100644 --- a/reactos/lib/wininet/Makefile +++ b/reactos/lib/wininet/Makefile @@ -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_TYPE = dynlink 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 diff --git a/reactos/lib/winmm/Makefile.ros-template b/reactos/lib/winmm/Makefile.ros-template index ab57c63d688..e3594700e15 100644 --- a/reactos/lib/winmm/Makefile.ros-template +++ b/reactos/lib/winmm/Makefile.ros-template @@ -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_CFLAGS = @EXTRADEFS@ -D__REACTOS__ 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@ diff --git a/reactos/lib/winspool/Makefile b/reactos/lib/winspool/Makefile index b6919a1c1f1..e23c80b1000 100644 --- a/reactos/lib/winspool/Makefile +++ b/reactos/lib/winspool/Makefile @@ -10,7 +10,7 @@ TARGET_NAME = winspool TARGET_EXTENSION = .drv -TARGET_BASE = 0x77800000 +TARGET_BASE = $(TARGET_BASE_LIB_WINSPOOL) TARGET_CFLAGS = \ -I./include \ diff --git a/reactos/lib/ws2_32/makefile b/reactos/lib/ws2_32/makefile index 4ae2f75c270..ffcd59c2b13 100644 --- a/reactos/lib/ws2_32/makefile +++ b/reactos/lib/ws2_32/makefile @@ -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_TYPE = dynlink TARGET_NAME = ws2_32 -TARGET_BASE = 0x77780000 +TARGET_BASE = $(TARGET_BASE_LIB_W2_32) TARGET_CFLAGS = \ -I./include \ diff --git a/reactos/lib/ws2help/makefile b/reactos/lib/ws2help/makefile index dd805e3125e..ff141fc3c65 100644 --- a/reactos/lib/ws2help/makefile +++ b/reactos/lib/ws2help/makefile @@ -6,7 +6,7 @@ TARGET_TYPE = dynlink TARGET_NAME = ws2help -TARGET_BASE = 0x777c0000 +TARGET_BASE = $(TARGET_BASE_LIB_WS2HELP) TARGET_CFLAGS = \ -I./include \ diff --git a/reactos/lib/wshirda/makefile b/reactos/lib/wshirda/makefile index e3d71ffaf22..9ed5a074e09 100644 --- a/reactos/lib/wshirda/makefile +++ b/reactos/lib/wshirda/makefile @@ -6,7 +6,7 @@ TARGET_TYPE = dynlink TARGET_NAME = wshirda -TARGET_BASE = 0x777c0000 +TARGET_BASE = $(TARGET_BASE_LIB_WSHIRDA) TARGET_CFLAGS = -DUNICODE -D__USE_W32API -Werror -Wall diff --git a/reactos/lib/wsock32/Makefile b/reactos/lib/wsock32/Makefile index c3028278b0e..99d2d31c83e 100644 --- a/reactos/lib/wsock32/Makefile +++ b/reactos/lib/wsock32/Makefile @@ -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_TYPE = dynlink TARGET_NAME = wsock32 -TARGET_BASE = 0x71ab0000 +TARGET_BASE = $(TARGET_BASE_LIB_WSOCK32) TARGET_CFLAGS = \ -I./include \ diff --git a/reactos/tools/helper.mk b/reactos/tools/helper.mk index 1abf61ced50..0f4f56eaf10 100644 --- a/reactos/tools/helper.mk +++ b/reactos/tools/helper.mk @@ -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 := .