From b9d355dbb5862295ada5ae3b33900489cb259732 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Tue, 21 Oct 2003 21:38:09 +0000
Subject: [PATCH] replace old makefile by new MinGW makefile to fix resource
 compilation problems using cross compilers

svn path=/trunk/; revision=6398
---
 reactos/subsys/system/explorer/Makefile       | 80 +++++++++++++++++
 .../system/explorer/desktop/desktop.cpp       |  2 +-
 reactos/subsys/system/explorer/makefile_rex   | 85 -------------------
 3 files changed, 81 insertions(+), 86 deletions(-)
 create mode 100644 reactos/subsys/system/explorer/Makefile
 delete mode 100644 reactos/subsys/system/explorer/makefile_rex

diff --git a/reactos/subsys/system/explorer/Makefile b/reactos/subsys/system/explorer/Makefile
new file mode 100644
index 00000000000..fed1c7ee1e2
--- /dev/null
+++ b/reactos/subsys/system/explorer/Makefile
@@ -0,0 +1,80 @@
+#
+#  ReactOS explorer
+#
+#  Makefile
+#
+
+CC = gcc
+CXX = g++
+LINK = g++
+
+CFLAGS	= -DWIN32 -D_ROS_ -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -fexceptions -Wall
+RCFLAGS	= -DWIN32 -D_ROS_
+LFLAGS	= -Wl,--subsystem,windows
+
+ifdef DEBUG
+CFLAGS	+= -D_DEBUG -g
+RCFLAGS	+= -D_DEBUG
+LFLAGS	+= -g
+else
+CFLAGS	+= -DNDEBUG -Os
+RCFLAGS	+= -DNDEBUG
+LFLAGS	+= -s
+endif
+
+ifdef UNICODE
+CFLAGS	+= -DUNICODE
+# LFLAGS+= -Wl,--entry,_wWinMain@16
+endif
+
+CXXFLAGS = $(CFLAGS)
+
+EXEC_SUFFIX = .exe
+RES_SUFFIX = .coff
+
+VPATH = shell utility taskbar desktop dialogs
+
+PROGRAM = explorer
+
+TARGET = $(PROGRAM)$(EXEC_SUFFIX)
+
+OBJECTS = \
+	startup.o \
+	shellclasses.o \
+	utility.o \
+	window.o \
+	dragdropimpl.o \
+	shellbrowserimpl.o \
+	explorer.o \
+	entries.o \
+	winfs.o \
+	unixfs.o \
+	shellfs.o \
+	mainframe.o \
+	filechild.o \
+	pane.o \
+	shellbrowser.o \
+	desktop.o \
+	desktopbar.o \
+	taskbar.o \
+	startmenu.o \
+	traynotify.o \
+	quicklaunch.o \
+	searchprogram.o
+
+LIBS = gdi32 comctl32 ole32 uuid
+
+all: buildno.h $(TARGET)
+
+buildno.h: ../../../include/reactos/buildno.h
+	updatebuildno
+
+$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX)
+	$(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS))
+
+explorer$(RES_SUFFIX): $(PROGRAM)_intres.rc
+	windres $(RCFLAGS) -o $@ $^
+
+clean:
+	rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX)
+
diff --git a/reactos/subsys/system/explorer/desktop/desktop.cpp b/reactos/subsys/system/explorer/desktop/desktop.cpp
index 88c13d6fd60..a36b25255cd 100644
--- a/reactos/subsys/system/explorer/desktop/desktop.cpp
+++ b/reactos/subsys/system/explorer/desktop/desktop.cpp
@@ -130,7 +130,7 @@ HWND DesktopWindow::Create()
 					0, 0, width, height, 0);
 
 	 // work around to display desktop bar in Wine
-	ShowWindow(GET_WINDOW(DesktopWindow, hwndDesktop)->_desktopBar, SW_SHOW);
+//@@disabled	ShowWindow(GET_WINDOW(DesktopWindow, hwndDesktop)->_desktopBar, SW_SHOW);
 
 	 // work around for Windows NT, Win 98, ...
 	 // Without this the desktop has mysteriously only a size of 800x600 pixels.
diff --git a/reactos/subsys/system/explorer/makefile_rex b/reactos/subsys/system/explorer/makefile_rex
deleted file mode 100644
index 2fbed4c00a5..00000000000
--- a/reactos/subsys/system/explorer/makefile_rex
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-#  ReactOS explorer
-#
-#  Makefile
-#
-
-PATH_TO_TOP = ../../..
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = windows
-
-TARGET_NAME = explorer
-
-TARGET_CFLAGS = -fexceptions -Os -DNDEBUG -DWIN32 -D_ROS_ -Wall -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501
-	
-TARGET_CPPFLAGS = -fexceptions -Os -DNDEBUG -DWIN32 -D_ROS_ -Wall -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501
-
-TARGET_RCFLAGS = -DNDEBUG -DWIN32 -D_ROS_
-
-ifdef UNICODE
-TARGET_CFLAGS += -DUNICODE
-TARGET_CPPFLAGS += -DUNICODE
-# MK_DEFENTRY = _wWinMain@16
-endif
-
-VPATH += shell
-VPATH += utility
-VPATH += taskbar
-VPATH += desktop
-VPATH += dialogs
-
-WINE_MODE = yes
-
-WINE_RC = $(TARGET_NAME)
-
-WINE_INCLUDE = ./
-
-TARGET_GCCLIBS = comctl32 ole32 uuid stdc++
-
-all: buildno.h explorer.exe
-	@strip explorer.exe
-
-buildno.h: ../../../include/reactos/buildno.h
-	updatebuildno
-
-TARGET_SDKLIBS = \
-	kernel32.a \
-	user32.a \
-	gdi32.a \
-	advapi32.a \
-	version.a
-
-TARGET_OBJECTS = \
-	startup.o \
-	shellclasses.o \
-	utility.o \
-	window.o \
-	dragdropimpl.o \
-	shellbrowserimpl.o \
-	explorer.o \
-	entries.o \
-	winfs.o \
-	unixfs.o \
-	shellfs.o \
-	mainframe.o \
-	filechild.o \
-	pane.o \
-	shellbrowser.o \
-	desktop.o \
-	desktopbar.o \
-	taskbar.o \
-	startmenu.o \
-	traynotify.o \
-	quicklaunch.o \
-	searchprogram.o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# overide LD_CC to use g++ for linking of the executable
-LD_CC = $(CXX)
-
-# EOF