summaryrefslogtreecommitdiff
path: root/scripts/makefile.intel
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2007-06-19 19:05:48 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-04-06 16:13:36 -0500
commit06fe17eb9fbc4dd03afb7b198ba260e16568e9a4 (patch)
tree2ff1c1202ebebd0826bfaf04805a0c0803cf2dc5 /scripts/makefile.intel
parent7945bdb88fa3a3d97646a11705cba60a79be0a4f (diff)
downloadlibpng-06fe17eb9fbc4dd03afb7b198ba260e16568e9a4.tar.gz
Imported from libpng-1.2.19beta17.tarv1.2.19beta17
Diffstat (limited to 'scripts/makefile.intel')
-rw-r--r--scripts/makefile.intel16
1 files changed, 5 insertions, 11 deletions
diff --git a/scripts/makefile.intel b/scripts/makefile.intel
index 1cabe779b..a155ddd58 100644
--- a/scripts/makefile.intel
+++ b/scripts/makefile.intel
@@ -8,14 +8,6 @@
# To use, do "nmake /f scripts\makefile.intel"
-# ------------------- Intel C/C++ Compiler 4.0 and later -------------------
-
-# Caution: the assembler code was introduced at libpng version 1.0.4 and has
-# not yet been thoroughly tested.
-
-# Use assembler code
-ASMCODE=-DPNG_USE_PNGVCRD
-
# Where the zlib library and include files are located
ZLIBLIB=..\zlib
ZLIBINC=..\zlib
@@ -36,7 +28,7 @@ CALLING=r # __fastcall
CC=icl -c
-CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) $(ASMCODE) -nologo
+CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) -nologo
LD=link
LDFLAGS=/SUBSYSTEM:CONSOLE /NOLOGO
@@ -44,8 +36,7 @@ O=.obj
OBJS=png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O) \
pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O) \
-pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O) pngvcrd$(O)
-
+pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O) pngvcrd$(O) pnggccrd$(O)
all: test
@@ -70,6 +61,9 @@ pngrtran$(O): png.h pngconf.h
pngrutil$(O): png.h pngconf.h
$(CC) $(CFLAGS) $*.c $(ERRFILE)
+pnggccrd$(O): png.h pngconf.h
+ $(CC) $(CFLAGS) $*.c $(ERRFILE)
+
pngvcrd$(O): png.h pngconf.h
$(CC) $(CFLAGS) $*.c $(ERRFILE)