[Sumover-dev] [svn commit] r4827 - vic/branches/cc

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

Author: soohyunc
Date: Tue May 11 19:08:17 2010
New Revision: 4827

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

Log:
copied Revision 4799 from mpeg branch done by Doug.


- copied log message for reference:

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/cc/Makefile.in
==============================================================================
--- vic/branches/cc/Makefile.in	(original)
+++ vic/branches/cc/Makefile.in	Tue May 11 19:08:17 2010
@@ -94,7 +94,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/cc/config.h
==============================================================================
--- vic/branches/cc/config.h	(original)
+++ vic/branches/cc/config.h	Tue May 11 19:08:17 2010
@@ -36,6 +36,10 @@
 #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>
 #ifndef uint16_t