merge ROS Shell without integrated explorer part into trunk

[reactos.git] / reactos / subsys / system / explorer / Makefile.MinGW

diff --git a/reactos/subsys/system/explorer/Makefile.MinGW b/reactos/subsys/system/explorer/Makefile.MinGW
index d635647..678fe28 100644 (file)
--- a/reactos/subsys/system/explorer/Makefile.MinGW
+++ b/reactos/subsys/system/explorer/Makefile.MinGW
@@ -9,7 +9,7 @@ CXX = g++
 LINK = g++
 
 # -D_NO_ALPHABLEND for builds without msimg32.dll dependency
-CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I.
+CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC)
 RCFLAGS        = -DWIN32 -D__WINDRES__
 LFLAGS = -Wl,--subsystem,windows
 
@@ -38,7 +38,7 @@ CXXFLAGS = $(CFLAGS)
 EXEC_SUFFIX = .exe
 RES_SUFFIX = .coff
 
-VPATH = shell utility taskbar desktop dialogs
+VPATH = shell utility taskbar desktop dialogs services
 
 PROGRAM = explorer
 
@@ -51,6 +51,7 @@ OBJECTS = \
        window.o \
        dragdropimpl.o \
        shellbrowserimpl.o \
+       shellservices.o \
        explorer.o \
        entries.o \
        winfs.o \
@@ -84,7 +85,7 @@ all: $(TARGET)
 $(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) notifyhook.dll libexpat.dll
        $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS))
 
-explorer$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico
+$(PROGRAM)$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico
        windres $(RCFLAGS) -o $@ $(PROGRAM)_intres.rc
 
 notifyhook.dll: notifyhook/notifyhook.c notifyhook/notifyhook.h