[gs-cvs] rev 8427 - trunk/gs/jbig2dec

[ken at ghostscript.com]

Author: ken
Date: 2007-12-08 05:57:53 -0800 (Sat, 08 Dec 2007)
New Revision: 8427

Modified:
   trunk/gs/jbig2dec/msvc.mak
Log:
Update the MSVC makefile to work with Visual Studio 2005 (nmake version 8). 
Should still be OK with MSVC 6.


Modified: trunk/gs/jbig2dec/msvc.mak
===================================================================
--- trunk/gs/jbig2dec/msvc.mak	2007-12-07 23:39:06 UTC (rev 8426)
+++ trunk/gs/jbig2dec/msvc.mak	2007-12-08 13:57:53 UTC (rev 8427)
@@ -12,19 +12,19 @@
 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_LDFLAGS=$(LIBPNGDIR)/libpng.lib $(ZLIBDIR)/zlib.lib /link /NODEFAULTLIB:LIBCMT
 #LIBPNG_CFLAGS=
 #LIBPNG_LDFLAGS=
 
 EXE=.exe
 OBJ=.obj
 NUL=
-CFLAGS=-nologo -W4 -Zi -DHAVE_STRING_H=1 $(LIBPNG_CFLAGS)
+CFLAGS=-nologo -W4 -Zi -DHAVE_STRING_H=1 -D_CRT_SECURE_NO_WARNINGS $(LIBPNG_CFLAGS) 
 CC=cl
 FE=-Fe
 
 OBJS=getopt$(OBJ) getopt1$(OBJ) jbig2$(OBJ) jbig2_arith$(OBJ) \
- jbig2_arith_iaid$(OBJ) jbig2_arith_int$(OBJ) jbig2_huffman$(OBJ) \ 
+ jbig2_arith_iaid$(OBJ) jbig2_arith_int$(OBJ) jbig2_huffman$(OBJ) \
  jbig2_generic$(OBJ) jbig2_refinement$(OBJ) \
  jbig2_image$(OBJ) jbig2_image_pbm$(OBJ) jbig2_image_png$(OBJ) \
  jbig2_segment$(OBJ) jbig2_symbol_dict$(OBJ) jbig2_text$(OBJ) \
@@ -39,7 +39,7 @@
 all: jbig2dec$(EXE)
 
 jbig2dec$(EXE): $(OBJS)
-	$(CC) $(CFLAGS) $(FE)jbig2dec$(EXE) $(OBJS) $(LIBPNG_LDFLAGS)
+	$(CC) $(CFLAGS) $(FE)jbig2dec$(EXE) $(OBJS) $(LIBPNG_LDFLAGS) 
 
 getopt$(OBJ): getopt.c getopt.h
 	$(CC) $(CFLAGS) -c getopt.c