diff --git a/reactos/subsys/system/explorer/Jamfile b/reactos/subsys/system/explorer/Jamfile index 42aafe75256..2c1c84316d8 100644 --- a/reactos/subsys/system/explorer/Jamfile +++ b/reactos/subsys/system/explorer/Jamfile @@ -51,7 +51,7 @@ exe explorer : uuid wsock32 oleaut32 + libexpat notifyhook.dll - libexpat.dll ; diff --git a/reactos/subsys/system/explorer/Makefile b/reactos/subsys/system/explorer/Makefile index 172c1119dda..79bf63e82ec 100644 --- a/reactos/subsys/system/explorer/Makefile +++ b/reactos/subsys/system/explorer/Makefile @@ -104,7 +104,7 @@ OBJECTS = \ i386-stub-win32.o \ xmlstorage.o -LIBS = gdi32 comctl32 ole32 uuid +LIBS = gdi32 comctl32 ole32 uuid expat DELAYIMPORTS = oleaut32 wsock32 .PHONY: all depends implib clean install dist bootcd depends @@ -129,8 +129,8 @@ ever: buildno.h: ../../../include/reactos/buildno.h $(CD_PREFIX)updatebuildno -$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) notifyhook.dll ..\..\..\lib\expat\libexpat.dll - $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS)) +$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) notifyhook.dll + $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS)) -L$(PATH_TO_TOP)/dk/w32/lib explorer$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico $(RC) $(RCFLAGS) -o $@ $(PROGRAM)_intres.rc diff --git a/reactos/subsys/system/explorer/Makefile.MinGW b/reactos/subsys/system/explorer/Makefile.MinGW index 4eb220c29d3..8a0ac4bdc84 100644 --- a/reactos/subsys/system/explorer/Makefile.MinGW +++ b/reactos/subsys/system/explorer/Makefile.MinGW @@ -73,12 +73,12 @@ OBJECTS = \ i386-stub-win32.o \ xmlstorage.o -LIBS = gdi32 comctl32 ole32 uuid +LIBS = gdi32 comctl32 ole32 uuid libexpat DELAYIMPORTS = oleaut32 wsock32 all: $(TARGET) -$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) notifyhook.dll libexpat.dll +$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) notifyhook.dll $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS)) explorer$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico