Mercurial Mercurial > upstream > oracle > spec-files / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/ptlib-01-cxxflags.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 16645 150e27c91287
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.

--- ptlib-2.6.4/plugins/vidinput_v4l2/Makefile.in.orig	2009-07-13 16:02:47.807797000 +0800
+++ ptlib-2.6.4/plugins/vidinput_v4l2/Makefile.in	2009-07-13 20:14:36.313989000 +0800
@@ -1,5 +1,5 @@
 HAS_LIBV4L = @HAS_LIBV4L@
-CFLAGS += @V4L2_CFLAGS@
+CXXFLAGS += @V4L2_CFLAGS@
 
 PLUGIN_NAME	= v4l2
 PLUGIN_FAMILY	= device/videoinput
--- ptlib-2.6.5/make/plugins.mak.ori	2009-09-24 09:15:45.548465658 +0100
+++ ptlib-2.6.5/make/plugins.mak	2009-09-24 09:17:17.763625587 +0100
@@ -58,7 +58,7 @@
 
 $(OBJDIR)/$(PLUGIN_FILENAME): $(PLUGIN_SOURCES)
 	@mkdir -p $(OBJDIR)
-	$(Q_CC)$(CXX) $(STDCCFLAGS) $(CFLAGS) \
+	$(Q_CC)$(CXX) $(STDCCFLAGS) $(STDCXXFLAGS) $(CXXFLAGS) \
 	$(LDSOPTS) $< \
 	$(PLUGIN_LIBS) \
 	$(LDFLAGS) \
upstream/oracle/spec-files