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