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:
55 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/3rdparty/libpng/scripts/CMakeLists.txt

    r2 r561  
    1                                              
    2 project(PNG)
     1project(PNG C)
     2cmake_minimum_required(VERSION 2.4.3)
    33
    44# Copyright (C) 2007 Glenn Randers-Pehrson
    5 # For conditions of distribution and use, see copyright notice in png.h
     5
     6# This code is released under the libpng license.
     7# For conditions of distribution and use, see the disclaimer
     8# and license in png.h
    69
    710set(PNGLIB_MAJOR 1)
    811set(PNGLIB_MINOR 2)
    9 set(PNGLIB_RELEASE 29)
     12set(PNGLIB_RELEASE 40)
    1013set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
    1114set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
    1215
     16set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
     17
    1318# needed packages
    1419find_package(ZLIB REQUIRED)
     20include_directories(${ZLIB_INCLUDE_DIR})
     21
    1522if(NOT WIN32)
    1623 find_library(M_LIBRARY
     
    2128   message(STATUS
    2229     "math library 'libm' not found - floating point support disabled")
    23  endif(NOT M_LIBRARY)
    24 else(NOT WIN32)
     30 endif()
     31else()
    2532 # not needed on windows
    2633 set(M_LIBRARY "")
    27 endif(NOT WIN32)
    28 
     34endif()
    2935
    3036# COMMAND LINE OPTIONS
    31 option(PNG_SHARED "Build shared lib" YES)
    32 option(PNG_STATIC "Build static lib" YES)
     37if(DEFINED PNG_SHARED)
     38  option(PNG_SHARED "Build shared lib" ${PNG_SHARED})
     39else()
     40  option(PNG_SHARED "Build shared lib" ON)
     41endif()
     42if(DEFINED PNG_STATIC)
     43  option(PNG_STATIC "Build static lib" ${PNG_STATIC})
     44else()
     45  option(PNG_STATIC "Build static lib" ON)
     46endif()
     47
    3348if(MINGW)
    3449  option(PNG_TESTS  "Build pngtest" NO)
     
    3651  option(PNG_TESTS  "Build pngtest" YES)
    3752endif(MINGW)
     53
    3854option(PNG_NO_CONSOLE_IO "FIXME" YES)
    3955option(PNG_NO_STDIO      "FIXME" YES)
    40 option(PNG_DEBUG         "Build with debug output" YES)
     56option(PNG_DEBUG         "Build with debug output" NO)
    4157option(PNGARG            "FIXME" YES)
    4258#TODO:
     
    5571   endif("uname_output" MATCHES "^.*i[1-9]86.*$")
    5672 endif(uname_executable)
    57 else(NOT WIN32)
     73else()
    5874 # this env var is normally only set on win64
    5975 SET(TEXT "ProgramFiles(x86)")
     
    6177  set(png_asm_tmp "ON")
    6278 endif("$ENV{${TEXT}}" STREQUAL "")
    63 endif(NOT WIN32)
     79endif()
    6480
    6581# SET LIBNAME
    66 # msvc does not append 'lib' - do it here to have consistent name
    67 if(MSVC)
    68  set(PNG_LIB_NAME lib)
    69 endif(MSVC)
    70 set(PNG_LIB_NAME ${PNG_LIB_NAME}png${PNGLIB_MAJOR}${PNGLIB_MINOR})
     82set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
    7183
    7284# to distinguish between debug and release lib
     
    102114endif(MSVC)
    103115
    104 add_definitions(-DZLIB_DLL)
     116if(PNG_SHARED OR  NOT MSVC)
     117        #if building msvc static this has NOT do be defined
     118        add_definitions(-DZLIB_DLL)
     119endif()
    105120
    106121add_definitions(-DLIBPNG_NO_MMX)
     
    109124if(PNG_CONSOLE_IO_SUPPORTED)
    110125 add_definitions(-DPNG_CONSOLE_IO_SUPPORTED)
    111 endif(PNG_CONSOLE_IO_SUPPORTED)
     126endif()
    112127
    113128if(PNG_NO_CONSOLE_IO)
    114129 add_definitions(-DPNG_NO_CONSOLE_IO)
    115 endif(PNG_NO_CONSOLE_IO)
     130endif()
    116131
    117132if(PNG_NO_STDIO)
    118133 add_definitions(-DPNG_NO_STDIO)
    119 endif(PNG_NO_STDIO)
     134endif()
    120135
    121136if(PNG_DEBUG)
    122137 add_definitions(-DPNG_DEBUG)
    123 endif(PNG_DEBUG)
     138endif()
    124139
    125140if(NOT M_LIBRARY AND NOT WIN32)
    126141 add_definitions(-DPNG_NO_FLOATING_POINT_SUPPORTED)
    127 endif(NOT M_LIBRARY AND NOT WIN32)
     142endif()
    128143
    129144# NOW BUILD OUR TARGET
     
    132147if(PNG_SHARED)
    133148 add_library(${PNG_LIB_NAME} SHARED ${libpng_sources})
     149 if(MSVC)
     150   # msvc does not append 'lib' - do it here to have consistent name
     151   set_target_properties(${PNG_LIB_NAME} PROPERTIES PREFIX "lib")
     152 endif()
    134153 target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY})
    135 endif(PNG_SHARED)
     154endif()
     155
    136156if(PNG_STATIC)
    137157# does not work without changing name
    138158 set(PNG_LIB_NAME_STATIC ${PNG_LIB_NAME}_static)
    139159 add_library(${PNG_LIB_NAME_STATIC} STATIC ${libpng_sources})
    140 endif(PNG_STATIC)
     160 if(MSVC)
     161   # msvc does not append 'lib' - do it here to have consistent name
     162   set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES PREFIX "lib")
     163 endif()
     164endif()
     165
    141166
    142167if(PNG_SHARED AND WIN32)
    143168 set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL)
    144 endif(PNG_SHARED AND WIN32)
    145 
    146 if(PNG_TESTS)
     169endif()
     170
     171if(PNG_TESTS AND PNG_SHARED)
    147172# does not work with msvc due to png_lib_ver issue
    148173 add_executable(pngtest ${pngtest_sources})
    149174 target_link_libraries(pngtest ${PNG_LIB_NAME})
    150175#  add_test(pngtest ${PNG_SOURCE_DIR}/pngtest.png)
    151 endif(PNG_TESTS)
     176endif()
    152177
    153178
     
    169194
    170195# SET UP LINKS
    171 set_target_properties(${PNG_LIB_NAME} PROPERTIES
    172 #    VERSION 0.${PNGLIB_RELEASE}.1.2.29
     196if(PNG_SHARED)
     197  set_target_properties(${PNG_LIB_NAME} PROPERTIES
     198#    VERSION 0.${PNGLIB_RELEASE}.1.2.40
    173199     VERSION 0.${PNGLIB_RELEASE}.0
    174200     SOVERSION 0
    175201     CLEAN_DIRECT_OUTPUT 1)
    176 if(NOT WIN32)
    177   # that's uncool on win32 - it overwrites our static import lib...
    178   set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES
    179      OUTPUT_NAME ${PNG_LIB_NAME}
    180      CLEAN_DIRECT_OUTPUT 1)
    181 endif(NOT WIN32)
     202endif()
     203if(PNG_STATIC)
     204  if(NOT WIN32)
     205    # that's uncool on win32 - it overwrites our static import lib...
     206    set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES
     207       OUTPUT_NAME ${PNG_LIB_NAME}
     208       CLEAN_DIRECT_OUTPUT 1)
     209  endif()
     210endif()
     211
    182212# INSTALL
    183 install_targets(/lib ${PNG_LIB_NAME})
    184 if(PNG_STATIC)
    185   install_targets(/lib ${PNG_LIB_NAME_STATIC})
    186 endif(PNG_STATIC)
    187 
     213if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
     214    if(PNG_SHARED)
     215        install(TARGETS ${PNG_LIB_NAME}
     216            RUNTIME DESTINATION bin
     217            LIBRARY DESTINATION lib
     218            ARCHIVE DESTINATION lib)
     219    endif()
     220    if(PNG_STATIC)
     221        install(TARGETS ${PNG_LIB_NAME_STATIC}
     222            LIBRARY DESTINATION lib
     223            ARCHIVE DESTINATION lib)
     224    endif()
     225endif()
     226
     227if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
    188228install(FILES png.h pngconf.h         DESTINATION include)
    189229install(FILES png.h pngconf.h         DESTINATION include/${PNGLIB_NAME})
    190 install(FILES libpng.3 libpngpf.3             DESTINATION man/man3)
    191 install(FILES png.5                           DESTINATION man/man5)
    192 install(FILES ${PNG_BINARY_DIR}/libpng.pc     DESTINATION lib/pkgconfig)
    193 install(FILES ${PNG_BINARY_DIR}/libpng-config      DESTINATION bin)
    194 install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc  DESTINATION lib/pkgconfig)
    195 install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config DESTINATION bin)
     230endif()
     231if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
     232    install(FILES libpng.3 libpngpf.3             DESTINATION man/man3)
     233    install(FILES png.5                           DESTINATION man/man5)
     234    install(FILES ${PNG_BINARY_DIR}/libpng.pc     DESTINATION lib/pkgconfig)
     235    install(FILES ${PNG_BINARY_DIR}/libpng-config      DESTINATION bin)
     236    install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc  DESTINATION lib/pkgconfig)
     237    install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config DESTINATION bin)
     238endif()
    196239
    197240# what's with libpng.txt and all the extra files?
  • trunk/src/3rdparty/libpng/scripts/descrip.mms

    r2 r561  
    11
    22cc_defs = /inc=$(ZLIBSRC)
    3 c_deb = 
     3c_deb =
    44
    55.ifdef __DECC__
     
    3030
    3131clean :
    32         delete *.obj;*,*.exe;*
     32        delete *.obj;*,*.exe;
    3333
    3434
     
    4545pngrio.obj : png.h, pngconf.h
    4646pngwio.obj : png.h, pngconf.h
    47 pngtest.obj : png.h, pngconf.h
    4847pngtrans.obj : png.h, pngconf.h
    4948pngwrite.obj : png.h, pngconf.h
     
    5150pngwutil.obj : png.h, pngconf.h
    5251
     52pngtest.obj : png.h, pngconf.h
  • trunk/src/3rdparty/libpng/scripts/libpng-config-head.in

    r2 r561  
    55
    66# Copyright (C) 2002 Glenn Randers-Pehrson
    7 # For conditions of distribution and use, see copyright notice in png.h
     7
     8# This code is released under the libpng license.
     9# For conditions of distribution and use, see the disclaimer
     10# and license in png.h
    811
    912# Modeled after libxml-config.
    1013
    11 version=1.2.29
     14version=1.2.40
    1215prefix=""
    1316libdir=""
  • trunk/src/3rdparty/libpng/scripts/libpng-config.in

    r2 r561  
    55
    66# Copyright (C) 2002, 2004, 2006, 2007 Glenn Randers-Pehrson
    7 # For conditions of distribution and use, see copyright notice in png.h
     7
     8# This code is released under the libpng license.
     9# For conditions of distribution and use, see the disclaimer
     10# and license in png.h
    811
    912# Modeled after libxml-config.
     
    1518includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
    1619libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
    17 all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ -lz -lm"
     20all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
    1821I_opts="-I${includedir}"
    1922L_opts="-L${libdir}"
  • trunk/src/3rdparty/libpng/scripts/libpng.icc

    r2 r561  
    22// IBM VisualAge/C++ version 4.0 or later
    33// Copyright (C) 2000 Cosmin Truta
    4 // For conditions of distribution and use, see copyright notice in png.h
     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//
    59// Notes:
    610//   All modules are compiled in C mode
     
    812//   Expected to work with IBM VAC++ 4.0 or later under OS/2 and Win32
    913//   Can be easily adapted for IBM VAC++ 4.0 or later under AIX
    10 // For conditions of distribution and use, see copyright notice in png.h
    1114
    1215option incl(searchpath, "../zlib"), opt(level, "2"),
  • trunk/src/3rdparty/libpng/scripts/libpng.pc-configure.in

    r2 r561  
    22exec_prefix=@exec_prefix@
    33libdir=@libdir@
    4 includedir=@includedir@/libpng12
     4includedir=@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
    55
    66Name: libpng
    77Description: Loads and saves PNG files
    8 Version: 1.2.29
    9 Libs: -L${libdir} -lpng12
     8Version: @PNGLIB_VERSION@
     9Libs: -L${libdir} -lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
     10Libs.private: @LIBS@
    1011Cflags: -I${includedir} @LIBPNG_NO_MMX@
  • trunk/src/3rdparty/libpng/scripts/libpng.pc.in

    r2 r561  
    66Name: libpng
    77Description: Loads and saves PNG files
    8 Version: 1.2.29
     8Version: 1.2.40
    99Libs: -L${libdir} -lpng12
    1010Cflags: -I${includedir}
  • trunk/src/3rdparty/libpng/scripts/makefile.32sunu

    r2 r561  
    44# Copyright (C) 1998 Greg Roelofs
    55# Copyright (C) 1996, 1997 Andreas Dilger
    6 # For conditions of distribution and use, see copyright notice in png.h
     6
     7# This code is released under the libpng license.
     8# For conditions of distribution and use, see the disclaimer
     9# and license in png.h
    710
    811# Library name:
    912LIBNAME=libpng12
    1013PNGMAJ = 0
    11 PNGMIN = 1.2.29
     14PNGMIN = 1.2.40
    1215PNGVER = $(PNGMAJ).$(PNGMIN)
    1316
  • trunk/src/3rdparty/libpng/scripts/makefile.64sunu

    r2 r561  
    44# Copyright (C) 1998 Greg Roelofs
    55# Copyright (C) 1996, 1997 Andreas Dilger
    6 # For conditions of distribution and use, see copyright notice in png.h
     6
     7# This code is released under the libpng license.
     8# For conditions of distribution and use, see the disclaimer
     9# and license in png.h
    710
    811# Library name:
    912LIBNAME=libpng12
    1013PNGMAJ = 0
    11 PNGMIN = 1.2.29
     14PNGMIN = 1.2.40
    1215PNGVER = $(PNGMAJ).$(PNGMIN)
    1316
  • trunk/src/3rdparty/libpng/scripts/makefile.acorn

    r2 r561  
    77Linkflags = -aif -c++ -o $@
    88ObjAsmflags = -throwback -NoCache -depend !Depend
    9 CMHGflags = 
     9CMHGflags =
    1010LibFileflags = -c -l -o $@
    1111Squeezeflags = -o $@
    12 
    1312
    1413# Final targets:
  • trunk/src/3rdparty/libpng/scripts/makefile.aix

    r2 r561  
    11# makefile for libpng using gcc (generic, static library)
    2 # Copyright (C) 2002, 2006 Glenn Randers-Pehrson
     2# Copyright (C) 2002, 2006-2009 Glenn Randers-Pehrson
    33# Copyright (C) 2000 Cosmin Truta
    44# Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc)
    55# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
    6 # For conditions of distribution and use, see copyright notice in png.h
     6
     7# This code is released under the libpng license.
     8# For conditions of distribution and use, see the disclaimer
     9# and license in png.h
    710
    811# Location of the zlib library and include files
     
    2124LIBNAME=libpng12
    2225PNGMAJ = 0
    23 PNGMIN = 1.2.29
     26PNGMIN = 1.2.40
    2427PNGVER = $(PNGMAJ).$(PNGMIN)
    2528
     
    4548CRELEASE = -O2
    4649LDRELEASE = -s
    47 WARNMORE=-Wall
     50WARNMORE=-W -Wall
    4851CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)
    4952LDFLAGS = -L. -L$(ZLIBLIB) -lpng12 -lz -lm $(LDRELEASE)
     
    5558
    5659# Variables
    57 OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
     60OBJS =  png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
    5861        pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \
    5962        pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
     
    9598        $(RM_F) *.o $(LIBNAME)$(A) pngtest pngout.png
    9699
    97 png$(O): png.h pngconf.h
     100png$(O):      png.h pngconf.h
    98101pngerror$(O): png.h pngconf.h
    99 pngget$(O): png.h pngconf.h
    100 pngmem$(O): png.h pngconf.h
     102pngget$(O):   png.h pngconf.h
     103pngmem$(O):   png.h pngconf.h
    101104pngpread$(O): png.h pngconf.h
    102 pngread$(O): png.h pngconf.h
    103 pngrio$(O): png.h pngconf.h
     105pngread$(O):  png.h pngconf.h
     106pngrio$(O):   png.h pngconf.h
    104107pngrtran$(O): png.h pngconf.h
    105108pngrutil$(O): png.h pngconf.h
    106 pngset$(O): png.h pngconf.h
    107 pngtest$(O): png.h pngconf.h
     109pngset$(O):   png.h pngconf.h
    108110pngtrans$(O): png.h pngconf.h
    109 pngwio$(O): png.h pngconf.h
     111pngwio$(O):   png.h pngconf.h
    110112pngwrite$(O): png.h pngconf.h
    111113pngwtran$(O): png.h pngconf.h
    112114pngwutil$(O): png.h pngconf.h
    113115
     116pngtest$(O):  png.h pngconf.h
  • trunk/src/3rdparty/libpng/scripts/makefile.amiga

    r2 r561  
    22# makefile for libpng and SAS C V6.5x compiler
    33# Copyright (C) 1995-2000 Wolf Faust
    4 # For conditions of distribution and use, see copyright notice in png.h
     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
    58#
    69# Note: Use #define PNG_READ_BIG_ENDIAN_SUPPORTED in pngconf.h
  • trunk/src/3rdparty/libpng/scripts/makefile.atari

    r2 r561  
    22# Copyright (C) 2002 Glenn Randers-Pehrson
    33# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
    4 # For conditions of distribution and use, see copyright notice in png.h
    5 # modified for LC56/ATARI assumes libz.lib is in same dir and uses default
     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
     9# Modified for LC56/ATARI assumes libz.lib is in same dir and uses default
    610# rules for library management
    711#
  • trunk/src/3rdparty/libpng/scripts/makefile.bc32

    r2 r561  
    1111## Where zlib.h, zconf.h and zlib.lib are
    1212ZLIB_DIR=..\zlib
    13 
    1413
    1514## Compiler, linker and lib stuff
     
    5049LDFLAGS=-L$(ZLIB_DIR) -M $(LDEBUG)
    5150
    52 
    5351## Variables
    5452OBJS = \
     
    8886LIBNAME=libpng.lib
    8987
    90 
    9188## Implicit rules
    9289# Braces let make "batch" calls to the compiler,
     
    10198        $(LD) $(LDFLAGS) $*.obj $(LIBNAME) zlib.lib $(NOEHLIB)
    10299
    103 
    104100## Major targets
    105101all: libpng pngtest
     
    112108        pngtest
    113109
    114 
    115110## Minor Targets
    116111
    117 png.obj: png.c
    118 pngerror.obj: pngerror.c
    119 pngget.obj: pngget.c
    120 pngmem.obj: pngmem.c
    121 pngpread.obj: pngpread.c
    122 pngread.obj: pngread.c
    123 pngrio.obj: pngrio.c
    124 pngrtran.obj: pngrtran.c
    125 pngrutil.obj: pngrutil.c
    126 pngset.obj: pngset.c
    127 pngtrans.obj: pngtrans.c
    128 pngwio.obj: pngwio.c
    129 pngwrite.obj: pngwrite.c
    130 pngwtran.obj: pngwtran.c
    131 pngwutil.obj: pngwutil.c
    132 
     112png.obj: png.c png.h pngconf.h
     113pngerror.obj: pngerror.c png.h pngconf.h
     114pngget.obj: pngget.c png.h pngconf.h
     115pngmem.obj: pngmem.c png.h pngconf.h
     116pngpread.obj: pngpread.c png.h pngconf.h
     117pngread.obj: pngread.c png.h pngconf.h
     118pngrio.obj: pngrio.c png.h pngconf.h
     119pngrtran.obj: pngrtran.c png.h pngconf.h
     120pngrutil.obj: pngrutil.c png.h pngconf.h
     121pngset.obj: pngset.c png.h pngconf.h
     122pngtrans.obj: pngtrans.c png.h pngconf.h
     123pngwio.obj: pngwio.c png.h pngconf.h
     124pngwrite.obj: pngwrite.c png.h pngconf.h
     125pngwtran.obj: pngwtran.c png.h pngconf.h
     126pngwutil.obj: pngwutil.c png.h pngconf.h
     127pngtest.obj: pngtest.c png.h pngconf.h
    133128
    134129$(LIBNAME): $(OBJS)
     
    137132$(LIBOBJS), libpng
    138133|
    139 
    140134
    141135# Cleanup
     
    149143        -del pngout.png
    150144
    151 
    152145# End of makefile for libpng
  • trunk/src/3rdparty/libpng/scripts/makefile.beos

    r2 r561  
    11# makefile for libpng on BeOS x86 ELF with gcc
    22# modified from makefile.linux by Sander Stoks
    3 # Copyright (C) 2002, 2006 Glenn Randers-Pehrson
     3# Copyright (C) 2002, 2006, 2008 Glenn Randers-Pehrson
    44# Copyright (C) 1999 Greg Roelofs
    55# Copyright (C) 1996, 1997 Andreas Dilger
    6 # For conditions of distribution and use, see copyright notice in png.h
     6
     7# This code is released under the libpng license.
     8# For conditions of distribution and use, see the disclaimer
     9# and license in png.h
    710
    811# Library name:
    912LIBNAME=libpng12
    1013PNGMAJ = 0
    11 PNGMIN = 1.2.29
     14PNGMIN = 1.2.40
    1215PNGVER = $(PNGMAJ).$(PNGMIN)
    1316
     
    4245# On BeOS, -O1 is actually better than -O3.  This is a known bug but it's
    4346# still here in R4.5
    44 CFLAGS=-I$(ZLIBINC) -Wall -O1 -funroll-loops \
     47CFLAGS=-I$(ZLIBINC) -W -Wall -O1 -funroll-loops \
    4548        $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
    4649# LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz
     
    224227pngwutil.o pngwutil.pic.o: png.h pngconf.h
    225228pngpread.o pngpread.pic.o: png.h pngconf.h
     229
    226230pngtest.o: png.h pngconf.h
  • trunk/src/3rdparty/libpng/scripts/makefile.bor

    r2 r561  
    1212## Where zlib.h, zconf.h and zlib_MODEL.lib are
    1313ZLIB_DIR=..\zlib
    14 
    1514
    1615## Compiler, linker and lib stuff
     
    5857LDFLAGS=-M -L$(ZLIB_DIR) $(MODEL_ARG) $(LDEBUG)
    5958
     59## Variables
    6060
    61 ## Variables
    6261OBJS = \
    6362        png.obj \
     
    9695LIBNAME=libpng$(MODEL).lib
    9796
     97## Implicit rules
    9898
    99 ## Implicit rules
    10099# Braces let make "batch" calls to the compiler,
    101100# 2 calls instead of 12; space is important.
     
    106105        $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB)
    107106
     107## Major targets
    108108
    109 ## Major targets
    110109all: libpng pngtest
    111110
     
    117116        pngtest$(MODEL)
    118117
    119 
    120118## Minor Targets
    121119
    122 png.obj: png.c
    123 pngerror.obj: pngerror.c
    124 pngget.obj: pngget.c
    125 pngmem.obj: pngmem.c
    126 pngpread.obj: pngpread.c
    127 pngread.obj: pngread.c
    128 pngrio.obj: pngrio.c
    129 pngrtran.obj: pngrtran.c
    130 pngrutil.obj: pngrutil.c
    131 pngset.obj: pngset.c
    132 pngtrans.obj: pngtrans.c
    133 pngwio.obj: pngwio.c
    134 pngwrite.obj: pngwrite.c
    135 pngwtran.obj: pngwtran.c
    136 pngwutil.obj: pngwutil.c
    137 
     120png.obj: png.c png.h pngconf.h
     121pngerror.obj: pngerror.c png.h pngconf.h
     122pngget.obj: pngget.c png.h pngconf.h
     123pngmem.obj: pngmem.c png.h pngconf.h
     124pngpread.obj: pngpread.c png.h pngconf.h
     125pngread.obj: pngread.c png.h pngconf.h
     126pngrio.obj: pngrio.c png.h pngconf.h
     127pngrtran.obj: pngrtran.c png.h pngconf.h
     128pngrutil.obj: pngrutil.c png.h pngconf.h
     129pngset.obj: pngset.c png.h pngconf.h
     130pngtrans.obj: pngtrans.c png.h pngconf.h
     131pngwio.obj: pngwio.c png.h pngconf.h
     132pngwrite.obj: pngwrite.c png.h pngconf.h
     133pngwtran.obj: pngwtran.c png.h pngconf.h
     134pngwutil.obj: pngwutil.c png.h pngconf.h
    138135
    139136$(LIBNAME): $(OBJS)
     
    143140|
    144141
    145 
    146142pngtest$(MODEL).obj: pngtest.c
    147143        $(CC) $(CFLAGS) -opngtest$(MODEL) -c pngtest.c
     
    149145pngtest$(MODEL).exe: pngtest$(MODEL).obj
    150146        $(LD) $(LDFLAGS) pngtest$(MODEL).obj $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB)
    151 
    152147
    153148# Clean up anything else you want
     
    159154        -del *.map
    160155
    161 
    162156# End of makefile for libpng
  • trunk/src/3rdparty/libpng/scripts/makefile.cygwin

    r2 r561  
    44#   statically linked and one dynamically linked.
    55#
    6 # Copyright (C) 2002, 2006, 2007 Soren Anderson, Charles Wilson,
     6# Copyright (C) 2002, 2006-2008 Soren Anderson, Charles Wilson,
    77#    and Glenn Randers-Pehrson, based on makefile for linux-elf w/mmx by:
    88# Copyright (C) 1998-2000 Greg Roelofs
    99# Copyright (C) 1996, 1997 Andreas Dilger
    10 # For conditions of distribution and use, see copyright notice in png.h
     10
     11# This code is released under the libpng license.
     12# For conditions of distribution and use, see the disclaimer
     13# and license in png.h
    1114
    1215# This makefile intends to support building outside the src directory
     
    6164### if you don't need thread safety, but want the asm accel
    6265#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK \
    63 #       $(addprefix -I,$(ZLIBINC)) -Wall -O $(ALIGN) -funroll-loops \
     66#       $(addprefix -I,$(ZLIBINC)) -W -Wall -O $(ALIGN) -funroll-loops \
    6467#       -fomit-frame-pointer)  # $(WARNMORE) -g -DPNG_DEBUG=5
    6568### if you need thread safety and want (minimal) asm accel
    6669#CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
    67 #       -Wall -O $(ALIGN) -funroll-loops \
     70#       -W -Wall -O $(ALIGN) -funroll-loops \
    6871#       -fomit-frame-pointer)  # $(WARNMORE) -g -DPNG_DEBUG=5
    6972### Normal (non-asm) compilation
    7073CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
    71         -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \
     74        -W -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \
    7275        -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
    7376
     
    7578PNGMAJ = 0
    7679CYGDLL = 12
    77 PNGMIN = 1.2.29
     80PNGMIN = 1.2.40
    7881PNGVER = $(PNGMAJ).$(PNGMIN)
    7982
     
    177180        $(CC) $(CFLAGS) -c $< -o $@
    178181
    179 pngtest.o: pngtest.c
     182pngtest.o: pngtest.c png.h pngconf.h
    180183        $(CC) $(CFLAGS) -c $< -o $@
    181184
  • trunk/src/3rdparty/libpng/scripts/makefile.darwin

    r2 r561  
    11# makefile for libpng on Darwin / Mac OS X
    2 # Copyright (C) 2002, 2004, 2006 Glenn Randers-Pehrson
     2# Copyright (C) 2002, 2004, 2006, 2008 Glenn Randers-Pehrson
    33# Copyright (C) 2001 Christoph Pfisterer
    44# derived from makefile.linux:
    55#  Copyright (C) 1998, 1999 Greg Roelofs
    66#  Copyright (C) 1996, 1997 Andreas Dilger
    7 # For conditions of distribution and use, see copyright notice in png.h
     7
     8# This code is released under the libpng license.
     9# For conditions of distribution and use, see the disclaimer
     10# and license in png.h
    811
    912# where "make install" puts libpng.a, libpng12.dylib, png.h and pngconf.h
     
    1922# Library name:
    2023LIBNAME = libpng12
    21 PNGMAJ = 0
    22 PNGMIN = 1.2.29
     24PNGMAJ = 12
     25PNGMIN = 1.2.40
    2326PNGVER = $(PNGMAJ).$(PNGMIN)
    2427
     
    3942RM_F=/bin/rm -f
    4043
    41 # CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
    42 CFLAGS=-I$(ZLIBINC) -Wall -O -funroll-loops
     44# CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
     45CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops
    4346LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
    4447
     
    105108        $(CC) -dynamiclib \
    106109         -install_name $(LIBPATH)/$(LIBSOMAJ) \
    107          -current_version $(PNGVER) -compatibility_version $(PNGVER) \
     110         -current_version 0 -compatibility_version 0 \
    108111         -o $(LIBSOVER) \
    109112         $(OBJSDLL) -L$(ZLIBLIB) -lz
  • trunk/src/3rdparty/libpng/scripts/makefile.dec

    r2 r561  
    22# Copyright (C) 2000-2002, 2006 Glenn Randers-Pehrson
    33# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
    4 # For conditions of distribution and use, see copyright notice in png.h
     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
    58
    69# Library name:
    710PNGMAJ = 0
    8 PNGMIN = 1.2.29
     11PNGMIN = 1.2.40
    912PNGVER = $(PNGMAJ).$(PNGMIN)
    1013LIBNAME = libpng12
     
    206209pngrtran.o: png.h pngconf.h
    207210pngrutil.o: png.h pngconf.h
    208 pngtest.o: png.h pngconf.h
    209211pngtrans.o: png.h pngconf.h
    210212pngwrite.o: png.h pngconf.h
     
    213215pngpread.o: png.h pngconf.h
    214216
     217pngtest.o: png.h pngconf.h
  • trunk/src/3rdparty/libpng/scripts/makefile.dj2

    r2 r561  
    11# DJGPP (DOS gcc) makefile for libpng
    2 # Copyright (C) 2002 Glenn Randers-Pehrson
     2# Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson
    33# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
    4 # For conditions of distribution and use, see copyright notice in png.h
     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
    58
    69# where make install will put libpng.a and png.h
     
    4851pngrtran.o: png.h pngconf.h
    4952pngrutil.o: png.h pngconf.h
    50 pngtest.o: png.h pngconf.h
    5153pngtrans.o: png.h pngconf.h
    5254pngwrite.o: png.h pngconf.h
     
    5456pngwutil.o: png.h pngconf.h
    5557
     58pngtest.o: png.h pngconf.h
  • trunk/src/3rdparty/libpng/scripts/makefile.elf

    r2 r561  
    11# makefile for libpng.a and libpng12.so on Linux ELF with gcc
    2 # Copyright (C) 1998, 1999, 2002, 2006 Greg Roelofs and Glenn Randers-Pehrson
     2# Copyright (C) 1998, 1999, 2002, 2006, 2008 Greg Roelofs
     3# and Glenn Randers-Pehrson
    34# Copyright (C) 1996, 1997 Andreas Dilger
    4 # For conditions of distribution and use, see copyright notice in png.h
     5
     6# This code is released under the libpng license.
     7# For conditions of distribution and use, see the disclaimer
     8# and license in png.h
    59
    610# Modified for Debian by Junichi Uekawa and Josselin Mouette
     
    1317LIBNAME = libpng12
    1418PNGMAJ = 0
    15 PNGMIN = 1.2.29
     19PNGMIN = 1.2.40
    1620PNGVER = $(PNGMAJ).$(PNGMIN)
    1721
     
    5458# for pgcc version 2.95.1, -O3 is buggy; don't use it.
    5559
    56 CFLAGS=-Wall -D_REENTRANT -O2 \
     60CFLAGS=-W -Wall -D_REENTRANT -O2 \
    5761        $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
    5862
  • trunk/src/3rdparty/libpng/scripts/makefile.freebsd

    r2 r561  
    11# makefile for libpng under FreeBSD
    2 # Copyright (C) 2002, 2007 Glenn Randers-Pehrson and Andrey A. Chernov
    3 # For conditions of distribution and use, see copyright notice in png.h
     2# Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov
     3
     4# This code is released under the libpng license.
     5# For conditions of distribution and use, see the disclaimer
     6# and license in png.h
    47
    58PREFIX?=        /usr/local
  • trunk/src/3rdparty/libpng/scripts/makefile.gcc

    r2 r561  
    11# makefile for libpng using gcc (generic, static library)
     2# Copyright (C) 2008 Glenn Randers-Pehrson
    23# Copyright (C) 2000 Cosmin Truta
    34# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
    4 # For conditions of distribution and use, see copyright notice in png.h
     5
     6# This code is released under the libpng license.
     7# For conditions of distribution and use, see the disclaimer
     8# and license in png.h
    59
    610# Location of the zlib library and include files
     
    1923CRELEASE = -O2
    2024LDRELEASE = -s
    21 #CFLAGS = -Wall $(CDEBUG)
    22 CFLAGS = -Wall $(CRELEASE)
     25#CFLAGS = -W -Wall $(CDEBUG)
     26CFLAGS = -W -Wall $(CRELEASE)
    2327#LDFLAGS = $(LDDEBUG)
    2428LDFLAGS = $(LDRELEASE)
     
    3135
    3236# Variables
    33 OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
    34        pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \
    35        pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
     37OBJS =  png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
     38        pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \
     39        pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
    3640
    3741# Targets
     
    6165        $(RM_F) *$(O) libpng$(A) pngtest$(EXE) pngout.png
    6266
    63 png$(O): png.h pngconf.h
     67png$(O):      png.h pngconf.h
    6468pngerror$(O): png.h pngconf.h
    65 pngget$(O): png.h pngconf.h
    66 pngmem$(O): png.h pngconf.h
     69pngget$(O):   png.h pngconf.h
     70pngmem$(O):   png.h pngconf.h
    6771pngpread$(O): png.h pngconf.h
    68 pngread$(O): png.h pngconf.h
    69 pngrio$(O): png.h pngconf.h
     72pngread$(O):  png.h pngconf.h
     73pngrio$(O):   png.h pngconf.h
    7074pngrtran$(O): png.h pngconf.h
    7175pngrutil$(O): png.h pngconf.h
    72 pngset$(O): png.h pngconf.h
    73 pngtest$(O): png.h pngconf.h
     76pngset$(O):   png.h pngconf.h
    7477pngtrans$(O): png.h pngconf.h
    75 pngwio$(O): png.h pngconf.h
     78pngwio$(O):   png.h pngconf.h
    7679pngwrite$(O): png.h pngconf.h
    7780pngwtran$(O): png.h pngconf.h
    7881pngwutil$(O): png.h pngconf.h
    7982
     83pngtest$(O):  png.h pngconf.h
  • trunk/src/3rdparty/libpng/scripts/makefile.gcmmx

    r2 r561  
    11# makefile for libpng.a and libpng12.so on Linux ELF with gcc using MMX
    22# assembler code
    3 # Copyright 2002, 2006 Greg Roelofs and Glenn Randers-Pehrson
     3# Copyright 2002, 2006, 2008 Greg Roelofs and Glenn Randers-Pehrson
    44# Copyright 1998-2001 Greg Roelofs
    55# Copyright 1996-1997 Andreas Dilger
    6 # For conditions of distribution and use, see copyright notice in png.h
     6
     7# This code is released under the libpng license.
     8# For conditions of distribution and use, see the disclaimer
     9# and license in png.h
    710
    811# CAUTION: Do not use this makefile with gcc versions 2.7.2.2 and earlier.
     
    1518LIBNAME = libpng12
    1619PNGMAJ = 0
    17 PNGMIN = 1.2.29
     20PNGMIN = 1.2.40
    1821PNGVER = $(PNGMAJ).$(PNGMIN)
    1922
     
    5962# Remove -DPNG_THREAD_UNSAFE_OK if you need thread safety
    6063### for generic gcc:
    61 CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -Wall -O \
     64CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -W -Wall -O \
    6265        $(ALIGN) -funroll-loops \
    6366        -fomit-frame-pointer  # $(WARNMORE) -g -DPNG_DEBUG=5
    6467### for gcc 2.95.2 on 686:
    65 #CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -Wall -O \
     68#CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -W -Wall -O \
    6669#       -mcpu=i686 -malign-double -ffast-math -fstrict-aliasing \
    67 #       $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer 
     70#       $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer
    6871### for gcc 2.7.2.3 on 486 and up:
    69 #CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -Wall -O \
     72#CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -W -Wall -O \
    7073#       -m486 -malign-double -ffast-math \
    71 #       $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer 
     74#       $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer
    7275
    7376LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
  • trunk/src/3rdparty/libpng/scripts/makefile.hp64

    r2 r561  
    11# makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product.
    2 # Copyright (C) 1999-2002 Glenn Randers-Pehrson
     2# Copyright (C) 1999-2002, 2006, 2009 Glenn Randers-Pehrson
    33# Copyright (C) 1995 Guy Eric Schalnat, Group 42
    44# contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
    5 # For conditions of distribution and use, see copyright notice in png.h
     5
     6# This code is released under the libpng license.
     7# For conditions of distribution and use, see the disclaimer
     8# and license in png.h
    69
    710# Where the zlib library and include files are located
     
    1922LIBNAME = libpng12
    2023PNGMAJ = 0
    21 PNGMIN = 1.2.29
     24PNGMIN = 1.2.40
    2225PNGVER = $(PNGMAJ).$(PNGMIN)
    2326
     
    228231pngrtran.o: png.h pngconf.h
    229232pngrutil.o: png.h pngconf.h
    230 pngtest.o: png.h pngconf.h
    231233pngtrans.o: png.h pngconf.h
    232234pngwrite.o: png.h pngconf.h
     
    234236pngwutil.o: png.h pngconf.h
    235237pngpread.o: png.h pngconf.h
     238
     239pngtest.o: png.h pngconf.h
  • trunk/src/3rdparty/libpng/scripts/makefile.hpgcc

    r2 r561  
    11# makefile for libpng on HP-UX using GCC with the HP ANSI/C linker.
    2 # Copyright (C) 2002, 2006, 2007 Glenn Randers-Pehrson
     2# Copyright (C) 2002, 2006-2008 Glenn Randers-Pehrson
    33# Copyright (C) 2001, Laurent faillie
    44# Copyright (C) 1998, 1999 Greg Roelofs
    55# Copyright (C) 1996, 1997 Andreas Dilger
    6 # For conditions of distribution and use, see copyright notice in png.h
     6
     7# This code is released under the libpng license.
     8# For conditions of distribution and use, see the disclaimer
     9# and license in png.h
    710
    811# Library name:
    912LIBNAME = libpng12
    1013PNGMAJ = 0
    11 PNGMIN = 1.2.29
     14PNGMIN = 1.2.40
    1215PNGVER = $(PNGMAJ).$(PNGMIN)
    1316
     
    5457# for pgcc version 2.95.1, -O3 is buggy; don't use it.
    5558
    56 CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
     59CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
    5760        $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
    5861#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
  • trunk/src/3rdparty/libpng/scripts/makefile.hpux

    r2 r561  
    33# Copyright (C) 1995 Guy Eric Schalnat, Group 42
    44# contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
    5 # For conditions of distribution and use, see copyright notice in png.h
     5
     6# This code is released under the libpng license.
     7# For conditions of distribution and use, see the disclaimer
     8# and license in png.h
    69
    710# Where the zlib library and include files are located
     
    1922LIBNAME = libpng12
    2023PNGMAJ = 0
    21 PNGMIN = 1.2.29
     24PNGMIN = 1.2.40
    2225PNGVER = $(PNGMAJ).$(PNGMIN)
    2326
     
    225228pngrtran.o: png.h pngconf.h
    226229pngrutil.o: png.h pngconf.h
    227 pngtest.o: png.h pngconf.h
    228230pngtrans.o: png.h pngconf.h
    229231pngwrite.o: png.h pngconf.h
     
    231233pngwutil.o: png.h pngconf.h
    232234pngpread.o: png.h pngconf.h
     235
     236pngtest.o: png.h pngconf.h
  • trunk/src/3rdparty/libpng/scripts/makefile.ibmc

    r2 r561  
    11# Makefile for libpng (static)
    22# IBM C version 3.x for Win32 and OS/2
     3# Copyright (C) 2006 Glenn Randers-Pehrson
    34# Copyright (C) 2000 Cosmin Truta
    4 # For conditions of distribution and use, see copyright notice in png.h
     5
     6# This code is released under the libpng license.
     7# For conditions of distribution and use, see the disclaimer
     8# and license in png.h
     9
    510# Notes:
    611#   Derived from makefile.std
     
    5459        $(RM) pngout.png
    5560
    56 png$(O): png.h pngconf.h
     61png$(O):      png.h pngconf.h
    5762pngerror$(O): png.h pngconf.h
    58 pngget$(O): png.h pngconf.h
    59 pngmem$(O): png.h pngconf.h
     63pngget$(O):   png.h pngconf.h
     64pngmem$(O):   png.h pngconf.h
    6065pngpread$(O): png.h pngconf.h
    61 pngread$(O): png.h pngconf.h
    62 pngrio$(O): png.h pngconf.h
     66pngread$(O):  png.h pngconf.h
     67pngrio$(O):   png.h pngconf.h
    6368pngrtran$(O): png.h pngconf.h
    6469pngrutil$(O): png.h pngconf.h
    65 pngset$(O): png.h pngconf.h
    66 pngtest$(O): png.h pngconf.h
     70pngset$(O):   png.h pngconf.h
    6771pngtrans$(O): png.h pngconf.h
    68 pngwio$(O): png.h pngconf.h
     72pngwio$(O):   png.h pngconf.h
    6973pngwrite$(O): png.h pngconf.h
    7074pngwtran$(O): png.h pngconf.h
    7175pngwutil$(O): png.h pngconf.h
     76
     77pngtest$(O):  png.h pngconf.h
  • trunk/src/3rdparty/libpng/scripts/makefile.intel

    r2 r561  
    22# Microsoft Visual C++ with Intel C/C++ Compiler 4.0 and later
    33
     4# Copyright (C) 2006 Glenn Randers-Pehrson
    45# Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is
    56# copyright 1995 Guy Eric Schalnat, Group 42, Inc.
    6 # For conditions of distribution and use, see copyright notice in png.h
     7
     8# This code is released under the libpng license.
     9# For conditions of distribution and use, see the disclaimer
     10# and license in png.h
    711
    812# To use, do "nmake /f scripts\makefile.intel"
    913
     14# ------------------- Intel C/C++ Compiler 4.0 and later -------------------
    1015
    1116# Where the zlib library and include files are located
     
    2631
    2732# --------------------------------------------------------------------------
    28 
    2933
    3034CC=icl -c
     
    7478        $(CC) $(CFLAGS) $*.c $(ERRFILE)
    7579
    76 pngtest$(O): png.h pngconf.h
    77         $(CC) $(CFLAGS) $*.c $(ERRFILE)
    78 
    7980pngtrans$(O): png.h pngconf.h
    8081        $(CC) $(CFLAGS) $*.c $(ERRFILE)
     
    9697        $(LD) $(LDFLAGS) /OUT:pngtest.exe pngtest.obj libpng.lib $(ZLIBLIB)\zlib.lib
    9798
     99pngtest$(O): png.h pngconf.h
     100        $(CC) $(CFLAGS) $*.c $(ERRFILE)
     101
    98102test: pngtest.exe
    99103        pngtest.exe
  • trunk/src/3rdparty/libpng/scripts/makefile.knr

    r2 r561  
    11# makefile for libpng
    2 # Copyright (C) 2002 Glenn Randers-Pehrson
     2# Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson
    33# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
    4 # For conditions of distribution and use, see copyright notice in png.h
     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
    58
    69# This makefile requires the file ansi2knr.c, which you can get
     
    5962        ./pngtest
    6063
    61 install: libpng.a
     64install: libpng.a png.h pngconf.h
    6265        -@mkdir $(DESTDIR)$(INCPATH)
    6366        -@mkdir $(DESTDIR)$(INCPATH)/libpng
     
    9396pngrtran.o: png.h pngconf.h
    9497pngrutil.o: png.h pngconf.h
    95 pngtest.o: png.h pngconf.h
    9698pngtrans.o: png.h pngconf.h
    9799pngwrite.o: png.h pngconf.h
    98100pngwtran.o: png.h pngconf.h
    99101pngwutil.o: png.h pngconf.h
     102
     103pngtest.o: png.h pngconf.h
  • trunk/src/3rdparty/libpng/scripts/makefile.linux

    r2 r561  
    11# makefile for libpng.a and libpng12.so on Linux ELF with gcc
    2 # Copyright (C) 1998, 1999, 2002, 2006 Greg Roelofs and Glenn Randers-Pehrson
     2# Copyright (C) 1998, 1999, 2002, 2006, 2008 Greg Roelofs and
     3# Glenn Randers-Pehrson
    34# Copyright (C) 1996, 1997 Andreas Dilger
    4 # For conditions of distribution and use, see copyright notice in png.h
     5
     6# This code is released under the libpng license.
     7# For conditions of distribution and use, see the disclaimer
     8# and license in png.h
    59
    610# Library name:
    711LIBNAME = libpng12
    812PNGMAJ = 0
    9 PNGMIN = 1.2.29
     13PNGMIN = 1.2.40
    1014PNGVER = $(PNGMAJ).$(PNGMIN)
    1115
     
    4852# for pgcc version 2.95.1, -O3 is buggy; don't use it.
    4953
    50 CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
     54CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
    5155        $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
    5256
     
    7478DM=$(DESTDIR)$(MANPATH)
    7579
    76 OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
     80OBJS =  png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
    7781        pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
    7882        pngwtran.o pngmem.o pngerror.o pngpread.o
  • trunk/src/3rdparty/libpng/scripts/makefile.mingw

    r2 r561  
    44#   statically linked and one dynamically linked.
    55#
    6 # Built from makefile.cygwin
    7 # Copyright (C) 2002, 2006 Soren Anderson, Charles Wilson,
     6# Copyright (C) 2002, 2006, 2008 Soren Anderson, Charles Wilson,
    87#    and Glenn Randers-Pehrson, based on makefile for linux-elf w/mmx by:
    98# Copyright (C) 1998-2000, 2007 Greg Roelofs
    109# Copyright (C) 1996, 1997 Andreas Dilger
    11 # For conditions of distribution and use, see copyright notice in png.h
    12 
     10
     11# This code is released under the libpng license.
     12# For conditions of distribution and use, see the disclaimer
     13# and license in png.h
     14
     15# Built from makefile.cygwin
    1316
    1417# This makefile intends to support building outside the src directory
     
    6164### if you don't need thread safety, but want the asm accel
    6265#CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK \
    63 #       $(addprefix -I,$(ZLIBINC)) -Wall -O $(ALIGN) -funroll-loops \
     66#       $(addprefix -I,$(ZLIBINC)) -W -Wall -O $(ALIGN) -funroll-loops \
    6467#       -fomit-frame-pointer)  # $(WARNMORE) -g -DPNG_DEBUG=5
    6568### if you need thread safety and want (minimal) asm accel
    6669#CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
    67 #       -Wall -O $(ALIGN) -funroll-loops \
     70#       -W -Wall -O $(ALIGN) -funroll-loops \
    6871#       -fomit-frame-pointer)  # $(WARNMORE) -g -DPNG_DEBUG=5
    6972### Normal (non-asm) compilation
    7073CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
    71         -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \
     74        -W -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \
    7275        -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5
    7376
     
    7578PNGMAJ = 0
    7679MINGDLL = 12
    77 PNGMIN = 1.2.29
     80PNGMIN = 1.2.40
    7881PNGVER = $(PNGMAJ).$(PNGMIN)
    7982
     
    285288
    286289pngtest.o pngtest.pic.o:        png.h pngconf.h pngtest.c
    287 
    288 
    289 
  • trunk/src/3rdparty/libpng/scripts/makefile.mips

    r2 r561  
    22# Copyright (C) Glenn Randers-Pehrson
    33# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
    4 # For conditions of distribution and use, see copyright notice in png.h
     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
    58
    69# where make install puts libpng.a and png.h
     
    7780pngrtran.o: png.h pngconf.h
    7881pngrutil.o: png.h pngconf.h
    79 pngtest.o: png.h pngconf.h
    8082pngtrans.o: png.h pngconf.h
    8183pngwrite.o: png.h pngconf.h
    8284pngwtran.o: png.h pngconf.h
    8385pngwutil.o: png.h pngconf.h
     86
     87pngtest.o: png.h pngconf.h
  • 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 ;
  • trunk/src/3rdparty/libpng/scripts/makefile.ne12bsd

    r2 r561  
    33# make includes && make install
    44# Copyright (C) 2002 Patrick R.L. Welche
    5 # Copyright (C) 2007 Glenn Randers-Pehrson
    6 # For conditions of distribution and use, see copyright notice in png.h
     5# Copyright (C) 2007, 2009 Glenn Randers-Pehrson
     6
     7# This code is released under the libpng license.
     8# For conditions of distribution and use, see the disclaimer
     9# and license in png.h
    710
    811# You should also run makefile.netbsd
     
    1518LIB=    png12
    1619SHLIB_MAJOR=    0
    17 SHLIB_MINOR=    1.2.29
     20SHLIB_MINOR=    1.2.40
    1821SRCS=   png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
    1922        pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
     
    2427CPPFLAGS+=-I${.CURDIR}
    2528
    26 # something like this for mmx assembler, but it core dumps for me at the moment
     29# We should be able to do something like this instead of the manual
     30# uncommenting, but it core dumps for me at the moment:
    2731# .if ${MACHINE_ARCH} == "i386"
    2832#   CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK
  • trunk/src/3rdparty/libpng/scripts/makefile.netbsd

    r2 r561  
    33# make includes && make install
    44# Copyright (C) 2002 Patrick R.L. Welche
    5 # Copyright (C) 2007 Glenn Randers-Pehrson
    6 # For conditions of distribution and use, see copyright notice in png.h
     5# Copyright (C) 2007, 2009 Glenn Randers-Pehrson
     6
     7# This code is released under the libpng license.
     8# For conditions of distribution and use, see the disclaimer
     9# and license in png.h
    710
    811# You should also run makefile.ne0bsd
     
    1518LIB=    png
    1619SHLIB_MAJOR=    3
    17 SHLIB_MINOR=    1.2.29
     20SHLIB_MINOR=    1.2.40
    1821SRCS=   png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
    1922        pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
     
    2427CPPFLAGS+=-I${.CURDIR}
    2528
    26 # something like this for mmx assembler, but it core dumps for me at the moment
     29# We should be able to do something like this instead of the manual
     30# uncommenting, but it core dumps for me at the moment:
    2731# .if ${MACHINE_ARCH} == "i386"
    2832#   CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK
  • trunk/src/3rdparty/libpng/scripts/makefile.nommx

    r2 r561  
    11# makefile for libpng.a and libpng12.so on Linux ELF with gcc
    2 # Copyright (C) 1998, 1999, 2002, 2006, 2007 Greg Roelofs and
     2# Copyright (C) 1998, 1999, 2002, 2006-2008 Greg Roelofs and
    33# Glenn Randers-Pehrson
    44# Copyright (C) 1996, 1997 Andreas Dilger
    5 # For conditions of distribution and use, see copyright notice in png.h
     5
     6# This code is released under the libpng license.
     7# For conditions of distribution and use, see the disclaimer
     8# and license in png.h
    69
    710# Library name:
    811LIBNAME = libpng12
    912PNGMAJ = 0
    10 PNGMIN = 1.2.29
     13PNGMIN = 1.2.40
    1114PNGVER = $(PNGMAJ).$(PNGMIN)
    1215
     
    4952# for pgcc version 2.95.1, -O3 is buggy; don't use it.
    5053
    51 CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
     54CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
    5255        $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
    5356
     
    234237# DO NOT DELETE THIS LINE -- make depend depends on it.
    235238
    236 png.o png.pic.o: png.h pngconf.h
    237 pngerror.o pngerror.pic.o: png.h pngconf.h
    238 pngrio.o pngrio.pic.o: png.h pngconf.h
    239 pngwio.o pngwio.pic.o: png.h pngconf.h
    240 pngmem.o pngmem.pic.o: png.h pngconf.h
    241 pngset.o pngset.pic.o: png.h pngconf.h
    242 pngget.o pngget.pic.o: png.h pngconf.h
    243 pngread.o pngread.pic.o: png.h pngconf.h
    244 pngrtran.o pngrtran.pic.o: png.h pngconf.h
    245 pngrutil.o pngrutil.pic.o: png.h pngconf.h
    246 pngtrans.o pngtrans.pic.o: png.h pngconf.h
    247 pngwrite.o pngwrite.pic.o: png.h pngconf.h
    248 pngwtran.o pngwtran.pic.o: png.h pngconf.h
    249 pngwutil.o pngwutil.pic.o: png.h pngconf.h
    250 pngpread.o pngpread.pic.o: png.h pngconf.h
    251 
    252 pngtest.o: png.h pngconf.h
     239png.o png.pic.o:                png.h pngconf.h png.c
     240pngerror.o pngerror.pic.o:      png.h pngconf.h pngerror.c
     241pngrio.o pngrio.pic.o:          png.h pngconf.h pngrio.c
     242pngwio.o pngwio.pic.o:          png.h pngconf.h pngwio.c
     243pngmem.o pngmem.pic.o:          png.h pngconf.h pngmem.c
     244pngset.o pngset.pic.o:          png.h pngconf.h pngset.c
     245pngget.o pngget.pic.o:          png.h pngconf.h pngget.c
     246pngread.o pngread.pic.o:        png.h pngconf.h pngread.c
     247pngrtran.o pngrtran.pic.o:      png.h pngconf.h pngrtran.c
     248pngrutil.o pngrutil.pic.o:      png.h pngconf.h pngrutil.c
     249pngtrans.o pngtrans.pic.o:      png.h pngconf.h pngtrans.c
     250pngwrite.o pngwrite.pic.o:      png.h pngconf.h pngwrite.c
     251pngwtran.o pngwtran.pic.o:      png.h pngconf.h pngwtran.c
     252pngwutil.o pngwutil.pic.o:      png.h pngconf.h pngwutil.c
     253pngpread.o pngpread.pic.o:      png.h pngconf.h pngpread.c
     254
     255pngtest.o:                      png.h pngconf.h pngtest.c
  • trunk/src/3rdparty/libpng/scripts/makefile.openbsd

    r2 r561  
    11# makefile for libpng
    22# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
    3 # Copyright (C) 2007 Glenn Randers-Pehrson
    4 # For conditions of distribution and use, see copyright notice in png.h
     3# Copyright (C) 2007-2008 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
    58
    69PREFIX?= /usr/local
     
    912
    1013SHLIB_MAJOR=    0
    11 SHLIB_MINOR=    1.2.29
     14SHLIB_MINOR=    1.2.40
    1215
    1316LIB=    png
     
    1821HDRS=   png.h pngconf.h
    1922
    20 CFLAGS+= -Wall
    21 CPPFLAGS+= -I${.CURDIR} -DPNG_NO_MMX_CODE 
     23CFLAGS+= -W -Wall
     24CPPFLAGS+= -I${.CURDIR} -DPNG_NO_MMX_CODE
    2225
    2326NOPROFILE= Yes
  • trunk/src/3rdparty/libpng/scripts/makefile.os2

    r2 r561  
    11# makefile for libpng on OS/2 with gcc
    2 # For conditions of distribution and use, see copyright notice in png.h
     2
     3# This code is released under the libpng license.
     4# For conditions of distribution and use, see the disclaimer
     5# and license in png.h
    36
    47# Related files: pngos2.def
     
    1316        -Wmissing-declarations -Wtraditional -Wcast-align \
    1417        -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
    15 CFLAGS=-I$(ZLIBINC) -Wall -O6 -funroll-loops -malign-loops=2 \
     18CFLAGS=-I$(ZLIBINC) -W -Wall -O6 -funroll-loops -malign-loops=2 \
    1619        -malign-functions=2 #$(WARNMORE) -g -DPNG_DEBUG=5
    1720LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lzdll -Zcrtdll
  • trunk/src/3rdparty/libpng/scripts/makefile.sco

    r2 r561  
    55# Copyright (C) 1998 Greg Roelofs
    66# Copyright (C) 1996, 1997 Andreas Dilger
    7 # For conditions of distribution and use, see copyright notice in png.h
     7
     8# This code is released under the libpng license.
     9# For conditions of distribution and use, see the disclaimer
     10# and license in png.h
    811
    912# Library name:
    1013LIBNAME = libpng12
    1114PNGMAJ = 0
    12 PNGMIN = 1.2.29
     15PNGMIN = 1.2.40
    1316PNGVER = $(PNGMAJ).$(PNGMIN)
    1417
  • trunk/src/3rdparty/libpng/scripts/makefile.sggcc

    r2 r561  
    22# Copyright (C) 2001-2002, 2006 Glenn Randers-Pehrson
    33# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
    4 # For conditions of distribution and use, see copyright notice in png.h
     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
    58
    69# Library name:
    710LIBNAME=libpng12
    811PNGMAJ = 0
    9 PNGMIN = 1.2.29
     12PNGMIN = 1.2.40
    1013PNGVER = $(PNGMAJ).$(PNGMIN)
    1114
     
    213216
    214217clean:
    215         $(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \
    216         $(LIBSO) $(LIBSOMAJ)* \
    217         $(OLDSOVER) \
    218         so_locations
     218        $(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc \
     219        so_locations libpng-config $(LIBSO) $(LIBSOMAJ)* $(OLDSOVER)
    219220
    220221DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
     
    234235pngrtran.o: png.h pngconf.h
    235236pngrutil.o: png.h pngconf.h
    236 pngtest.o: png.h pngconf.h
    237237pngtrans.o: png.h pngconf.h
    238238pngwrite.o: png.h pngconf.h
     
    241241pngpread.o: png.h pngconf.h
    242242
     243pngtest.o: png.h pngconf.h
  • trunk/src/3rdparty/libpng/scripts/makefile.sgi

    r2 r561  
    22# Copyright (C) 2001-2002, 2006, 2007 Glenn Randers-Pehrson
    33# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
    4 # For conditions of distribution and use, see copyright notice in png.h
     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
    58
    69# Library name:
    710LIBNAME=libpng12
    811PNGMAJ = 0
    9 PNGMIN = 1.2.29
     12PNGMIN = 1.2.40
    1013PNGVER = $(PNGMAJ).$(PNGMIN)
    1114
     
    237240pngrtran.o: png.h pngconf.h
    238241pngrutil.o: png.h pngconf.h
    239 pngtest.o: png.h pngconf.h
    240242pngtrans.o: png.h pngconf.h
    241243pngwrite.o: png.h pngconf.h
     
    244246pngpread.o: png.h pngconf.h
    245247
     248pngtest.o: png.h pngconf.h
  • trunk/src/3rdparty/libpng/scripts/makefile.so9

    r2 r561  
    22# Updated by Chad Schrock for Solaris 9
    33# Contributed by William L. Sebok, based on makefile.linux
    4 # Copyright (C) 2002, 2006 Glenn Randers-Pehrson
     4# Copyright (C) 2002, 2006, 2008 Glenn Randers-Pehrson
    55# Copyright (C) 1998-2001 Greg Roelofs
    66# Copyright (C) 1996-1997 Andreas Dilger
    7 # For conditions of distribution and use, see copyright notice in png.h
     7
     8# This code is released under the libpng license.
     9# For conditions of distribution and use, see the disclaimer
     10# and license in png.h
    811
    912# Library name:
    1013PNGMAJ = 0
    11 PNGMIN = 1.2.29
     14PNGMIN = 1.2.40
    1215PNGVER = $(PNGMAJ).$(PNGMIN)
    1316LIBNAME = libpng12
     
    4851        -Wmissing-declarations -Wtraditional -Wcast-align \
    4952        -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
    50 #CFLAGS=-I$(ZLIBINC) -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE
     53#CFLAGS=-I$(ZLIBINC) -W -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE
    5154CFLAGS=-I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE
    5255LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
  • trunk/src/3rdparty/libpng/scripts/makefile.solaris

    r2 r561  
    11# makefile for libpng on Solaris 2.x with gcc
    2 # Copyright (C) 2004, 2006, 2007 Glenn Randers-Pehrson
     2# Copyright (C) 2004, 2006-2008 Glenn Randers-Pehrson
    33# Contributed by William L. Sebok, based on makefile.linux
    44# Copyright (C) 1998 Greg Roelofs
    55# Copyright (C) 1996, 1997 Andreas Dilger
    6 # For conditions of distribution and use, see copyright notice in png.h
     6
     7# This code is released under the libpng license.
     8# For conditions of distribution and use, see the disclaimer
     9# and license in png.h
    710
    811# Library name:
    912LIBNAME = libpng12
    1013PNGMAJ = 0
    11 PNGMIN = 1.2.29
     14PNGMIN = 1.2.40
    1215PNGVER = $(PNGMAJ).$(PNGMIN)
    1316
     
    4447        -Wmissing-declarations -Wtraditional -Wcast-align \
    4548        -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
    46 CFLAGS=-I$(ZLIBINC) -Wall -O \
    47         -DPNG_NO_MMX_CODE; \
     49CFLAGS=-I$(ZLIBINC) -W -Wall -O -DPNG_NO_MMX_CODE; \
    4850        # $(WARNMORE) -g -DPNG_DEBUG=5
    4951LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
  • trunk/src/3rdparty/libpng/scripts/makefile.solaris-x86

    r2 r561  
    11# makefile for libpng on Solaris 2.x with gcc
    2 # Copyright (C) 2004, 2006, 2007 Glenn Randers-Pehrson
     2# Copyright (C) 2004, 2006-2008 Glenn Randers-Pehrson
    33# Contributed by William L. Sebok, based on makefile.linux
    44# Copyright (C) 1998 Greg Roelofs
    55# Copyright (C) 1996, 1997 Andreas Dilger
    6 # For conditions of distribution and use, see copyright notice in png.h
     6
     7# This code is released under the libpng license.
     8# For conditions of distribution and use, see the disclaimer
     9# and license in png.h
    710
    811# Library name:
    912LIBNAME = libpng12
    1013PNGMAJ = 0
    11 PNGMIN = 1.2.29
     14PNGMIN = 1.2.40
    1215PNGVER = $(PNGMAJ).$(PNGMIN)
    1316
     
    4447        -Wmissing-declarations -Wtraditional -Wcast-align \
    4548        -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
    46 CFLAGS=-I$(ZLIBINC) -Wall -O \
     49CFLAGS=-I$(ZLIBINC) -W -Wall -O \
    4750        # $(WARNMORE) -g -DPNG_DEBUG=5
    4851LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
  • trunk/src/3rdparty/libpng/scripts/makefile.std

    r2 r561  
    22# Copyright (C) 2002, 2006 Glenn Randers-Pehrson
    33# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
    4 # For conditions of distribution and use, see copyright notice in png.h
     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
    58
    69# where make install puts libpng.a and png.h
     
    8487pngrtran.o: png.h pngconf.h
    8588pngrutil.o: png.h pngconf.h
    86 pngtest.o: png.h pngconf.h
    8789pngtrans.o: png.h pngconf.h
    8890pngwrite.o: png.h pngconf.h
     
    9193pngpread.o: png.h pngconf.h
    9294
     95pngtest.o: png.h pngconf.h
  • trunk/src/3rdparty/libpng/scripts/makefile.sunos

    r2 r561  
    22# Copyright (C) 2002, 2006 Glenn Randers-Pehrson
    33# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
    4 # For conditions of distribution and use, see copyright notice in png.h
     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
    58
    69# where make install puts libpng.a and png.h
     
    8992pngrtran.o: png.h pngconf.h
    9093pngrutil.o: png.h pngconf.h
    91 pngtest.o: png.h pngconf.h
    9294pngtrans.o: png.h pngconf.h
    9395pngwrite.o: png.h pngconf.h
     
    9698pngpread.o: png.h pngconf.h
    9799
     100pngtest.o: png.h pngconf.h
  • trunk/src/3rdparty/libpng/scripts/makefile.vcawin32

    r2 r561  
    11# makefile for libpng
     2# Copyright (C) 2006,2009 Glenn Randers-Pehrson
    23# Copyright (C) 1998 Tim Wegner
    3 # For conditions of distribution and use, see copyright notice in png.h
     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# To use, do "nmake /f scripts\makefile.vcawin32"
    611
    7 # -------- Microsoft Visual C++ 5.0 and later, uses assembler code --------
     12# -------- Microsoft Visual C++ 2.0 and later, no assembler code --------
    813# If you don't want to use assembler (MMX) code, use makefile.vcwin32 instead.
    914
     
    1217LD = link
    1318AR = lib
    14 CFLAGS  = -DPNG_USE_PNGVCRD -nologo -MD -O2 -W3 -I..\zlib
     19CFLAGS  = -nologo -DPNG_USE_PNGVCRD -MD -O2 -W3 -I..\zlib
    1520LDFLAGS = -nologo
    1621ARFLAGS = -nologo
     
    6570        $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
    6671
    67 pngtest$(O): png.h pngconf.h
    68         $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
    69 
    7072pngtrans$(O): png.h pngconf.h
    7173        $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
     
    8486        $(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE)
    8587
     88pngtest$(O): png.h pngconf.h
     89        $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
     90
    8691pngtest.exe: pngtest$(O) libpng.lib
    8792        $(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE)
  • trunk/src/3rdparty/libpng/scripts/makefile.vcwin32

    r2 r561  
    11# makefile for libpng
    22# Copyright (C) 1998 Tim Wegner
    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# To use, do "nmake /f scripts\makefile.vcwin32"
     
    6570        $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
    6671
    67 pngtest$(O): png.h pngconf.h
    68         $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
    69 
    7072pngtrans$(O): png.h pngconf.h
    7173        $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
     
    8486        $(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE)
    8587
     88pngtest$(O): png.h pngconf.h
     89        $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
     90
    8691pngtest.exe: pngtest$(O) libpng.lib
    8792        $(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE)
  • trunk/src/3rdparty/libpng/scripts/makefile.watcom

    r2 r561  
    44# Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is
    55# copyright 1995 Guy Eric Schalnat, Group 42, Inc.
    6 # For conditions of distribution and use, see copyright notice in png.h
     6
     7# This code is released under the libpng license.
     8# For conditions of distribution and use, see the disclaimer
     9# and license in png.h
    710
    811# To use, do "wmake /f scripts\makefile.watcom"
  • trunk/src/3rdparty/libpng/scripts/makevms.com

    r2 r561  
    5656$   CALL MAKE png.OBJ "cc ''CCOPT' png" -
    5757        png.c png.h pngconf.h
    58 $   CALL MAKE pngpread.OBJ "cc ''CCOPT' pngpread" -
    59                                          pngpread.c png.h pngconf.h
    6058$   CALL MAKE pngset.OBJ "cc ''CCOPT' pngset" -
    6159        pngset.c png.h pngconf.h
     
    6563        pngread.c png.h pngconf.h
    6664$   CALL MAKE pngpread.OBJ "cc ''CCOPT' pngpread" -
    67                                          pngpread.c png.h pngconf.h
     65        pngpread.c png.h pngconf.h
    6866$   CALL MAKE pngrtran.OBJ "cc ''CCOPT' pngrtran" -
    6967        pngrtran.c png.h pngconf.h
  • trunk/src/3rdparty/libpng/scripts/pngos2.def

    r2 r561  
    33;----------------------------------------
    44
    5 ; Version 1.2.29
     5; Version 1.2.40
    66
    77LIBRARY         PNG
  • trunk/src/3rdparty/libpng/scripts/pngw32.def

    r2 r561  
    66
    77EXPORTS
    8 ;Version 1.2.29
     8;Version 1.2.40
    99  png_build_grayscale_palette  @1
    1010  png_check_sig        @2
     
    190190; For compatibility with 1.0.7-1.0.11
    191191; png_info_init @174
     192; png_read_init_3, png_info_init_3, and png_write_init_3 are deprecated.
    192193  png_read_init_3    @175
    193194  png_write_init_3    @176
  • trunk/src/3rdparty/libpng/scripts/smakefile.ppc

    r2 r561  
    22# makefile for libpng and SAS C V6.58/7.00 PPC compiler
    33# Copyright (C) 1998 by Andreas R. Kleinert
    4 # For conditions of distribution and use, see copyright notice in png.h
     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
    58
    69CC       = scppc
Note: See TracChangeset for help on using the changeset viewer.