diff --git a/reactos/baseaddress.cfg b/reactos/baseaddress.cfg index d4002dc21a0..581caefe622 100644 --- a/reactos/baseaddress.cfg +++ b/reactos/baseaddress.cfg @@ -8,6 +8,7 @@ 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 diff --git a/reactos/lib/expat/Makefile b/reactos/lib/expat/Makefile index 9db75454e81..c7c0db74b21 100644 --- a/reactos/lib/expat/Makefile +++ b/reactos/lib/expat/Makefile @@ -1,48 +1,29 @@ -# -# MinGW Makefile for expat -# -# Martin Fuchs, 24.03.2003 -# +# $Id: Makefile,v 1.2 2004/03/24 09:39:37 mf Exp $ PATH_TO_TOP = ../.. -TOOLS_PATH = $(PATH_TO_TOP)/tools -CC = gcc -LINK = gcc +TARGET_NAME = libexpat -CFLAGS = -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions -DWIN32 -DHAVE_EXPAT_CONFIG_H -LFLAGS = -shared +TARGET_TYPE = dynlink +TARGET_BASE = 0x79000000 +TARGET_NORC = yes +TARGET_DEFONLY = yes +TARGET_DEFNAME = lib/libexpat -ifdef DEBUG -CFLAGS += -g -LFLAGS += -g -else -CFLAGS += -Os -LFLAGS += -s -endif +TARGET_CFLAGS = -D__USE_W32API -DHAVE_EXPAT_CONFIG_H -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions +TARGET_LFLAGS = -nostartfiles -VPATH = lib +LIB_OBJECTS = \ + lib/xmlparse.o \ + lib/xmlrole.o \ + lib/xmltok.o -DLL_SUFIX = .dll +TARGET_OBJECTS = $(LIB_OBJECTS) -LIBRARY = libexpat$(DLL_SUFIX) +DEP_OBJECTS = $(TARGET_OBJECTS) -LIB_OBJS = \ - xmlparse.o \ - xmlrole.o \ - xmltok.o +include $(PATH_TO_TOP)/rules.mak -all: $(LIBRARY) +include $(TOOLS_PATH)/helper.mk -$(LIBRARY): $(LIB_OBJS) libexpat.def - $(LINK) $(LFLAGS) -o $@ $^ - -clean: - $(TOOLS_PATH)/rdel $(LIBRARY) $(LIB_OBJS) - -implib: - -install: - -$(TOOLS_PATH)/rcopy $(LIBRARY) $(INSTALL_DIR)/system32/$(LIBRARY) - -bootcd: +include $(TOOLS_PATH)/depend.mk