[Sumover-dev] [svn commit] r4799 - vic/branches/mpeg4

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Sat May  8 02:20:48 2010
New Revision: 4799

Modified:
   vic/branches/mpeg4/Makefile.in
   vic/branches/mpeg4/config.h

Log:
Use HAVE_CONFIG_H preprocessor conditional for including uclconf.h,
a autoconf configure generated header file which doesn't exist with
Visual Studio


Modified: vic/branches/mpeg4/Makefile.in
==============================================================================
--- vic/branches/mpeg4/Makefile.in	(original)
+++ vic/branches/mpeg4/Makefile.in	Sat May  8 02:20:48 2010
@@ -102,7 +102,7 @@
 
 INCLUDE = $(INCLUDE_MISC) $(INCLUDE_GRABBER) $(INCLUDE_TK) $(INCLUDE_TCL) \
 	$(INCLUDE_X11) $(MD_INC) -Icodec/jpeg -Icodec/p64 -I. 
-DEFINE = @V_DEFINE@ -DED_YBITS=$(ED_YBITS) -DSIGRET=@V_SIGRET@ -DNLAYER=8 -D_GNU_SOURCE
+DEFINE = @DEFS@ @V_DEFINE@ -DED_YBITS=$(ED_YBITS) -DSIGRET=@V_SIGRET@ -DNLAYER=8 -D_GNU_SOURCE
 BFLAGS = $(DEFINE) $(INCLUDE)
 CFLAGS = $(CCOPT) $(BFLAGS) -Wno-write-strings 
 

Modified: vic/branches/mpeg4/config.h
==============================================================================
--- vic/branches/mpeg4/config.h	(original)
+++ vic/branches/mpeg4/config.h	Sat May  8 02:20:48 2010
@@ -30,7 +30,9 @@
 #ifndef vic_config_h
 #define vic_config_h
 
+#ifdef HAVE_CONFIG_H
 #include "uclconf.h"
+#endif
 
 #if defined(sgi) || defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
 #include <sys/types.h>