[ros-kernel] Re: Explorer Build Error

[Filip Navara]

Martin Fuchs wrote:

>Filip, there is currently one problem left with PCH when compiling explorer:
>The makefiles invoke gcc instead of g++, so you get errors when
>trying to generate precomp.h.gch.
>  
>
I'm aware of this problem. Fix is attached.

- Filip
-------------- next part --------------
--- tools/helper.mk	2 Aug 2004 15:51:23 -0000	1.74
+++ tools/helper.mk	4 Aug 2004 15:16:38 -0000
@@ -888,6 +888,12 @@
 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_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
 
--- subsys/system/explorer/Makefile	3 Aug 2004 20:04:47 -0000	1.41
+++ subsys/system/explorer/Makefile	4 Aug 2004 15:16:45 -0000
@@ -49,6 +49,7 @@
 	utility/dragdropimpl.o \
 	utility/shellbrowserimpl.o \
 	utility/xmlstorage.o
+TARGET_CPPAPP := yes
 TARGET_PCH := precomp.h
 SUBDIRS := notifyhook
 DEP_OBJECTS := $(TARGET_OBJECTS)