reactos/subsys/system/explorer
diff -u -r1.11 -r1.12
--- Jamfile 21 Mar 2004 23:36:23 -0000 1.11
+++ Jamfile 24 Mar 2004 10:34:21 -0000 1.12
@@ -51,7 +51,7 @@
<find-shared-library>uuid
<find-shared-library>wsock32
<find-shared-library>oleaut32
+ <find-shared-library>libexpat
<linkflags>notifyhook.dll
- <linkflags>libexpat.dll
;
reactos/subsys/system/explorer
diff -u -r1.30 -r1.31
--- Makefile 24 Mar 2004 00:19:15 -0000 1.30
+++ Makefile 24 Mar 2004 10:34:21 -0000 1.31
@@ -104,7 +104,7 @@
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 @@
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
reactos/subsys/system/explorer
diff -u -r1.19 -r1.20
--- Makefile.MinGW 21 Mar 2004 23:36:23 -0000 1.19
+++ Makefile.MinGW 24 Mar 2004 10:34:21 -0000 1.20
@@ -73,12 +73,12 @@
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