[xiph-commits] r16024 - branches/theora-thusnelda/win32/xmingw32

Sun May 24 09:23:18 PDT 2009

Author: tterribe
Date: 2009-05-24 09:23:18 -0700 (Sun, 24 May 2009)
New Revision: 16024

Modified:
   branches/theora-thusnelda/win32/xmingw32/Makefile
Log:
Update mingw32 Makefile for changes since the 1.1alpha1 release.


Modified: branches/theora-thusnelda/win32/xmingw32/Makefile
===================================================================

--- branches/theora-thusnelda/win32/xmingw32/Makefile	2009-05-24 15:06:20 UTC (rev 16023)
+++ branches/theora-thusnelda/win32/xmingw32/Makefile	2009-05-24 16:23:18 UTC (rev 16024)
@@ -34,7 +34,7 @@
 # The is no standard mingw prefix, so try to guess
 MINGW_PREFIX := $(or $(strip $(foreach exeprefix, \
 	i686-mingw32 i586-mingw32msvc i386-mingw32 no-mingw32, \
-	$(if $(shell which $(exeprefix)-gcc), $(exeprefix) ))))
+	$(if $(shell which $(exeprefix)-gcc 2>/dev/null), $(exeprefix) ))))
 CC = $(MINGW_PREFIX)-gcc
 RC = $(MINGW_PREFIX)-windres
 DLLTOOL = $(MINGW_PREFIX)-dlltool
@@ -53,8 +53,8 @@
 #  -ffast-math, or additional flags, depending on your system and compiler.
 # The correct -march=<architecture> flag will also generate much better code
 #  on newer architectures.
-CFLAGS = -Wall -Wno-parentheses -DUSE_ASM
-RELEASE_CFLAGS = ${CFLAGS} -mtune=nocona -O3 -fomit-frame-pointer -fforce-addr \
+CFLAGS = -Wall -Wno-parentheses -DOC_X86_ASM
+RELEASE_CFLAGS = ${CFLAGS} -mtune=native -O3 -fomit-frame-pointer -fforce-addr \
  -finline-functions
 # The -g flag will generally include debugging information.
 DEBUG_CFLAGS = ${CFLAGS} -g
@@ -69,6 +69,15 @@
 
 # C source file lists
 
+LIBTHEORA_SHARED_CSOURCES = \
+dec/fragment.c \
+dec/idct.c \
+dec/internal.c \
+$(if $(findstring -DOC_X86_ASM,${CFLAGS}), \
+dec/x86/mmxidct.c \
+dec/x86/mmxfrag.c \
+)
+
 LIBTHEORADEC_CSOURCES = \
 dec/apiwrapper.c \
 dec/bitpack.c \
@@ -76,84 +85,53 @@
 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 \
-$(if $(findstring -DUSE_ASM,${CFLAGS}), \
-dec/x86/mmxidct.c \
-dec/x86/mmxfrag.c \
+$(if $(findstring -DOC_X86_ASM,${CFLAGS}), \
 dec/x86/mmxstate.c \
 dec/x86/x86state.c \
 )
 
-LIBTHEORADEC_CHEADERS =   \
-internal.h \
-dec/apiwrapper.h \
-dec/bitpack.h \
-dec/dct.h \
-dec/decint.h \
-dec/dequant.h \
-dec/huffdec.h \
-dec/huffman.h \
-dec/idct.h \
-dec/ocintrin.h \
-dec/quant.h \
-../include/theora/codec.h \
-../include/theora/theora.h \
-
 LIBTHEORAENC_CSOURCES = \
 enc/dct.c \
 enc/dct_decode.c \
 enc/dct_encode.c \
-enc/dsp.c \
 enc/encapiwrapper.c \
+enc/encfrag.c \
 enc/encode.c \
-enc/encoder_huffman.c \
-enc/encoder_idct.c \
 enc/encoder_toplevel.c \
 enc/encoder_quant.c \
 enc/frarray.c \
 enc/frinit.c \
+enc/huffenc.c \
 enc/mathops.c \
 enc/mcenc.c \
 enc/mode.c \
-enc/reconstruct.c \
-$(if $(findstring -DUSE_ASM,${CFLAGS}), \
-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 \
+$(if $(findstring -DOC_X86_ASM,${CFLAGS}), \
+enc/x86/mmxenc.c \
+enc/x86/mmxencfrag.c \
+enc/x86/mmxfdct.c \
+enc/x86/x86enc.c \
 )
 
-LIBTHEORAENC_CHEADERS = \
-cpu.h \
-internal.h \
-enc/dsp.h \
-enc/encoder_huffman.h \
-enc/encoder_lookup.h \
-enc/enquant.h \
-enc/hufftables.h \
-enc/mathops.h \
-enc/mode_select.h \
-enc/quant_lookup.h \
-enc/toplevel_lookup.h \
 
-
 DUMP_VIDEO_CSOURCES = dump_video.c
 ENCODER_EXAMPLE_CSOURCES = encoder_example.c
 PLAYER_EXAMPLE_CSOURCES = player_example.c
 
 # Create object file list.
-LIBTHEORADEC_OBJS:= ${LIBTHEORADEC_CSOURCES:%.c=${WORKDIR}/%.o}
-LIBTHEORADECD_OBJS:= ${LIBTHEORADEC_CSOURCES:%.c=${WORKDIR}/%.do}
-LIBTHEORAENC_OBJS:= ${LIBTHEORAENC_CSOURCES:%.c=${WORKDIR}/%.o}
-LIBTHEORAENCD_OBJS:= ${LIBTHEORAENC_CSOURCES:%.c=${WORKDIR}/%.do}
+LIBTHEORA_SHARED_OBJS:= ${LIBTHEORA_SHARED_CSOURCES:%.c=${WORKDIR}/%.o}
+LIBTHEORAD_SHARED_OBJS:= ${LIBTHEORA_SHARED_CSOURCES:%.c=${WORKDIR}/%.do}
+LIBTHEORADEC_OBJS:= ${LIBTHEORA_SHARED_OBJS} \
+ ${LIBTHEORADEC_CSOURCES:%.c=${WORKDIR}/%.o}
+LIBTHEORADECD_OBJS:= ${LIBTHEORAD_SHARED_OBJS} \
+ ${LIBTHEORADEC_CSOURCES:%.c=${WORKDIR}/%.do}
+LIBTHEORAENC_OBJS:= ${LIBTHEORA_SHARED_OBJS} \
+ ${LIBTHEORAENC_CSOURCES:%.c=${WORKDIR}/%.o}
+LIBTHEORAENCD_OBJS:= ${LIBTHEORAD_SHARED_OBJS} \
+ ${LIBTHEORAENC_CSOURCES:%.c=${WORKDIR}/%.do}
 DUMP_VIDEO_OBJS:= ${DUMP_VIDEO_CSOURCES:%.c=${WORKDIR}/%.o}
 ENCODER_EXAMPLE_OBJS:= ${ENCODER_EXAMPLE_CSOURCES:%.c=${WORKDIR}/%.o}
 PLAYER_EXAMPLE_OBJS:= ${PLAYER_EXAMPLE_CSOURCES:%.c=${WORKDIR}/%.o}
@@ -174,15 +152,14 @@
 ALL_DEPS:= ${ALL_DEPS:%.do=%.dd}
 ALL_DEPS:= ${ALL_DEPS:%.rco=%.d}
 # Prepend source path to file names.
+LIBTHEORA_SHARED_CSOURCES:= ${LIBTHEORA_SHARED_CSOURCES:%=${LIBSRCDIR}/%}
 LIBTHEORADEC_CSOURCES:= ${LIBTHEORADEC_CSOURCES:%=${LIBSRCDIR}/%}
-LIBTHEORADEC_CHEADERS:= ${LIBTHEORADEC_CHEADERS:%=${LIBSRCDIR}/%}
 LIBTHEORAENC_CSOURCES:= ${LIBTHEORAENC_CSOURCES:%=${LIBSRCDIR}/%}
-LIBTHEORAENC_CHEADERS:= ${LIBTHEORAENC_CHEADERS:%=${LIBSRCDIR}/%}
 DUMP_VIDEO_CSOURCES:= ${DUMP_VIDEO_CSOURCES:%=${BINSRCDIR}/%}
 ENCODER_EXAMPLE_CSOURCES:= ${ENCODER_EXAMPLE_CSOURCES:%=${BINSRCDIR}/%}
 PLAYER_EXAMPLE_CSOURCES:= ${PLAYER_EXAMPLE_CSOURCES:%=${BINSRCDIR}/%}
-ALL_CSOURCES:= ${LIBTHEORADEC_CSOURCES} ${LIBTHEORAENC_CSOURCES} \
- ${DUMP_VIDEO_CSOURCES} ${ENCODER_EXAMPLE_CSOURCES} \
+ALL_CSOURCES:= ${LIBTHEORA_SHARED_CSOURCES} ${LIBTHEORADEC_CSOURCES} \
+ ${LIBTHEORAENC_CSOURCES} ${DUMP_VIDEO_CSOURCES} ${ENCODER_EXAMPLE_CSOURCES} \
  ${PLAYER_EXAMPLE_CSOURCES}
 LIBTHEORAENC_RCO:= ${WORKDIR}/${LIBTHEORAENC_TARGET:%.dll=%.rco}
 LIBTHEORAENCD_RCO:= ${WORKDIR}/${LIBTHEORAENCD_TARGET:%.dll=%.rco}

