Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
10 deleted
7 edited
6 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/3rdparty/libpng/projects/visualc6/README.txt

    r2 r846  
    33Copyright (C) 2000-2004 Simon-Pierre Cadieux.
    44Copyright (C) 2004 Cosmin Truta.
     5
     6This code is released under the libpng license.
    57For conditions of distribution and use, see copyright notice in png.h
    68
    … …  
    3234This project builds the libpng binaries as follows:
    3335
    34 * Win32_DLL_Release\libpng13.dll      DLL build
    35 * Win32_DLL_Debug\libpng13d.dll       DLL build (debug version)
    36 * Win32_DLL_ASM_Release\libpng13.dll  DLL build using ASM code
    37 * Win32_DLL_ASM_Debug\libpng13d.dll   DLL build using ASM (debug version)
    38 * Win32_DLL_VB\libpng13vb.dll         DLL build for Visual Basic, using stdcall
     36* Win32_DLL_Release\libpng14.dll      DLL build
     37* Win32_DLL_Debug\libpng14d.dll       DLL build (debug version)
     38* Win32_DLL_VB\libpng14vb.dll         DLL build for Visual Basic, using stdcall
    3939* Win32_LIB_Release\libpng.lib        static build
    4040* Win32_LIB_Debug\libpngd.lib         static build (debug version)
    41 * Win32_LIB_ASM_Release\libpng.lib    static build using ASM code
    42 * Win32_LIB_ASM_Debug\libpngd.lib     static build using ASM (debug version)
    4341
    4442

  • trunk/src/3rdparty/libpng/projects/visualc6/libpng.dsp

    r2 r846  
    2121!MESSAGE "libpng - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
    2222!MESSAGE "libpng - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
    23 !MESSAGE "libpng - Win32 DLL ASM Release" (based on "Win32 (x86) Dynamic-Link Library")
    24 !MESSAGE "libpng - Win32 DLL ASM Debug" (based on "Win32 (x86) Dynamic-Link Library")
    2523!MESSAGE "libpng - Win32 DLL VB" (based on "Win32 (x86) Dynamic-Link Library")
    2624!MESSAGE "libpng - Win32 LIB Release" (based on "Win32 (x86) Static Library")
    2725!MESSAGE "libpng - Win32 LIB Debug" (based on "Win32 (x86) Static Library")
    28 !MESSAGE "libpng - Win32 LIB ASM Release" (based on "Win32 (x86) Static Library")
    29 !MESSAGE "libpng - Win32 LIB ASM Debug" (based on "Win32 (x86) Static Library")
    3026!MESSAGE
    3127
    … …  
    5147# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
    5248# SUBTRACT BASE CPP /YX /Yc /Yu
    53 # ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_BUILD_DLL" /D "PNG_NO_MMX_CODE" /D "ZLIB_DLL" /D "_CRT_SECURE_NO_WARNINGS" /FD /c
     49# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /FD /c
    5450# SUBTRACT CPP /YX /Yc /Yu
    5551MTL=midl.exe
    … …  
    5753# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
    5854RSC=rc.exe
    59 # ADD BASE RSC /l 0x409 /d "NDEBUG"
    60 # ADD RSC /l 0x409 /i "..\.." /d "NDEBUG"
     55# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG"
     56# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG"
    6157BSC32=bscmake.exe
    6258# ADD BASE BSC32 /nologo
    … …  
    6460LINK32=link.exe
    6561# ADD BASE LINK32 /nologo /dll /machine:I386
    66 # ADD LINK32 zlib1.lib /nologo /dll /machine:I386 /out:"Win32_DLL_Release\libpng13.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_Release"
     62# ADD LINK32 zlib1.lib /nologo /dll /machine:I386 /out:"Win32_DLL_Release\libpng14.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_Release"
    6763
    6864!ELSEIF  "$(CFG)" == "libpng - Win32 DLL Debug"
    … …  
    8278# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
    8379# SUBTRACT BASE CPP /YX /Yc /Yu
    84 # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "PNG_NO_MMX_CODE" /D PNG_DEBUG=1 /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c
     80# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /FD /GZ /c
    8581# SUBTRACT CPP /YX /Yc /Yu
    8682MTL=midl.exe
    … …  
    8884# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
    8985RSC=rc.exe
    90 # ADD BASE RSC /l 0x409 /d "_DEBUG"
    91 # ADD RSC /l 0x409 /i "..\.." /d "_DEBUG" /d PNG_DEBUG=1
     86# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG"
     87# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG" /d PNG_DEBUG=1
    9288BSC32=bscmake.exe
    9389# ADD BASE BSC32 /nologo
    … …  
    9591LINK32=link.exe
    9692# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
    97 # ADD LINK32 zlib1d.lib /nologo /dll /debug /machine:I386 /out:"Win32_DLL_Debug\libpng13d.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_Debug"
    98 
    99 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL ASM Release"
    100 
    101 # PROP BASE Use_MFC 0
    102 # PROP BASE Use_Debug_Libraries 0
    103 # PROP BASE Output_Dir "libpng___Win32_DLL_ASM_Release"
    104 # PROP BASE Intermediate_Dir "libpng___Win32_DLL_ASM_Release"
    105 # PROP BASE Target_Dir ""
    106 # PROP Use_MFC 0
    107 # PROP Use_Debug_Libraries 0
    108 # PROP Output_Dir "Win32_DLL_ASM_Release"
    109 # PROP Intermediate_Dir "Win32_DLL_ASM_Release"
    110 # PROP Ignore_Export_Lib 0
    111 # PROP Target_Dir ""
    112 CPP=cl.exe
    113 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
    114 # SUBTRACT BASE CPP /YX /Yc /Yu
    115 # ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_USE_PNGVCRD" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS" /FD /c
    116 # SUBTRACT CPP /YX /Yc /Yu
    117 MTL=midl.exe
    118 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
    119 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
    120 RSC=rc.exe
    121 # ADD BASE RSC /l 0x409 /d "NDEBUG"
    122 # ADD RSC /l 0x409 /i "..\.." /d "NDEBUG" /d PNG_LIBPNG_SPECIALBUILD=""""Use MMX instructions""""
    123 BSC32=bscmake.exe
    124 # ADD BASE BSC32 /nologo
    125 # ADD BSC32 /nologo
    126 LINK32=link.exe
    127 # ADD BASE LINK32 /nologo /dll /machine:I386
    128 # ADD LINK32 zlib1.lib /nologo /dll /machine:I386 /out:"Win32_DLL_ASM_Release\libpng13.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_ASM_Release"
    129 
    130 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL ASM Debug"
    131 
    132 # PROP BASE Use_MFC 0
    133 # PROP BASE Use_Debug_Libraries 1
    134 # PROP BASE Output_Dir "libpng___Win32_DLL_ASM_Debug"
    135 # PROP BASE Intermediate_Dir "libpng___Win32_DLL_ASM_Debug"
    136 # PROP BASE Target_Dir ""
    137 # PROP Use_MFC 0
    138 # PROP Use_Debug_Libraries 1
    139 # PROP Output_Dir "Win32_DLL_ASM_Debug"
    140 # PROP Intermediate_Dir "Win32_DLL_ASM_Debug"
    141 # PROP Ignore_Export_Lib 0
    142 # PROP Target_Dir ""
    143 CPP=cl.exe
    144 # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
    145 # SUBTRACT BASE CPP /YX /Yc /Yu
    146 # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /D "PNG_USE_PNGVCRD" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c
    147 # SUBTRACT CPP /YX /Yc /Yu
    148 MTL=midl.exe
    149 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
    150 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
    151 RSC=rc.exe
    152 # ADD BASE RSC /l 0x409 /d "_DEBUG"
    153 # ADD RSC /l 0x409 /i "..\.." /d "_DEBUG" /d PNG_DEBUG=1 /d PNG_LIBPNG_SPECIALBUILD=""""Use MMX instructions""""
    154 BSC32=bscmake.exe
    155 # ADD BASE BSC32 /nologo
    156 # ADD BSC32 /nologo
    157 LINK32=link.exe
    158 # ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
    159 # ADD LINK32 zlib1d.lib /nologo /dll /debug /machine:I386 /out:"Win32_DLL_ASM_Debug\libpng13d.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_ASM_Debug"
     93# ADD LINK32 zlib1d.lib /nologo /dll /debug /machine:I386 /out:"Win32_DLL_Debug\libpng14d.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_Debug"
    16094
    16195!ELSEIF  "$(CFG)" == "libpng - Win32 DLL VB"
    … …  
    175109# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
    176110# SUBTRACT BASE CPP /YX /Yc /Yu
    177 # ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D PNGAPI=__stdcall /D "PNG_NO_MODULEDEF" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS" /FD /c
     111# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D PNGAPI=__stdcall /D "PNG_NO_MODULEDEF" /D "PNG_LIBPNG_SPECIALBUILD" /FD /c
    178112# SUBTRACT CPP /YX /Yc /Yu
    179113MTL=midl.exe
    … …  
    181115# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
    182116RSC=rc.exe
    183 # ADD BASE RSC /l 0x409 /d "NDEBUG"
    184 # ADD RSC /l 0x409 /i "..\.." /d "NDEBUG" /dPNG_LIBPNG_DLLFNAME_POSTFIX=""""VB"""" /dPNG_LIBPNG_SPECIALBUILD=""""__stdcall calling convention used for exported functions""""
     117# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG"
     118# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG" /dPNG_LIBPNG_DLLFNAME_POSTFIX=""""VB"""" /dPNG_LIBPNG_SPECIALBUILD=""""__stdcall calling convention used for exported functions""""
    185119BSC32=bscmake.exe
    186120# ADD BASE BSC32 /nologo
    … …  
    188122LINK32=link.exe
    189123# ADD BASE LINK32 /nologo /dll /machine:I386
    190 # ADD LINK32 zlib1.lib /nologo /dll /machine:I386 /out:"Win32_DLL_VB\libpng13vb.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_Release"
     124# ADD LINK32 zlib1.lib /nologo /dll /machine:I386 /out:"Win32_DLL_VB\libpng14vb.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_Release"
    191125# Begin Special Build Tool
    192126OutDir=.\Win32_DLL_VB
    193 TargetName=libpng13vb
     127TargetName=libpng14vb
    194128SOURCE="$(InputPath)"
    195129PostBuild_Cmds=echo    Deleting $(targetname) import library and export file (Not required for VB projects)     del $(outdir)\$(targetname).lib del $(outdir)\$(targetname).exp
    … …  
    211145# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
    212146# SUBTRACT BASE CPP /YX /Yc /Yu
    213 # ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "PNG_NO_MMX_CODE" /D "WIN32" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /FD /c
    214 # SUBTRACT CPP /YX /Yc /Yu
    215 RSC=rc.exe
    216 # ADD BASE RSC /l 0x409 /d "NDEBUG"
    217 # ADD RSC /l 0x409 /i "..\.." /d "NDEBUG"
     147# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /FD /c
     148# SUBTRACT CPP /YX /Yc /Yu
     149RSC=rc.exe
     150# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG"
     151# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG"
    218152BSC32=bscmake.exe
    219153# ADD BASE BSC32 /nologo
    … …  
    238172# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
    239173# SUBTRACT BASE CPP /YX /Yc /Yu
    240 # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "PNG_NO_MMX_CODE" /D PNG_DEBUG=1 /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c
    241 # SUBTRACT CPP /YX /Yc /Yu
    242 RSC=rc.exe
    243 # ADD BASE RSC /l 0x409 /d "_DEBUG"
    244 # ADD RSC /l 0x409 /d "_DEBUG"
     174# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /FD /GZ /c
     175# SUBTRACT CPP /YX /Yc /Yu
     176RSC=rc.exe
     177# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG"
     178# ADD RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG"
    245179BSC32=bscmake.exe
    246180# ADD BASE BSC32 /nologo
    … …  
    250184# ADD LIB32 /nologo /out:"Win32_LIB_Debug\libpngd.lib"
    251185
    252 !ELSEIF  "$(CFG)" == "libpng - Win32 LIB ASM Release"
    253 
    254 # PROP BASE Use_MFC 0
    255 # PROP BASE Use_Debug_Libraries 0
    256 # PROP BASE Output_Dir "libpng___Win32_LIB_ASM_Release"
    257 # PROP BASE Intermediate_Dir "libpng___Win32_LIB_ASM_Release"
    258 # PROP BASE Target_Dir ""
    259 # PROP Use_MFC 0
    260 # PROP Use_Debug_Libraries 0
    261 # PROP Output_Dir "Win32_LIB_ASM_Release"
    262 # PROP Intermediate_Dir "Win32_LIB_ASM_Release"
    263 # PROP Target_Dir ""
    264 CPP=cl.exe
    265 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
    266 # SUBTRACT BASE CPP /YX /Yc /Yu
    267 # ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_USE_PNGVCRD" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS" /FD /c
    268 # SUBTRACT CPP /YX /Yc /Yu
    269 RSC=rc.exe
    270 # ADD BASE RSC /l 0x409 /d "NDEBUG"
    271 # ADD RSC /l 0x409 /i "..\.." /d "NDEBUG"
    272 BSC32=bscmake.exe
    273 # ADD BASE BSC32 /nologo
    274 # ADD BSC32 /nologo
    275 LIB32=link.exe -lib
    276 # ADD BASE LIB32 /nologo
    277 # ADD LIB32 /nologo
    278 
    279 !ELSEIF  "$(CFG)" == "libpng - Win32 LIB ASM Debug"
    280 
    281 # PROP BASE Use_MFC 0
    282 # PROP BASE Use_Debug_Libraries 1
    283 # PROP BASE Output_Dir "libpng___Win32_LIB_ASM_Debug"
    284 # PROP BASE Intermediate_Dir "libpng___Win32_LIB_ASM_Debug"
    285 # PROP BASE Target_Dir ""
    286 # PROP Use_MFC 0
    287 # PROP Use_Debug_Libraries 1
    288 # PROP Output_Dir "Win32_LIB_ASM_Debug"
    289 # PROP Intermediate_Dir "Win32_LIB_ASM_Debug"
    290 # PROP Target_Dir ""
    291 CPP=cl.exe
    292 # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
    293 # SUBTRACT BASE CPP /YX /Yc /Yu
    294 # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /D "PNG_USE_PNGVCRD" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c
    295 # SUBTRACT CPP /YX /Yc /Yu
    296 RSC=rc.exe
    297 # ADD BASE RSC /l 0x409 /d "_DEBUG"
    298 # ADD RSC /l 0x409 /d "_DEBUG"
    299 BSC32=bscmake.exe
    300 # ADD BASE BSC32 /nologo
    301 # ADD BSC32 /nologo
    302 LIB32=link.exe -lib
    303 # ADD BASE LIB32 /nologo
    304 # ADD LIB32 /nologo /out:"Win32_LIB_ASM_Debug\libpngd.lib"
    305 
    306 !ENDIF
     186!ENDIF
    307187
    308188# Begin Target
    … …  
    310190# Name "libpng - Win32 DLL Release"
    311191# Name "libpng - Win32 DLL Debug"
    312 # Name "libpng - Win32 DLL ASM Release"
    313 # Name "libpng - Win32 DLL ASM Debug"
    314192# Name "libpng - Win32 DLL VB"
    315193# Name "libpng - Win32 LIB Release"
    316194# Name "libpng - Win32 LIB Debug"
    317 # Name "libpng - Win32 LIB ASM Release"
    318 # Name "libpng - Win32 LIB ASM Debug"
    319195# Begin Group "Source Files"
    320196
    … …  
    366242# Begin Source File
    367243
    368 SOURCE=..\..\scripts\pngw32.def
     244SOURCE=..\..\scripts\pngwin.def
    369245
    370246!IF  "$(CFG)" == "libpng - Win32 DLL Release"
    … …  
    372248!ELSEIF  "$(CFG)" == "libpng - Win32 DLL Debug"
    373249
    374 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL ASM Release"
    375 
    376 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL ASM Debug"
    377 
    378250!ELSEIF  "$(CFG)" == "libpng - Win32 DLL VB"
    379251
    … …  
    388260# PROP Exclude_From_Build 1
    389261
    390 !ELSEIF  "$(CFG)" == "libpng - Win32 LIB ASM Release"
    391 
    392 # PROP Exclude_From_Build 1
    393 
    394 !ELSEIF  "$(CFG)" == "libpng - Win32 LIB ASM Debug"
    395 
    396 # PROP Exclude_From_Build 1
    397 
    398 !ENDIF
     262!ENDIF
    399263
    400264# End Source File
    … …  
    427291SOURCE=..\..\pngconf.h
    428292# End Source File
     293# Begin Source File
     294
     295SOURCE=..\..\pngpriv.h
     296# End Source File
    429297# End Group
    430298# Begin Group "Resource Files"
    … …  
    433301# Begin Source File
    434302
    435 SOURCE=..\..\scripts\pngw32.rc
     303SOURCE=..\..\scripts\pngwin.rc
    436304
    437305!IF  "$(CFG)" == "libpng - Win32 DLL Release"
    … …  
    439307!ELSEIF  "$(CFG)" == "libpng - Win32 DLL Debug"
    440308
    441 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL ASM Release"
    442 
    443 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL ASM Debug"
    444 
    445309!ELSEIF  "$(CFG)" == "libpng - Win32 DLL VB"
    446310
    … …  
    453317# PROP Exclude_From_Build 1
    454318
    455 !ELSEIF  "$(CFG)" == "libpng - Win32 LIB ASM Release"
    456 
    457 # PROP Exclude_From_Build 1
    458 
    459 !ELSEIF  "$(CFG)" == "libpng - Win32 LIB ASM Debug"
    460 
    461 # PROP Exclude_From_Build 1
    462 
    463 !ENDIF
     319!ENDIF
    464320
    465321# End Source File

  • trunk/src/3rdparty/libpng/projects/visualc6/pngtest.dsp

    r2 r846  
    2020!MESSAGE "pngtest - Win32 DLL Release" (based on "Win32 (x86) Console Application")
    2121!MESSAGE "pngtest - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
    22 !MESSAGE "pngtest - Win32 DLL ASM Release" (based on "Win32 (x86) Console Application")
    23 !MESSAGE "pngtest - Win32 DLL ASM Debug" (based on "Win32 (x86) Console Application")
    2422!MESSAGE "pngtest - Win32 LIB Release" (based on "Win32 (x86) Console Application")
    2523!MESSAGE "pngtest - Win32 LIB Debug" (based on "Win32 (x86) Console Application")
    26 !MESSAGE "pngtest - Win32 LIB ASM Release" (based on "Win32 (x86) Console Application")
    27 !MESSAGE "pngtest - Win32 LIB ASM Debug" (based on "Win32 (x86) Console Application")
    2824!MESSAGE
    2925
    … …  
    5046# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
    5147# SUBTRACT BASE CPP /YX
    52 # ADD CPP /nologo /MD /W3 /O2 /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_DLL" /D "PNG_NO_STDIO" /D "PNG_NO_GLOBAL_ARRAYS" /FD /c
     48# ADD CPP /nologo /MD /W3 /O2 /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_DLL" /D "PNG_NO_STDIO" /FD /c
    5349# SUBTRACT CPP /YX
    5450# ADD BASE RSC /l 0x409 /d "NDEBUG"
    … …  
    5955LINK32=link.exe
    6056# ADD BASE LINK32 /nologo /subsystem:console /machine:I386
    61 # ADD LINK32 Win32_DLL_Release\libpng13.lib ..\..\..\zlib\projects\visualc6\Win32_DLL_Release\zlib1.lib /nologo /subsystem:console /machine:I386
     57# ADD LINK32 Win32_DLL_Release\libpng14.lib ..\..\..\zlib\projects\visualc6\Win32_DLL_Release\zlib1.lib /nologo /subsystem:console /machine:I386
    6258# Begin Special Build Tool
    6359OutDir=.\Win32_DLL_Release
    … …  
    8278# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
    8379# SUBTRACT BASE CPP /YX
    84 # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "PNG_DLL" /D "PNG_NO_STDIO" /D "PNG_NO_GLOBAL_ARRAYS" /FD /GZ /c
     80# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "PNG_DLL" /D "PNG_NO_STDIO" /FD /GZ /c
    8581# SUBTRACT CPP /YX
    8682# ADD BASE RSC /l 0x409 /d "_DEBUG"
    … …  
    9187LINK32=link.exe
    9288# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
    93 # ADD LINK32 Win32_DLL_Debug\libpng13d.lib ..\..\..\zlib\projects\visualc6\Win32_DLL_Debug\zlib1d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
     89# ADD LINK32 Win32_DLL_Debug\libpng14d.lib ..\..\..\zlib\projects\visualc6\Win32_DLL_Debug\zlib1d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
    9490# Begin Special Build Tool
    9591OutDir=.\Win32_DLL_Debug
    … …  
    9793PostBuild_Desc=[Run Test]
    9894PostBuild_Cmds=set path=$(outdir);..\..\..\zlib\projects\visualc6\Win32_DLL_Debug;      $(outdir)\pngtest.exe ..\..\pngtest.png
    99 # End Special Build Tool
    100 
    101 !ELSEIF  "$(CFG)" == "pngtest - Win32 DLL ASM Release"
    102 
    103 # PROP BASE Use_MFC 0
    104 # PROP BASE Use_Debug_Libraries 0
    105 # PROP BASE Output_Dir "pngtest___Win32_DLL_ASM_Release"
    106 # PROP BASE Intermediate_Dir "pngtest___Win32_DLL_ASM_Release"
    107 # PROP BASE Target_Dir ""
    108 # PROP Use_MFC 0
    109 # PROP Use_Debug_Libraries 0
    110 # PROP Output_Dir "Win32_DLL_ASM_Release"
    111 # PROP Intermediate_Dir "Win32_DLL_ASM_Release"
    112 # PROP Ignore_Export_Lib 0
    113 # PROP Target_Dir ""
    114 # ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
    115 # SUBTRACT BASE CPP /YX
    116 # ADD CPP /nologo /MD /W3 /O2 /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_DLL" /D "PNG_NO_STDIO" /D "PNG_NO_GLOBAL_ARRAYS" /FD /c
    117 # SUBTRACT CPP /YX
    118 # ADD BASE RSC /l 0x409 /d "NDEBUG"
    119 # ADD RSC /l 0x409 /d "NDEBUG"
    120 BSC32=bscmake.exe
    121 # ADD BASE BSC32 /nologo
    122 # ADD BSC32 /nologo
    123 LINK32=link.exe
    124 # ADD BASE LINK32 /nologo /subsystem:console /machine:I386
    125 # ADD LINK32 Win32_DLL_ASM_Release\libpng13.lib ..\..\..\zlib\projects\visualc6\Win32_DLL_ASM_Release\zlib1.lib /nologo /subsystem:console /machine:I386
    126 # Begin Special Build Tool
    127 OutDir=.\Win32_DLL_ASM_Release
    128 SOURCE="$(InputPath)"
    129 PostBuild_Desc=[Run Test]
    130 PostBuild_Cmds=set path=$(outdir);..\..\..\zlib\projects\visualc6\Win32_DLL_ASM_Release;        $(outdir)\pngtest.exe ..\..\pngtest.png
    131 # End Special Build Tool
    132 
    133 !ELSEIF  "$(CFG)" == "pngtest - Win32 DLL ASM Debug"
    134 
    135 # PROP BASE Use_MFC 0
    136 # PROP BASE Use_Debug_Libraries 1
    137 # PROP BASE Output_Dir "pngtest___Win32_DLL_ASM_Debug"
    138 # PROP BASE Intermediate_Dir "pngtest___Win32_DLL_ASM_Debug"
    139 # PROP BASE Target_Dir ""
    140 # PROP Use_MFC 0
    141 # PROP Use_Debug_Libraries 1
    142 # PROP Output_Dir "Win32_DLL_ASM_Debug"
    143 # PROP Intermediate_Dir "Win32_DLL_ASM_Debug"
    144 # PROP Ignore_Export_Lib 0
    145 # PROP Target_Dir ""
    146 # ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
    147 # SUBTRACT BASE CPP /YX
    148 # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "PNG_DLL" /D "PNG_NO_STDIO" /D "PNG_NO_GLOBAL_ARRAYS" /FD /GZ /c
    149 # SUBTRACT CPP /YX
    150 # ADD BASE RSC /l 0x409 /d "_DEBUG"
    151 # ADD RSC /l 0x409 /d "_DEBUG"
    152 BSC32=bscmake.exe
    153 # ADD BASE BSC32 /nologo
    154 # ADD BSC32 /nologo
    155 LINK32=link.exe
    156 # ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
    157 # ADD LINK32 Win32_DLL_ASM_Debug\libpng13d.lib ..\..\..\zlib\projects\visualc6\Win32_DLL_ASM_Debug\zlib1d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
    158 # Begin Special Build Tool
    159 OutDir=.\Win32_DLL_ASM_Debug
    160 SOURCE="$(InputPath)"
    161 PostBuild_Desc=[Run Test]
    162 PostBuild_Cmds=set path=$(outdir);..\..\..\zlib\projects\visualc6\Win32_DLL_ASM_Debug;  $(outdir)\pngtest.exe ..\..\pngtest.png
    16395# End Special Build Tool
    16496
    … …  
    227159# End Special Build Tool
    228160
    229 !ELSEIF  "$(CFG)" == "pngtest - Win32 LIB ASM Release"
    230 
    231 # PROP BASE Use_MFC 0
    232 # PROP BASE Use_Debug_Libraries 0
    233 # PROP BASE Output_Dir "pngtest___Win32_LIB_ASM_Release"
    234 # PROP BASE Intermediate_Dir "pngtest___Win32_LIB_ASM_Release"
    235 # PROP BASE Target_Dir ""
    236 # PROP Use_MFC 0
    237 # PROP Use_Debug_Libraries 0
    238 # PROP Output_Dir "Win32_LIB_ASM_Release"
    239 # PROP Intermediate_Dir "Win32_LIB_ASM_Release"
    240 # PROP Ignore_Export_Lib 0
    241 # PROP Target_Dir ""
    242 # ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
    243 # SUBTRACT BASE CPP /YX
    244 # ADD CPP /nologo /MD /W3 /O2 /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /FD /c
    245 # SUBTRACT CPP /YX
    246 # ADD BASE RSC /l 0x409 /d "NDEBUG"
    247 # ADD RSC /l 0x409 /d "NDEBUG"
    248 BSC32=bscmake.exe
    249 # ADD BASE BSC32 /nologo
    250 # ADD BSC32 /nologo
    251 LINK32=link.exe
    252 # ADD BASE LINK32 /nologo /subsystem:console /machine:I386
    253 # ADD LINK32 Win32_LIB_ASM_Release\libpng.lib ..\..\..\zlib\projects\visualc6\Win32_LIB_ASM_Release\zlib.lib /nologo /subsystem:console /machine:I386
    254 # Begin Special Build Tool
    255 OutDir=.\Win32_LIB_ASM_Release
    256 SOURCE="$(InputPath)"
    257 PostBuild_Desc=[Run Test]
    258 PostBuild_Cmds=$(outdir)\pngtest.exe ..\..\pngtest.png
    259 # End Special Build Tool
    260 
    261 !ELSEIF  "$(CFG)" == "pngtest - Win32 LIB ASM Debug"
    262 
    263 # PROP BASE Use_MFC 0
    264 # PROP BASE Use_Debug_Libraries 1
    265 # PROP BASE Output_Dir "pngtest___Win32_LIB_ASM_Debug"
    266 # PROP BASE Intermediate_Dir "pngtest___Win32_LIB_ASM_Debug"
    267 # PROP BASE Target_Dir ""
    268 # PROP Use_MFC 0
    269 # PROP Use_Debug_Libraries 1
    270 # PROP Output_Dir "Win32_LIB_ASM_Debug"
    271 # PROP Intermediate_Dir "Win32_LIB_ASM_Debug"
    272 # PROP Ignore_Export_Lib 0
    273 # PROP Target_Dir ""
    274 # ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
    275 # SUBTRACT BASE CPP /YX
    276 # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /FD /GZ /c
    277 # SUBTRACT CPP /YX
    278 # ADD BASE RSC /l 0x409 /d "_DEBUG"
    279 # ADD RSC /l 0x409 /d "_DEBUG"
    280 BSC32=bscmake.exe
    281 # ADD BASE BSC32 /nologo
    282 # ADD BSC32 /nologo
    283 LINK32=link.exe
    284 # ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
    285 # ADD LINK32 Win32_LIB_ASM_Debug\libpngd.lib ..\..\..\zlib\projects\visualc6\Win32_LIB_ASM_Debug\zlibd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
    286 # Begin Special Build Tool
    287 OutDir=.\Win32_LIB_ASM_Debug
    288 SOURCE="$(InputPath)"
    289 PostBuild_Desc=[Run Test]
    290 PostBuild_Cmds=$(outdir)\pngtest.exe ..\..\pngtest.png
    291 # End Special Build Tool
    292 
    293161!ENDIF
    294162
    … …  
    297165# Name "pngtest - Win32 DLL Release"
    298166# Name "pngtest - Win32 DLL Debug"
    299 # Name "pngtest - Win32 DLL ASM Release"
    300 # Name "pngtest - Win32 DLL ASM Debug"
    301167# Name "pngtest - Win32 LIB Release"
    302168# Name "pngtest - Win32 LIB Debug"
    303 # Name "pngtest - Win32 LIB ASM Release"
    304 # Name "pngtest - Win32 LIB ASM Debug"
    305169# Begin Group "Source Files"
    306170

  • trunk/src/3rdparty/libpng/projects/visualc71/PRJ0041.mak

    r2 r846  
    11# Prevent "Cannot find missing dependency..." warnings while compiling
    2 # pngw32.rc (PRJ0041).
     2# pngwin.rc (PRJ0041).
    33
    44all: $(IntDir)\alloc.h \

  • trunk/src/3rdparty/libpng/projects/visualc71/README.txt

    r2 r846  
    22
    33Copyright (C) 2004 Simon-Pierre Cadieux.
     4
     5This code is released under the libpng license.
    46For conditions of distribution and use, see copyright notice in png.h
    57
    … …  
    3335This project builds the libpng binaries as follows:
    3436
    35 * Win32_DLL_Release\libpng13.dll      DLL build
    36 * Win32_DLL_Debug\libpng13d.dll       DLL build (debug version)
    37 * Win32_DLL_ASM_Release\libpng13.dll  DLL build using ASM code
    38 * Win32_DLL_ASM_Debug\libpng13d.dll   DLL build using ASM (debug version)
    39 * Win32_DLL_VB\libpng13vb.dll         DLL build for Visual Basic, using stdcall
     37* Win32_DLL_Release\libpng14.dll      DLL build
     38* Win32_DLL_Debug\libpng14d.dll       DLL build (debug version)
     39* Win32_DLL_VB\libpng14vb.dll         DLL build for Visual Basic, using stdcall
    4040* Win32_LIB_Release\libpng.lib        static build
    4141* Win32_LIB_Debug\libpngd.lib         static build (debug version)
    42 * Win32_LIB_ASM_Release\libpng.lib    static build using ASM code
    43 * Win32_LIB_ASM_Debug\libpngd.lib     static build using ASM (debug version)
    4442
    4543Notes:

  • trunk/src/3rdparty/libpng/projects/visualc71/README_zlib.txt

    r2 r846  
    77Copyright (C) 2004 Simon-Pierre Cadieux.
    88Copyright (C) 2004 Cosmin Truta.
     9
     10This code is released under the libpng license.
    911For conditions of distribution and use, see copyright notice in zlib.h.
    1012
    … …  
    3638* Win32_DLL_Release\zlib1.dll       DLL build
    3739* Win32_DLL_Debug\zlib1d.dll        DLL build (debug version)
    38 * Win32_DLL_ASM_Release\zlib1.dll   DLL build using ASM code
    39 * Win32_DLL_ASM_Debug\zlib1d.dll    DLL build using ASM code (debug version)
    4040* Win32_LIB_Release\zlib.lib        static build
    4141* Win32_LIB_Debug\zlibd.lib         static build (debug version)
    42 * Win32_LIB_ASM_Release\zlib.lib    static build using ASM code
    43 * Win32_LIB_ASM_Debug\zlibd.lib     static build using ASM code (debug version)
    4442
Note: See TracChangeset for help on using the changeset viewer.