Home | History | Annotate | Download | only in patches
      1 --- pwlib/make/plugins.mak.ori	2006-03-20 19:37:21.938578000 +0800
      2 +++ pwlib/make/plugins.mak	2006-03-20 19:40:06.770193000 +0800
      3 @@ -14,7 +14,7 @@
      4  
      5  $(OBJDIR)/$(PLUGIN_FILENAME): $(PLUGIN_SOURCES)
      6  	mkdir -p $(OBJDIR)
      7 -	$(CPLUS) $(CFLAGS) $(STDCCFLAGS) \
      8 +	$(CPLUS) $(CXXFLAGS) $(STDCCFLAGS) $(STDCXXFLAGS) \
      9  	$(PLUGIN_LIBS) \
     10  	-I. $(LDSOPTS) $< -o $@
     11  
     12 --- pwlib/make/common.mak.ori	2006-03-20 19:40:29.104840000 +0800
     13 +++ pwlib/make/common.mak	2006-03-20 18:53:03.841785000 +0800
     14 @@ -313,7 +313,7 @@
     15  #
     16  $(OBJDIR)/%.o : %.cxx 
     17  	@if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
     18 -	$(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -c $< -o $@
     19 +	$(CPLUS) $(STDCCFLAGS) $(OPTCXXFLAGS) $(CXXFLAGS) $(STDCXXFLAGS) -c $< -o $@
     20  
     21  $(OBJDIR)/%.o : %.c 
     22  	@if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
     23 @@ -382,7 +382,7 @@
     24  # directory
     25  	@if [ ! -L $(OBJDIR)/lib ] ; then cd $(OBJDIR); ln -s $(PW_LIBDIR) lib; fi
     26  endif
     27 -	$(CPLUS) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS)
     28 +	$(CPLUS) -o $@ $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS)
     29  ifeq ($(OSTYPE),VxWorks)
     30  	$(LD)   --split-by-reloc 65535 -r   $(OBJS) -o $@ 
     31  endif
     32 @@ -416,7 +416,7 @@
     33  
     34  $(PWLIBDIR)/include/ptlib.h.gch: $(PWLIBDIR)/include/ptlib.h
     35  	@if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
     36 -	$(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -x c++ -c $< -o $@
     37 +	$(CPLUS) $(STDCCFLAGS) $(OPTCXXFLAGS) $(CXXFLAGS) $(STDCXXFLAGS) -c $< -o $@
     38  
     39  PCH	:= $(PWLIBDIR)/include/ptlib.h.gch
     40  
     41