rev 249 - trunk

Author: giles
Date: 2003-05-07 15:41:01 -0700 (Wed, 07 May 2003)
New Revision: 249

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 in our local msvc makefile.

(recommitted after repository became corrupt. original change Wed May  7 03:48:12 2003)


Modified: trunk/msvc.mak
==============================================================================
--- trunk/msvc.mak	(r248)
+++ trunk/msvc.mak	(r249)
@@ -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	(r248)
+++ trunk/config_win32.h	(r249)
@@ -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;