From 5f4568b89610e1f552da9179ddc9690e475f2441 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Wed, 4 Nov 1998 22:44:50 +0000 Subject: [PATCH] Fixed problems with toolkits cflags not being used --- widget/src/xpwidgets/Makefile.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/widget/src/xpwidgets/Makefile.in b/widget/src/xpwidgets/Makefile.in index 9dcdec3694cb..46bf94702c97 100644 --- a/widget/src/xpwidgets/Makefile.in +++ b/widget/src/xpwidgets/Makefile.in @@ -22,17 +22,20 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/config.mk LIBRARY_NAME = raptorbasewidget_s #LCFLAGS=-D_IMPL_NS_WIDGET -ifeq ($(OS_TARGET),Rhapsody) -INCLUDES += -I$(PUBLIC)/xpcom -I$(PUBLIC)/raptor -I$(srcdir)/../rhapsody +INCLUDES += -I$(PUBLIC)/xpcom -I$(PUBLIC)/raptor -I$(srcdir)/../$(MOZ_TOOLKIT) -I$(srcdir) + +ifneq (,$(filter gtk, $(MOZ_TOOLKIT))) +CFLAGS += $(TK_GTK_CFLAGS) else -INCLUDES += -I$(srcdir)/../public -I$(PUBLIC)/xpcom -I$(PUBLIC)/raptor -I$(srcdir)/../$(MOZ_TOOLKIT) -I$(srcdir)/. +ifneq (,$(filter gtk, $(MOZ_TOOLKIT))) +CFLAGS += $(TK_MOTIF_CFLAGS) +endif endif CPPSRCS=nsBaseWidget.cpp \