merge ROS Shell without integrated explorer part into trunk

[reactos.git] / reactos / subsys / system / explorer / Make-rosshell.MinGW

diff --git a/reactos/subsys/system/explorer/Make-rosshell.MinGW b/reactos/subsys/system/explorer/Make-rosshell.MinGW
index 9b6da9c..73ed02d 100644 (file)
--- a/reactos/subsys/system/explorer/Make-rosshell.MinGW
+++ b/reactos/subsys/system/explorer/Make-rosshell.MinGW
@@ -1,7 +1,7 @@
 #\r
-#  ReactOS lean shell\r
+#  ReactOS shell\r
 #\r
-#  Make-rosshell.MinGW\r
+#  Makefile.PCH\r
 #\r
 #  MinGW Makefile with precompiled header support\r
 #\r
@@ -10,7 +10,7 @@ CC = gcc
 CXX = g++\r
 LINK = g++\r
 \r
-CFLAGS = -DWIN32 -DROSSHELL -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -fexceptions -Wall -I.\r
+CFLAGS = -DWIN32 -DROSSHELL -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC)\r
 RCFLAGS        = -DWIN32 -DROSSHELL -D__WINDRES__\r
 LFLAGS = -Wl,--subsystem,windows\r
 \r
@@ -19,7 +19,7 @@ CFLAGS        += -D_DEBUG -g
 RCFLAGS        += -D_DEBUG\r
 LFLAGS += -g\r
 else\r
-CFLAGS += -DNDEBUG -Os -D_NO_CONTEXT\r
+CFLAGS += -DNDEBUG -Os -march=pentium4\r
 RCFLAGS        += -DNDEBUG\r
 LFLAGS += -s\r
 endif\r
@@ -31,6 +31,7 @@ endif
 ifeq ($(UNICODE),1)\r
 CFLAGS += -DUNICODE\r
 # LFLAGS+= -Wl,--entry,_wWinMain@16\r
+RCFLAGS += -DUNICODE\r
 endif\r
 \r
 CXXFLAGS = $(CFLAGS)\r
@@ -38,7 +39,7 @@ CXXFLAGS = $(CFLAGS)
 EXEC_SUFFIX = .exe\r
 RES_SUFFIX = .coff\r
 \r
-VPATH = shell utility taskbar desktop dialogs\r
+VPATH = shell utility taskbar desktop dialogs services\r
 \r
 PROGRAM = rosshell\r
 \r
@@ -55,29 +56,37 @@ OBJECTS = \
        entries.o \\r
        winfs.o \\r
        shellfs.o \\r
+       pane.o \\r
        desktop.o \\r
        desktopbar.o \\r
        taskbar.o \\r
        startmenu.o \\r
+       shellservices.o \\r
        traynotify.o \\r
        quicklaunch.o \\r
-       settings.o\r
+       favorites.o \\r
+       searchprogram.o \\r
+       settings.o \\r
+       i386-stub-win32.o \\r
+       xmlstorage.o\r
 \r
-LIBS = gdi32 comctl32 ole32 uuid\r
+LIBS = gdi32 comctl32 msimg32 ole32 uuid\r
+DELAYIMPORTS = oleaut32 wsock32\r
 \r
 all: precomp.h.gch $(TARGET)\r
 \r
 precomp.h.gch: *.h utility/*.h shell/*.h desktop/*.h\r
        $(CXX) $(CFLAGS) precomp.h\r
 \r
-$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX)\r
-       $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS))\r
+$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) notifyhook.dll libexpat.dll\r
+       $(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS))\r
 \r
 $(PROGRAM)$(RES_SUFFIX): explorer_intres.rc res/*.bmp res/*.ico\r
        windres $(RCFLAGS) -o $@ explorer_intres.rc\r
 \r
+notifyhook.dll: notifyhook/notifyhook.c notifyhook/notifyhook.h\r
+       $(CC) -D_WIN32_IE=0x0600 -Wall -D_NOTIFYHOOK_IMPL -Os -s notifyhook/notifyhook.c -shared -o $@\r
+\r
 clean:\r
        rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) precomp.h.gch \\r
        desktop/*.o dialogs/*.o shell/*.o taskbar/*.o utility/*.o\r
-\r
-ever:\r