[xiph-commits] r13893 - in trunk/theora: lib/dec win32/xmingw32

[tterribe at svn.xiph.org]

Author: tterribe
Date: 2007-09-22 07:25:19 -0700 (Sat, 22 Sep 2007)
New Revision: 13893

Modified:
   trunk/theora/lib/dec/apiwrapper.h
   trunk/theora/win32/xmingw32/Makefile
Log:
Minor MingW32 build fixes.


Modified: trunk/theora/lib/dec/apiwrapper.h
===================================================================
--- trunk/theora/lib/dec/apiwrapper.h	2007-09-22 09:37:20 UTC (rev 13892)
+++ trunk/theora/lib/dec/apiwrapper.h	2007-09-22 14:25:19 UTC (rev 13893)
@@ -22,7 +22,7 @@
 # include "theora/theoradec.h"
 /*# include "theora/theoraenc.h"*/
 typedef struct th_enc_ctx th_enc_ctx;
-# include "internal.h"
+# include "../internal.h"
 
 typedef struct th_api_wrapper th_api_wrapper;
 typedef struct th_api_info    th_api_info;

Modified: trunk/theora/win32/xmingw32/Makefile
===================================================================
--- trunk/theora/win32/xmingw32/Makefile	2007-09-22 09:37:20 UTC (rev 13892)
+++ trunk/theora/win32/xmingw32/Makefile	2007-09-22 14:25:19 UTC (rev 13893)
@@ -67,6 +67,7 @@
 
 LIBTHEORABASE_CHEADERS = \
 internal.h \
+dec/apiwrapper.h \
 dec/dct.h \
 dec/idct.h \
 dec/huffman.h \
@@ -77,6 +78,7 @@
 
 LIBTHEORADEC_CSOURCES = \
 dec/apiwrapper.c \
+dec/decapiwrapper.c \
 dec/decinfo.c \
 dec/decode.c \
 dec/dequant.c \
@@ -168,7 +170,7 @@
 RC_OBJS:= ${RC_OBJS:%.dll=${WORKDIR}/%.rco}
 ALL_OBJS:= ${LIBTHEORADEC_OBJS} ${LIBTHEORAENC_OBJS} \
  ${LIBTHEORADECD_OBJS} ${LIBTHEORAENCD_OBJS} ${RC_OBJS} \
- ${DUMP_VIDEO_OBJS} ${ENCODER_EXAMPLE_OBJS} ${PLAYER_EXAMPLE_OBJS}
+ ${DUMP_VIDEO_OBJS} ${ENCODER_EXAMPLE_OBJS} #${PLAYER_EXAMPLE_OBJS}
 # Create the dependency file list
 ALL_DEPS:= ${ALL_OBJS:%.o=%.d}
 ALL_DEPS:= ${ALL_DEPS:%.do=%.dd}
@@ -369,7 +371,7 @@
 
 # Remove all targets.
 clean:
-	-rm ${ALL_OBJS} ${ALL_DEPS} ${ALL_TARGETS} ${IMPLIB_TARGETS}
+	-rm $(sort ${ALL_OBJS} ${ALL_DEPS} ${ALL_TARGETS} ${IMPLIB_TARGETS})
 	-rmdir ${WORKDIR}/enc/x86_32
 	-rmdir ${WORKDIR}/enc
 	-rmdir ${WORKDIR}/dec/x86