10139N/AIndex: ptlib/make/common.mak

10139N/A===================================================================

10139N/A--- ptlib/make/common.mak (revision 21149)

10139N/A+++ ptlib/make/common.mak (working copy)

10139N/A@@ -84,11 +84,11 @@

10139N/A #

10139N/A $(OBJDIR)/%.o : %.cxx

10139N/A @if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi

10139N/A- $(CXX) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -c $< -o $@

10139N/A+ $(CXX) $(STDCCFLAGS) $(OPTCCFLAGS) $(CXXFLAGS) $(STDCXXFLAGS) -c $< -o $@

10139N/A

10139N/A $(OBJDIR)/%.o : %.cpp

10139N/A @if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi

10139N/A- $(CXX) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -c $< -o $@

10139N/A+ $(CXX) $(STDCCFLAGS) $(OPTCCFLAGS) $(CXXFLAGS) $(STDCXXFLAGS) -c $< -o $@

10139N/A

10139N/A $(OBJDIR)/%.o : %.c

10139N/A @if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi

10139N/A@@ -202,7 +202,7 @@

10139N/A USE_PCH:=no

10139N/A $(PTLIBDIR)/include/ptlib.h.gch/$(PT_OBJBASE): $(PTLIBDIR)/include/ptlib.h

10139N/A @if [ ! -d `dirname $@` ] ; then mkdir -p `dirname $@` ; fi

10139N/A- $(CXX) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -x c++ -c $< -o $@

10139N/A+ $(CXX) $(STDCCFLAGS) $(OPTCCFLAGS) $(CXXFLAGS) $(STDCXXFLAGS) -x c++ -c $< -o $@

10139N/A

10139N/A ifeq ($(USE_PCH),yes)

10139N/A PCH_FILES = $(PTLIBDIR)/include/ptlib.h.gch/$(PT_OBJBASE)

10139N/AIndex: ptlib/make/plugins.mak

10139N/A===================================================================

10139N/A--- ptlib/make/plugins.mak (revision 21149)

10139N/A+++ ptlib/make/plugins.mak (working copy)

10139N/A@@ -58,7 +58,7 @@

10139N/A

10139N/A $(OBJDIR)/$(PLUGIN_FILENAME): $(PLUGIN_SOURCES)

10139N/A mkdir -p $(OBJDIR)

10139N/A- $(CXX) $(CFLAGS) $(STDCCFLAGS) \

10139N/A+ $(CXX) $(CXXFLAGS) $(STDCCFLAGS) $(STDCXXFLAGS)\

10139N/A $(LDFLAGS) \

10139N/A $(PLUGIN_LIBS) \

10139N/A -I. $(LDSOPTS) $< -o $@

10139N/AIndex: ptlib/plugins/vidinput_v4l2/Makefile.in

10139N/A===================================================================

10139N/A--- ptlib/plugins/vidinput_v4l2/Makefile.in (revision 21139)

10139N/A+++ ptlib/plugins/vidinput_v4l2/Makefile.in (working copy)

10139N/A@@ -1,5 +1,5 @@

10139N/A HAS_LIBV4L = @HAS_LIBV4L@

10139N/A-CFLAGS += @V4L2_CFLAGS@

10139N/A+CXXFLAGS += @V4L2_CFLAGS@

10139N/A

10139N/A PLUGIN_NAME = v4l2

10139N/A PLUGIN_FAMILY = device/videoinput

10139N/AIndex: ptlib/make/unix.mak

10139N/A===================================================================

10139N/A--- ptlib/make/unix.mak (revision 21445)

10139N/A+++ ptlib/make/unix.mak (working copy)

10139N/A@@ -282,8 +282,8 @@

10139N/A

10139N/A # Solaris (Sunos 5.x)

10139N/A

10139N/A-CFLAGS +=-DSOLARIS -D__inline=inline

10139N/A-CXXFLAGS +=-DSOLARIS -D__inline=inline

10139N/A+CFLAGS +=-DSOLARIS -D__inline=inline -features=tmplife

10139N/A+CXXFLAGS +=-DSOLARIS -D__inline=inline -features=tmplife

10139N/A

10139N/A ifeq ($(MACHTYPE),x86)

10139N/A ifeq ($(USE_GCC),yes)

10139N/A