rev 248 - trunk

Author: giles
Date: 2003-05-07 03:48:11 -0700 (Wed, 07 May 2003)
New Revision: 248

Modified:
   trunk/config_win32.h
   trunk/msvc.mak
Log:
Move HAVE_LIBPNG to the msvc makefile; this shouldn't necessarily be included in the win32 build
(e.g. in ghostscript) so we only define it for the jbig2dec.exe build.


Modified: trunk/msvc.mak
==============================================================================
--- trunk/msvc.mak	(original)
+++ trunk/msvc.mak	Wed May  7 03:48:12 2003
@@ -10,11 +10,16 @@
 
 LIBPNGDIR=../libpng
 ZLIBDIR=../zlib
+# define iff you're linking to libpng
+LIBPNG_CFLAGS=-DHAVE_LIBPNG -I$(LIBPNGDIR) -I$(ZLIBDIR)
+LIBPNG_LDFLAGS=$(LIBPNGDIR)/libpng.lib $(ZLIBDIR)/zlib.lib
+#LIBPNG_CFLAGS=
+#LIBPNG_LDFLAGS=
 
 EXE=.exe
 OBJ=.obj
 NUL=
-CFLAGS=-nologo -W4 -Zi -DHAVE_STRING_H=1 -I$(LIBPNGDIR) -I$(ZLIBDIR)
+CFLAGS=-nologo -W4 -Zi -DHAVE_STRING_H=1 $(LIBPNG_CFLAGS)
 CC=cl
 FE=-Fe
 
@@ -33,7 +38,7 @@
 all: jbig2dec$(EXE)
 
 jbig2dec$(EXE): $(OBJS)
-	$(CC) $(CFLAGS) $(FE)jbig2dec$(EXE) $(OBJS) $(LIBPNGDIR)/libpng.lib $(ZLIBDIR)/zlib.lib
+	$(CC) $(CFLAGS) $(FE)jbig2dec$(EXE) $(OBJS) $(LIBPNG_LDFLAGS)
 
 getopt$(OBJ): getopt.c getopt.h
 	$(CC) $(CFLAGS) -c getopt.c

Modified: trunk/config_win32.h
==============================================================================
--- trunk/config_win32.h	(original)
+++ trunk/config_win32.h	Wed May  7 03:48:12 2003
@@ -4,9 +4,6 @@
 #define PACKAGE "jbig2dec"
 #define VERSION "0.3"
 
-/* define this iff you are linking to/compiling in libpng */
-#define HAVE_LIBPNG
-
 #ifdef _MSC_VER /* Microsoft Visual C+*/
 
   typedef signed char             int8_t;