merge ROS Shell without integrated explorer part into trunk

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

diff --git a/reactos/subsys/system/explorer/Makefile.PCH b/reactos/subsys/system/explorer/Makefile.PCH
index 9baa028..6032ffd 100644 (file)
--- a/reactos/subsys/system/explorer/Makefile.PCH
+++ b/reactos/subsys/system/explorer/Makefile.PCH
@@ -10,7 +10,7 @@ CC = gcc
 CXX = g++
 LINK = g++
 
-CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -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
 
@@ -19,7 +19,7 @@ CFLAGS        += -D_DEBUG -g
 RCFLAGS        += -D_DEBUG
 LFLAGS += -g
 else
-CFLAGS += -DNDEBUG -Os
+CFLAGS += -DNDEBUG -Os -march=pentium4
 RCFLAGS        += -DNDEBUG
 LFLAGS += -s
 endif
@@ -39,7 +39,7 @@ CXXFLAGS = $(CFLAGS)
 EXEC_SUFFIX = .exe
 RES_SUFFIX = .coff
 
-VPATH = shell utility taskbar desktop dialogs
+VPATH = shell utility taskbar desktop dialogs services
 
 PROGRAM = explorer
 
@@ -69,6 +69,7 @@ OBJECTS = \
        desktopbar.o \
        taskbar.o \
        startmenu.o \
+       shellservices.o \
        traynotify.o \
        quicklaunch.o \
        favorites.o \
@@ -77,7 +78,7 @@ OBJECTS = \
        i386-stub-win32.o \
        xmlstorage.o
 
-LIBS = gdi32 comctl32 ole32 uuid
+LIBS = gdi32 comctl32 msimg32 ole32 uuid
 DELAYIMPORTS = oleaut32 wsock32
 
 all: precomp.h.gch $(TARGET)
@@ -88,26 +89,12 @@ precomp.h.gch: *.h utility/*.h shell/*.h desktop/*.h
 $(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
-       windres $(RCFLAGS) -o $@ $(PROGRAM)_intres.rc
+$(PROGRAM)$(RES_SUFFIX): explorer_intres.rc res/*.bmp res/*.ico
+       windres $(RCFLAGS) -o $@ explorer_intres.rc
 
 notifyhook.dll: notifyhook/notifyhook.c notifyhook/notifyhook.h
        $(CC) -D_WIN32_IE=0x0600 -Wall -D_NOTIFYHOOK_IMPL -Os -s notifyhook/notifyhook.c -shared -o $@
 
 clean:
-       rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) precomp.h.gch
-
-docu: doxy-footer.html
-       doxygen Doxyfile
-
-full-docu: docu
-       -cmd /c start /b /low /wait hhc doxy-doc\html\index.hhp
-       cmd /c move /y doxy-doc\html\index.chm ros-explorer.chm
-       doxygen Doxyfile-all
-       -cmd /c start /b /low /wait hhc doxy-doc\html\index.hhp
-       cmd /c move /y doxy-doc\html\index.chm ros-explorer-full.chm
-
-doxy-footer.html: ever
-       updatefooter
-
-ever:
+       rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) precomp.h.gch \
+       desktop/*.o dialogs/*.o shell/*.o taskbar/*.o utility/*.o