opensg-cvs/DefaultRules.patch

   1 --- DefaultRules.mk     2008-08-07 17:58:34.000000000 +0200
   2 +++ DefaultRules.mk.new 2009-12-10 20:32:15.000000000 +0100
   3 @@ -73,7 +73,7 @@
   4  $(OBJDIR)/%$(OBJ_SUFFIX): %.cpp
   5         @echo using BD = $$BD
   6         $(CC) $(CCFLAGS) $(CCLOCALFLAGS) $(COMPONLY_OPTION) $(INCL) \
   7 -       $(INC_OPTION)$(OBJDIR) $(INC_OPTION).                                           \
   8 +       $(INC_OPTION)$(OBJDIR) $(INCLUDE_EXTRA_QT4) $(INC_OPTION).                                              \
   9          $(OBJ_OPTION) $@ $< $($(PROJ)SODEF)
  10  $(OBJDIR)/%$(OBJ_SUFFIX): %.mm
  11         @echo using BD = $$BD
  12 @@ -163,7 +163,7 @@
  13         @-rm -f $@
  14         @echo '# Module dependencies' > $@
  15         @$(CC) $(DEPEND_OPTION) $< $(CCFLAGS) $(CCLOCALFLAGS) $(INCL)   \
  16 -        $(INC_OPTION)$(OBJDIR) $(INC_OPTION).                                                  \
  17 +        $(INC_OPTION)$(OBJDIR) $(INC_OPTION). $(INCLUDE_EXTRA_QT4)                                                     \
  18          | $(SED) -e 's/^\([^:]*:\)/$(OBJDIR)\/\1/1'                                    \
  19                           -e 's/\/usr\/include\/[^ ]*//g'                                               \
  20                           -e 's/\/usr\/Software\/[^ ]*//g'                                              \
  21 @@ -386,10 +386,10 @@
  22         $(MOC) $(call cnvUnix2Win,$<) -i -DOSG_WITH_QT -o $@
  23  else
  24  $(OBJDIR)/%_qt_moc.cpp: %_qt.h
  25 -       $(MOC) $< -i -DOSG_WITH_QT -I$(INCLUDE_QT4)/QtDesigner -o $@
  26 +       $(MOC) $< -DOSG_WITH_QT -I$(INCLUDE_QT4)/QtDesigner -o $@
  27
  28  $(OBJDIR)/%_qt_moc.cpp: %_qt.cpp
  29 -       $(MOC) $< -i -DOSG_WITH_QT -I$(INCLUDE_QT4)/QtDesigner -o $@
  30 +       $(MOC) $< -DOSG_WITH_QT -I$(INCLUDE_QT4)/QtDesigner $(INCLUDE_EXTRA_QT4) -o $@
  31  endif
  32  else
  33  ifeq ($(OS_BASE), cygwin)