The R Project SVN R

Rev

Rev 42569 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 42569 Rev 42581
Line 13... Line 13...
13 
DLL: ../../../library/grDevices/libs/Rbitmap.dll
 13 
DLL: ../../../library/grDevices/libs/Rbitmap.dll
14 
 
 14 
 
15 
buildzlib:
 15 
buildzlib:
16 
	@$(MAKE) -C ../../extra/zlib -f Makefile.win
 16 
	@$(MAKE) -C ../../extra/zlib -f Makefile.win
17 
 
 17 
 
- 
 
 18 
## There is a makefile.mingw these days, but .std has always worked
- 
 
 19 
## Neither the makefile.{mingw,std} build pnggccrd.c but it is needed if
- 
 
 20 
## the compiler defines __MMX__ , which the win64 gcc does.
- 
 
 21 
## So we need to explicitly disable it.
18 
buildpng:
 22 
buildpng:
- 
 
 23 
	@$(MAKE) CC='$(CC)' \
19 
	@$(MAKE) CC='$(CC)' CFLAGS="-O3 -I../../../extra/zlib" \
 24 
	  CFLAGS="-O3 -I../../../extra/zlib -DPNG_NO_MMX_CODE" \
20 
	  RANLIB=$(RANLIB) ZLIBLIB=../../../extra/zlib -C $(PNGDIR) \
 25 
	  RANLIB=$(RANLIB) ZLIBLIB=../../../extra/zlib -C $(PNGDIR) \
21 
	  -f scripts/makefile.std libpng.a
 26 
	  -f scripts/makefile.std libpng.a
22 
 
 27 
 
23 
# jconfig.h and Makefile obtained running 'CC="gcc -mno-cygwin" ./configure'
 28 
# jconfig.h and Makefile obtained running 'CC="gcc -mno-cygwin" ./configure'
24 
# under CYGWIN. They are here since the configure script doesn't run
29 
# under CYGWIN. They are here since the configure script doesn't run