Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/3rdparty/libpng/scripts/makefile.msc

    r2 r561  
    11# makefile for libpng
    22# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
    3 # For conditions of distribution and use, see copyright notice in png.h
     3# Copyright (C) 2006, 2009 Glenn Randers-Pehrson
     4
     5# This code is released under the libpng license.
     6# For conditions of distribution and use, see the disclaimer
     7# and license in png.h
     8
    49# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
    510
     
    5661        $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
    5762
    58 pngtest$(O): png.h pngconf.h
    59         $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
    60 
    6163pngtrans$(O): png.h pngconf.h
    6264        $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
     
    7779        lib libpng $(OBJS3);
    7880
     81pngtest$(O): png.h pngconf.h
     82        $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
     83
    7984pngtest.exe: pngtest.obj libpng.lib
    8085        $(LD) $(LDFLAGS) pngtest.obj,,,libpng.lib ..\zlib\zlib.lib ;
Note: See TracChangeset for help on using the changeset viewer.