From 0bde90913565dbfed57452fefa5d057504b5b87a Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Wed, 4 Aug 2004 18:22:41 +0000 Subject: [PATCH] - Fix compiling Explorer with precompiled headers. svn path=/trunk/; revision=10393 --- reactos/subsys/system/explorer/Makefile | 1 + reactos/tools/helper.mk | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/reactos/subsys/system/explorer/Makefile b/reactos/subsys/system/explorer/Makefile index ed0268503df..de556985380 100644 --- a/reactos/subsys/system/explorer/Makefile +++ b/reactos/subsys/system/explorer/Makefile @@ -49,6 +49,7 @@ TARGET_OBJECTS := \ utility/dragdropimpl.o \ utility/shellbrowserimpl.o \ utility/xmlstorage.o +TARGET_CPPAPP := yes TARGET_PCH := precomp.h SUBDIRS := notifyhook DEP_OBJECTS := $(TARGET_OBJECTS) diff --git a/reactos/tools/helper.mk b/reactos/tools/helper.mk index 62f690be658..2238dd359bd 100644 --- a/reactos/tools/helper.mk +++ b/reactos/tools/helper.mk @@ -1,4 +1,4 @@ -# $Id: helper.mk,v 1.74 2004/08/02 15:51:23 navaraf Exp $ +# $Id: helper.mk,v 1.75 2004/08/04 18:22:41 navaraf Exp $ # # Helper makefile for ReactOS modules # Variables this makefile accepts: @@ -888,6 +888,12 @@ ifeq ($(ROS_USE_PCH),yes) ifneq ($(TARGET_PCH),) MK_PCHNAME = $(TARGET_PCH).pch +ifeq ($(TARGET_CPPAPP),yes) +PCH_CC := $(CXX) +else +PCH_CC := $(CC) +endif + # GCC generates wrong dependencies for header files. MK_PCHFAKE = $(TARGET_PCH:.h=.o) $(MK_PCHFAKE): @@ -895,11 +901,11 @@ $(MK_PCHFAKE): $(MK_PCHNAME): depend.d - $(RTOUCH) $(MK_PCHNAME) - - $(CC) $(TARGET_CFLAGS) $(TARGET_PCH) + - $(PCH_CC) $(TARGET_CFLAGS) $(TARGET_PCH) depend.d: $(MK_PCHFAKE) - $(RTOUCH) depend.d - - $(CC) $(TARGET_CFLAGS) $(TARGET_PCH) -M -MF depend.d + - $(PCH_CC) $(TARGET_CFLAGS) $(TARGET_PCH) -M -MF depend.d include depend.d