[xiph-commits] r15809 - branches/theora-thusnelda

[giles at svn.xiph.org]

Author: giles
Date: 2009-03-20 23:18:00 -0700 (Fri, 20 Mar 2009)
New Revision: 15809

Modified:
   branches/theora-thusnelda/SConstruct
Log:
Update the scons build and add -Wno-parentheses.

Note that my scons (v1.2.0.r3842) isn't running the x86_64 cpu check, so 
this build may not give you asm acceleration. I've no idea why.


Modified: branches/theora-thusnelda/SConstruct
===================================================================
--- branches/theora-thusnelda/SConstruct	2009-03-21 06:06:37 UTC (rev 15808)
+++ branches/theora-thusnelda/SConstruct	2009-03-21 06:18:00 UTC (rev 15809)
@@ -13,27 +13,30 @@
         enc/encoder_idct.c
         enc/encoder_toplevel.c
         enc/encoder_quant.c
+	enc/encapiwrapper.c
         enc/dct.c
         enc/dct_decode.c
         enc/frarray.c
         enc/frinit.c
-        enc/mcomp.c
+        enc/mcenc.c
+	enc/mode.c
         enc/reconstruct.c
         enc/dsp.c
 """
 
 decoder_sources = """
-        dec/apiwrapper.c \
-        dec/decapiwrapper.c \
-        dec/decinfo.c \
-        dec/decode.c \
-        dec/dequant.c \
-        dec/fragment.c \
-        dec/huffdec.c \
-        dec/idct.c \
-        dec/info.c \
-        dec/internal.c \
-        dec/quant.c \
+        dec/apiwrapper.c
+	dec/bitpack.c
+        dec/decapiwrapper.c
+        dec/decinfo.c
+        dec/decode.c
+        dec/dequant.c
+        dec/fragment.c
+        dec/huffdec.c
+        dec/idct.c
+        dec/info.c
+        dec/internal.c
+        dec/quant.c
         dec/state.c
 """
 
@@ -41,7 +44,7 @@
 
 env = Environment()
 if env['CC'] == 'gcc':
-  env.Append(CCFLAGS=["-g", "-O2", "-Wall"])
+  env.Append(CCFLAGS=["-g", "-O2", "-Wall", "-Wno-parentheses"])
 #  env.Append(CCFLAGS=["-g", "-Wall"])
 
 def CheckPKGConfig(context, version): 
@@ -124,32 +127,19 @@
 if build_player_example and not conf.CheckSDL():
   build_player_example=False
 
-if conf.CheckHost_x86_32():
+if conf.CheckHost_x86_32() or conf.CheckHost_x86_64:
   libtheora_Sources += Split("""
         dec/x86/mmxidct.c
         dec/x86/mmxfrag.c
         dec/x86/mmxstate.c
         dec/x86/x86state.c
-	enc/x86_32/dct_decode_mmx.c
-	enc/x86_32/dsp_mmx.c
-	enc/x86_32/dsp_mmxext.c
-	enc/x86_32/recon_mmx.c
-	enc/x86_32/idct_mmx.c
-	enc/x86_32/fdct_mmx.c
+	enc/x86/dct_decode_mmx.c
+	enc/x86/dsp_mmx.c
+	enc/x86/dsp_mmxext.c
+	enc/x86/recon_mmx.c
+	enc/x86/idct_mmx.c
+	enc/x86/fdct_mmx.c
   """)
-elif conf.CheckHost_x86_64():
-  libtheora_Sources += Split("""
-        dec/x86/mmxidct.c
-        dec/x86/mmxfrag.c
-        dec/x86/mmxstate.c
-        dec/x86/x86state.c
-	enc/x86_64/dct_decode_mmx.c
-	enc/x86_64/dsp_mmx.c
-	enc/x86_64/dsp_mmxext.c
-	enc/x86_64/recon_mmx.c
-	enc/x86_64/idct_mmx.c
-	enc/x86_64/fdct_mmx.c
-  """)
 env = conf.Finish()
 
 env.Append(CPPPATH=['lib', 'include', 'lib/enc'])
@@ -165,23 +155,23 @@
 env.Install(lib_dir, [libtheora_a, libtheora_so])
 
 # example programs
-dump_video = env.Copy()
+dump_video = env.Clone()
 dump_video_Sources = Split("""dump_video.c ../lib/libtheora.a""")
 dump_video.Program('examples/dump_video', path('examples', dump_video_Sources))
 
 if have_vorbis:
-  encex = dump_video.Copy()
+  encex = dump_video.Clone()
   encex.ParseConfig('pkg-config --cflags --libs vorbisenc vorbis')
   encex_Sources = Split("""encoder_example.c ../lib/libtheora.a""")
   encex.Program('examples/encoder_example', path('examples', encex_Sources))
 
   if build_player_example:
-    plyex = encex.Copy()
+    plyex = encex.Clone()
     plyex_Sources = Split("""player_example.c ../lib/libtheora.a""")
     plyex.ParseConfig('sdl-config --cflags --libs')
     plyex.Program('examples/player_example', path('examples', plyex_Sources))
 
-png2theora = env.Copy()
+png2theora = env.Clone()
 png2theora_Sources = Split("""png2theora.c ../lib/libtheora.a""")
 png2theora.ParseConfig('pkg-config --cflags --libs libpng')
 png2theora.Program('examples/png2theora', path('examples', png2theora_Sources))