diff --git a/veejay-current/configure.ac b/veejay-current/configure.ac index 0431bfa8..9d3e7bf5 100644 --- a/veejay-current/configure.ac +++ b/veejay-current/configure.ac @@ -561,6 +561,9 @@ have_mips=false have_ppccpu=false have_ps2=false +OP_CFLAGS="" +YUVCFLAGS="-fif-conversion" + AC_MSG_CHECKING([Architecture]) case $host_cpu in i[[3-7]]86) @@ -571,8 +574,12 @@ case $host_cpu in PROGRAM_NOPIC="-fno-PIC" if test "x$enable_debug" != "xyes" ; then - CFLAGS="$CFLAGS -fif-conversion" + OP_CFLAGS="-O3" fi + + AC_SUBST( OP_CFLAGS ) + AC_SUBST( YUVCFLAGS ) + dnl If the host is pentium, align on double word boundary case $host_cpu in i686) @@ -1034,6 +1041,8 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([ Veejay ${VERSION} build configuration :]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([ Compiler flags: $CFLAGS]) +AC_MSG_NOTICE([ $YUVCFLAGS]) +AC_MSG_NOTICE([ $OP_CFLAGS]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([ Architecture: ${host_cpu} ]) AC_MSG_NOTICE([]) diff --git a/veejay-current/gveejay-reloaded/Makefile.am b/veejay-current/gveejay-reloaded/Makefile.am index cff2db75..0d57a0b4 100644 --- a/veejay-current/gveejay-reloaded/Makefile.am +++ b/veejay-current/gveejay-reloaded/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in MAINTAINERCLEANFILES = Makefile.in - +AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gveejay-reloaded -I$(top_srcdir)/liblzo $(GTK_CFLAGS) \ $(MJPEGTOOLS_CFLAGS) $(GLIB_CFLAGS) $(GLADE_CFLAGS) $(GTKCAIRO_CFLAGS) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGVEEJAY_DATADIR=\""$(gveejay_datadir)"\" diff --git a/veejay-current/libOSC/Makefile.am b/veejay-current/libOSC/Makefile.am index b5b9e164..1e4ea128 100644 --- a/veejay-current/libOSC/Makefile.am +++ b/veejay-current/libOSC/Makefile.am @@ -1,4 +1,5 @@ INCLUDES = -I$(top_srcdir)/libOSC -I$(includedir) +AM_CFLAGS=$(OP_CFLAGS) OSC_LIB_FILE = libOSC.la noinst_LTLIBRARIES = $(OSC_LIB_FILE) libOSC_la_CFLAGS = $(AM_CFLAGS) diff --git a/veejay-current/libel/Makefile.am b/veejay-current/libel/Makefile.am index 84a940fa..34cd4b65 100644 --- a/veejay-current/libel/Makefile.am +++ b/veejay-current/libel/Makefile.am @@ -1,7 +1,7 @@ # Makefile for veejay MAINTAINERCLEANFILES = Makefile.in - +AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem \ -I$(top_srcdir)/vjmsg \ $(MJPEGTOOLS_CFLAGS) ${FFMPEG_CFLAGS} ${PIXBUF_CFLAGS} \ diff --git a/veejay-current/libgoom/Makefile.am b/veejay-current/libgoom/Makefile.am index 3aed1749..bd86e089 100644 --- a/veejay-current/libgoom/Makefile.am +++ b/veejay-current/libgoom/Makefile.am @@ -1,4 +1,5 @@ MAINTAINERCLEANFILES=Makefile.in +AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libgoom GOOM_LIB_FILE = libgoom.la noinst_LTLIBRARIES = $(GOOM_LIB_FILE) diff --git a/veejay-current/libgoom/Makefile.in b/veejay-current/libgoom/Makefile.in index e1b33ca7..2fdd085d 100644 --- a/veejay-current/libgoom/Makefile.in +++ b/veejay-current/libgoom/Makefile.in @@ -234,6 +234,7 @@ MAKEINFO = @MAKEINFO@ MJPEGTOOLS_CFLAGS = @MJPEGTOOLS_CFLAGS@ MJPEGTOOLS_LIBS = @MJPEGTOOLS_LIBS@ OBJEXT = @OBJEXT@ +OP_CFLAGS = @OP_CFLAGS@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -267,6 +268,7 @@ USE_UNICAP_FALSE = @USE_UNICAP_FALSE@ USE_UNICAP_TRUE = @USE_UNICAP_TRUE@ V4LCONF_LIBS = @V4LCONF_LIBS@ VERSION = @VERSION@ +XINERAMA_LIBS = @XINERAMA_LIBS@ XMKMF = @XMKMF@ XML2_CONFIG = @XML2_CONFIG@ XML_CPPFLAGS = @XML_CPPFLAGS@ @@ -277,6 +279,7 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ YACC = @YACC@ YFLAGS = @YFLAGS@ +YUVCFLAGS = @YUVCFLAGS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ @@ -328,6 +331,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ MAINTAINERCLEANFILES = Makefile.in +AM_CFLAGS = $(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libgoom GOOM_LIB_FILE = libgoom.la noinst_LTLIBRARIES = $(GOOM_LIB_FILE) diff --git a/veejay-current/libhash/Makefile.am b/veejay-current/libhash/Makefile.am index cb2018f1..4bef6fbf 100644 --- a/veejay-current/libhash/Makefile.am +++ b/veejay-current/libhash/Makefile.am @@ -1,5 +1,6 @@ # Makefile for veejay MAINTAINERCLEANFILES=Makefile.in +AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(includedir) HASH_LIB_FILE = libhash.la noinst_LTLIBRARIES = $(HASH_LIB_FILE) diff --git a/veejay-current/liblavjpeg/Makefile.am b/veejay-current/liblavjpeg/Makefile.am index c8331acf..c7d9d7b2 100644 --- a/veejay-current/liblavjpeg/Makefile.am +++ b/veejay-current/liblavjpeg/Makefile.am @@ -1,5 +1,6 @@ # Makefile for veejay MAINTAINERCLEANFILES = Makefile.in +AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(includedir) ${JPEG_CFLAGS} -I$(top_srcdir)/libel $(MJPEGTOOLS_CFLAGS) $(JPEG_CFLAGS) LAVJPEG_LIB_FILE = liblavjpeg.la noinst_LTLIBRARIES = $(LAVJPEG_LIB_FILE) diff --git a/veejay-current/liblzo/Makefile.am b/veejay-current/liblzo/Makefile.am index 7223ef09..a46bb346 100644 --- a/veejay-current/liblzo/Makefile.am +++ b/veejay-current/liblzo/Makefile.am @@ -1,7 +1,7 @@ # Makefile for veejay MAINTAINERCLEANFILES = Makefile.in - +AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem \ -I$(top_srcdir)/vjmsg diff --git a/veejay-current/libsample/Makefile.am b/veejay-current/libsample/Makefile.am index 58deffb8..31a09afa 100644 --- a/veejay-current/libsample/Makefile.am +++ b/veejay-current/libsample/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg -I$(top_srcdir)/libhash \ ${MJPEGTOOLS_CFLAGS} ${FFMPEG_CFLAGS} ${XML_CFLAGS} ${XML_CPPFLAGS} - +AM_CFLAGS=$(OP_CFLAGS) SAMPLE_LIB_FILE = libsample.la noinst_LTLIBRARIES = $(SAMPLE_LIB_FILE) libsample_la_SOURCES = sampleadm.c diff --git a/veejay-current/libsamplerec/Makefile.am b/veejay-current/libsamplerec/Makefile.am index d2f8dfd7..53ffca7f 100644 --- a/veejay-current/libsamplerec/Makefile.am +++ b/veejay-current/libsamplerec/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir) -I$(includedir)\ -I$(top_srcdir)/vjmsg \ -I$(top_srcdir)/libel \ $(MJPEGTOOLS_CFLAGS) ${XML_CFLAGS} ${XML_CPPFLAGS} ${FFMPEG_CFLAGS} - +AM_CFLAGS=$(OP_CFLAGS) SAMPLEREC_LIB_FILE = libsamplerec.la noinst_LTLIBRARIES = $(SAMPLEREC_LIB_FILE) libsamplerec_la_SOURCES = samplerecord.c diff --git a/veejay-current/libstream/Makefile.am b/veejay-current/libstream/Makefile.am index 72820ccb..75475181 100644 --- a/veejay-current/libstream/Makefile.am +++ b/veejay-current/libstream/Makefile.am @@ -1,5 +1,6 @@ # Makefile for veejay MAINTAINERCLEANFILES = Makefile.in +AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem \ -I$(top_srcdir)/vjmsg \ -I$(top_srcdir)/libvjnet/ \ diff --git a/veejay-current/libvevo/Makefile.am b/veejay-current/libvevo/Makefile.am index e5c0bfa8..3672a565 100644 --- a/veejay-current/libvevo/Makefile.am +++ b/veejay-current/libvevo/Makefile.am @@ -1,4 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in +AM_CFLAGS=$(OP_CFLAGS) INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)/libvevo -I$(includedir) -I$(top_srcdir)/libhash -I$(top_srcdir)/libvjmem -I$(top_srcdir)/libvjmsg VEVO_LIB_FILE = libvevo.la diff --git a/veejay-current/libvje/Makefile.am b/veejay-current/libvje/Makefile.am index 60a0d621..db3a59d0 100644 --- a/veejay-current/libvje/Makefile.am +++ b/veejay-current/libvje/Makefile.am @@ -1,11 +1,9 @@ # Makefile for veejay MAINTAINERCLEANFILES=Makefile.in - INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem -I$(top_srcdir)/libgoom -I$(top_srcdir)/vjmsg ${FFMPEG_CFLAGS} $(GLIB_CFLAGS) -AM_CFLAGS = $(CFLAGS) -freg-struct-return -#AM_CFLAGS = $(CFLAGS) +AM_CFLAGS = $(OP_CFLAGS) -freg-struct-return VJE_LIB_FILE = libvje.la noinst_LTLIBRARIES = $(VJE_LIB_FILE) diff --git a/veejay-current/libvjmem/Makefile.am b/veejay-current/libvjmem/Makefile.am index 0ae57ad8..7f815b7d 100644 --- a/veejay-current/libvjmem/Makefile.am +++ b/veejay-current/libvjmem/Makefile.am @@ -1,5 +1,6 @@ # Makefile for memory managment / platform specific optimizations INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_builddir)/libvjmsg +AM_CFLAGS=$(OP_CFLAGS) VJMEM_LIB_FILE = libvjmem.la noinst_LTLIBRARIES = $(VJMEM_LIB_FILE) libvjmem_la_SOURCES = memcpy.c vj-x86.c diff --git a/veejay-current/libvjmsg/Makefile.am b/veejay-current/libvjmsg/Makefile.am index 6741bff9..3415f82b 100644 --- a/veejay-current/libvjmsg/Makefile.am +++ b/veejay-current/libvjmsg/Makefile.am @@ -1,5 +1,6 @@ # Makefile for logging/messages INCLUDES = -I$(top_srcdir) -I$(includedir) +AM_CLFAGS=$(OP_CFLAGS) VJMSG_LIB_FILE = libvjmsg.la noinst_LTLIBRARIES = $(VJMSG_LIB_FILE) libvjmsg_la_SOURCES = vj-common.c diff --git a/veejay-current/libvjnet/Makefile.am b/veejay-current/libvjnet/Makefile.am index b2c79cde..bf47dfc1 100644 --- a/veejay-current/libvjnet/Makefile.am +++ b/veejay-current/libvjnet/Makefile.am @@ -1,7 +1,7 @@ # Makefile for veejay MAINTAINERCLEANFILES = Makefile.in - +AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg VJNET_LIB_FILE = libvjnet.la noinst_LTLIBRARIES = $(VJNET_LIB_FILE) diff --git a/veejay-current/libyuv/Makefile.am b/veejay-current/libyuv/Makefile.am index 64f6deec..680f2548 100644 --- a/veejay-current/libyuv/Makefile.am +++ b/veejay-current/libyuv/Makefile.am @@ -1,7 +1,7 @@ # Makefile for veejay MAINTAINERCLEANFILES = Makefile.in -#AM_CFLAGS=$(CFLAGS) -ftree-vectorize -ftree-vectorizer-verbose=5 +AM_CFLAGS=$(YUVCFLAGS) INCLUDES = -I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/vjmem -I$(top_srcdir)/vjmsg -I$(top_srcdir)/libpostproc YUV_LIB_FILE = libyuv.la noinst_LTLIBRARIES = $(YUV_LIB_FILE) diff --git a/veejay-current/veejay/Makefile.am b/veejay-current/veejay/Makefile.am index 42f6ecba..3fadd5ec 100644 --- a/veejay-current/veejay/Makefile.am +++ b/veejay-current/veejay/Makefile.am @@ -1,7 +1,7 @@ # Makefile for veejay MAINTAINERCLEANFILES = Makefile.in - +AM_CFLAGS=$(OP_CFLAGS) INCLUDES = -I$(top_srcdir) -I$(includedir) \ -DG_LOG_DOMAIN=\"veejay\" -DVEEJAY_VERSION=\"$(VERSION)\" \ -I /usr/X11R6/include -I$(top_srcdir)/libOSC \