Changeset d95035a in rtems


Ignore:
Timestamp:
Feb 14, 2010, 12:43:27 AM (10 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, master
Children:
4bbaac7, fcc69714
Parents:
f77a868
Message:

Import from zlib-1.2.4

Location:
cpukit/zlib
Files:
3 added
10 edited

Legend:

Unmodified
Added
Removed
  • cpukit/zlib/contrib/delphi/zlibd32.mak

    rf77a868 rd95035a  
    1919ZLIB_LIB = zlib.lib
    2020
    21 OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj
    22 OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
    23 OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj
    24 OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
     21OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
     22OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
     23OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
     24OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
    2525
    2626
     
    3939deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
    4040
    41 gzio.obj: gzio.c zutil.h zlib.h zconf.h
     41gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
     42
     43gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
     44
     45gzread.obj: gzread.c zlib.h zconf.h gzguts.h
     46
     47gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
    4248
    4349infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
  • cpukit/zlib/contrib/pascal/zlibd32.mak

    rf77a868 rd95035a  
    1919ZLIB_LIB = zlib.lib
    2020
    21 OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj
    22 OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
    23 OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj
    24 OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
     21OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
     22OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
     23OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
     24OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
    2525
    2626
     
    3939deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
    4040
    41 gzio.obj: gzio.c zutil.h zlib.h zconf.h
     41gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
     42
     43gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
     44
     45gzread.obj: gzread.c zlib.h zconf.h gzguts.h
     46
     47gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
    4248
    4349infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
  • cpukit/zlib/msdos/Makefile.bor

    rf77a868 rd95035a  
    4242ZLIB_LIB = zlib_$(MODEL).lib
    4343
    44 OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj
    45 OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
    46 OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj
    47 OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
     44OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
     45OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
     46OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
     47OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
    4848
    4949
     
    6262deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
    6363
    64 gzio.obj: gzio.c zutil.h zlib.h zconf.h
     64gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
     65
     66gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
     67
     68gzread.obj: gzread.c zlib.h zconf.h gzguts.h
     69
     70gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
    6571
    6672infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
  • cpukit/zlib/msdos/Makefile.dj2

    rf77a868 rd95035a  
    5252exec_prefix = $(prefix)
    5353
    54 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
    55        zutil.o inflate.o infback.o inftrees.o inffast.o
     54OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
     55       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
    5656
    5757OBJA =
  • cpukit/zlib/msdos/Makefile.emx

    rf77a868 rd95035a  
    3434exec_prefix = $(prefix)
    3535
    36 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
    37        zutil.o inflate.o infback.o inftrees.o inffast.o
     36OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
     37       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
    3838
    3939TEST_OBJS = example.o minigzip.o
  • cpukit/zlib/msdos/Makefile.msc

    rf77a868 rd95035a  
    3838ZLIB_LIB = zlib_$(MODEL).lib
    3939
    40 OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj
    41 OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
     40OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
     41OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
    4242
    4343
     
    5656deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
    5757
    58 gzio.obj: gzio.c zutil.h zlib.h zconf.h
     58gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
     59
     60gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
     61
     62gzread.obj: gzread.c zlib.h zconf.h gzguts.h
     63
     64gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
    5965
    6066infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
  • cpukit/zlib/msdos/Makefile.tc

    rf77a868 rd95035a  
    2727ZLIB_LIB = zlib_$(MODEL).lib
    2828
    29 OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj
    30 OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
    31 OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj
    32 OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
     29OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
     30OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
     31OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
     32OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
    3333
    3434
     
    4747deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
    4848
    49 gzio.obj: gzio.c zutil.h zlib.h zconf.h
     49gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
     50
     51gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
     52
     53gzread.obj: gzread.c zlib.h zconf.h gzguts.h
     54
     55gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
    5056
    5157infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
  • cpukit/zlib/projects/visualc6/zlib.dsp

    rf77a868 rd95035a  
    99!MESSAGE This is not a valid makefile. To build this project using NMAKE,
    1010!MESSAGE use the Export Makefile command and run
    11 !MESSAGE 
     11!MESSAGE
    1212!MESSAGE NMAKE /f "zlib.mak".
    13 !MESSAGE 
     13!MESSAGE
    1414!MESSAGE You can specify a configuration when running NMAKE
    1515!MESSAGE by defining the macro CFG on the command line. For example:
    16 !MESSAGE 
     16!MESSAGE
    1717!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 LIB Debug"
    18 !MESSAGE 
     18!MESSAGE
    1919!MESSAGE Possible choices for configuration are:
    20 !MESSAGE
     20!MESSAGE
     21!MESSAGE "zlib - Win32 DLL ASM Release" (based on "Win32 (x86) Dynamic-Link Library")
     22!MESSAGE "zlib - Win32 DLL ASM Debug" (based on "Win32 (x86) Dynamic-Link Library")
    2123!MESSAGE "zlib - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
    2224!MESSAGE "zlib - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
    23 !MESSAGE "zlib - Win32 DLL ASM Release" (based on "Win32 (x86) Dynamic-Link Library")
    24 !MESSAGE "zlib - Win32 DLL ASM Debug" (based on "Win32 (x86) Dynamic-Link Library")
     25!MESSAGE "zlib - Win32 LIB ASM Release" (based on "Win32 (x86) Static Library")
     26!MESSAGE "zlib - Win32 LIB ASM Debug" (based on "Win32 (x86) Static Library")
    2527!MESSAGE "zlib - Win32 LIB Release" (based on "Win32 (x86) Static Library")
    2628!MESSAGE "zlib - Win32 LIB Debug" (based on "Win32 (x86) Static Library")
    27 !MESSAGE "zlib - Win32 LIB ASM Release" (based on "Win32 (x86) Static Library")
    28 !MESSAGE "zlib - Win32 LIB ASM Debug" (based on "Win32 (x86) Static Library")
    29 !MESSAGE
     29!MESSAGE
    3030
    3131# Begin Project
     
    3434# PROP Scc_LocalPath ""
    3535
    36 !IF  "$(CFG)" == "zlib - Win32 DLL Release"
     36!IF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
     37
     38# PROP BASE Use_MFC 0
     39# PROP BASE Use_Debug_Libraries 0
     40# PROP BASE Output_Dir "zlib___Win32_DLL_ASM_Release"
     41# PROP BASE Intermediate_Dir "zlib___Win32_DLL_ASM_Release"
     42# PROP BASE Target_Dir ""
     43# PROP Use_MFC 0
     44# PROP Use_Debug_Libraries 0
     45# PROP Output_Dir "Win32_DLL_ASM_Release"
     46# PROP Intermediate_Dir "Win32_DLL_ASM_Release"
     47# PROP Ignore_Export_Lib 0
     48# PROP Target_Dir ""
     49CPP=cl.exe
     50# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
     51# SUBTRACT BASE CPP /YX /Yc /Yu
     52# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /D "ASMV" /D "ASMINF" /FD /c
     53# SUBTRACT CPP /YX /Yc /Yu
     54MTL=midl.exe
     55# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
     56# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
     57RSC=rc.exe
     58# ADD BASE RSC /l 0x409 /d "NDEBUG"
     59# ADD RSC /l 0x409 /d "NDEBUG"
     60BSC32=bscmake.exe
     61# ADD BASE BSC32 /nologo
     62# ADD BSC32 /nologo
     63LINK32=link.exe
     64# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
     65# ADD LINK32 /nologo /dll /machine:I386 /out:"Win32_DLL_ASM_Release\zlib1.dll"
     66
     67!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
     68
     69# PROP BASE Use_MFC 0
     70# PROP BASE Use_Debug_Libraries 1
     71# PROP BASE Output_Dir "zlib___Win32_DLL_ASM_Debug"
     72# PROP BASE Intermediate_Dir "zlib___Win32_DLL_ASM_Debug"
     73# PROP BASE Target_Dir ""
     74# PROP Use_MFC 0
     75# PROP Use_Debug_Libraries 1
     76# PROP Output_Dir "Win32_DLL_ASM_Debug"
     77# PROP Intermediate_Dir "Win32_DLL_ASM_Debug"
     78# PROP Ignore_Export_Lib 0
     79# PROP Target_Dir ""
     80CPP=cl.exe
     81# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
     82# SUBTRACT BASE CPP /YX /Yc /Yu
     83# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /D "ASMV" /D "ASMINF" /FR /FD /GZ /c
     84# SUBTRACT CPP /YX /Yc /Yu
     85MTL=midl.exe
     86# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
     87# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
     88RSC=rc.exe
     89# ADD BASE RSC /l 0x409 /d "_DEBUG"
     90# ADD RSC /l 0x409 /d "_DEBUG"
     91BSC32=bscmake.exe
     92# ADD BASE BSC32 /nologo
     93# ADD BSC32 /nologo
     94LINK32=link.exe
     95# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
     96# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Win32_DLL_ASM_Debug\zlib1d.dll" /pdbtype:sept
     97
     98!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Release"
    3799
    38100# PROP BASE Use_MFC 0
     
    50112# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
    51113# SUBTRACT BASE CPP /YX /Yc /Yu
    52 # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
     114# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /FD /c
    53115# SUBTRACT CPP /YX /Yc /Yu
    54116MTL=midl.exe
     
    81143# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
    82144# SUBTRACT BASE CPP /YX /Yc /Yu
    83 # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
     145# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /FR /FD /GZ /c
    84146# SUBTRACT CPP /YX /Yc /Yu
    85147MTL=midl.exe
     
    96158# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Win32_DLL_Debug\zlib1d.dll" /pdbtype:sept
    97159
    98 !ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
     160!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
    99161
    100162# PROP BASE Use_MFC 0
    101163# PROP BASE Use_Debug_Libraries 0
    102 # PROP BASE Output_Dir "zlib___Win32_DLL_ASM_Release"
    103 # PROP BASE Intermediate_Dir "zlib___Win32_DLL_ASM_Release"
     164# PROP BASE Output_Dir "zlib___Win32_LIB_ASM_Release"
     165# PROP BASE Intermediate_Dir "zlib___Win32_LIB_ASM_Release"
    104166# PROP BASE Target_Dir ""
    105167# PROP Use_MFC 0
    106168# PROP Use_Debug_Libraries 0
    107 # PROP Output_Dir "Win32_DLL_ASM_Release"
    108 # PROP Intermediate_Dir "Win32_DLL_ASM_Release"
    109 # PROP Ignore_Export_Lib 0
     169# PROP Output_Dir "Win32_LIB_ASM_Release"
     170# PROP Intermediate_Dir "Win32_LIB_ASM_Release"
    110171# PROP Target_Dir ""
    111172CPP=cl.exe
    112173# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
    113174# SUBTRACT BASE CPP /YX /Yc /Yu
    114 # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "ASMV" /D "ASMINF" /FD /c
    115 # SUBTRACT CPP /YX /Yc /Yu
    116 MTL=midl.exe
    117 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
    118 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
     175# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /D "ASMV" /D "ASMINF" /FD /c
     176# SUBTRACT CPP /YX /Yc /Yu
    119177RSC=rc.exe
    120178# ADD BASE RSC /l 0x409 /d "NDEBUG"
     
    123181# ADD BASE BSC32 /nologo
    124182# ADD BSC32 /nologo
    125 LINK32=link.exe
    126 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
    127 # ADD LINK32 /nologo /dll /machine:I386 /out:"Win32_DLL_ASM_Release\zlib1.dll"
    128 
    129 !ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
     183LIB32=link.exe -lib
     184# ADD BASE LIB32 /nologo
     185# ADD LIB32 /nologo
     186
     187!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
    130188
    131189# PROP BASE Use_MFC 0
    132190# PROP BASE Use_Debug_Libraries 1
    133 # PROP BASE Output_Dir "zlib___Win32_DLL_ASM_Debug"
    134 # PROP BASE Intermediate_Dir "zlib___Win32_DLL_ASM_Debug"
     191# PROP BASE Output_Dir "zlib___Win32_LIB_ASM_Debug"
     192# PROP BASE Intermediate_Dir "zlib___Win32_LIB_ASM_Debug"
    135193# PROP BASE Target_Dir ""
    136194# PROP Use_MFC 0
    137195# PROP Use_Debug_Libraries 1
    138 # PROP Output_Dir "Win32_DLL_ASM_Debug"
    139 # PROP Intermediate_Dir "Win32_DLL_ASM_Debug"
    140 # PROP Ignore_Export_Lib 0
     196# PROP Output_Dir "Win32_LIB_ASM_Debug"
     197# PROP Intermediate_Dir "Win32_LIB_ASM_Debug"
    141198# PROP Target_Dir ""
    142199CPP=cl.exe
    143200# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
    144201# SUBTRACT BASE CPP /YX /Yc /Yu
    145 # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "ASMV" /D "ASMINF" /FD /GZ /c
    146 # SUBTRACT CPP /YX /Yc /Yu
    147 MTL=midl.exe
    148 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
    149 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
     202# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /D "ASMV" /D "ASMINF" /FR /FD /GZ /c
     203# SUBTRACT CPP /YX /Yc /Yu
    150204RSC=rc.exe
    151205# ADD BASE RSC /l 0x409 /d "_DEBUG"
     
    154208# ADD BASE BSC32 /nologo
    155209# ADD BSC32 /nologo
    156 LINK32=link.exe
    157 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
    158 # ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Win32_DLL_ASM_Debug\zlib1d.dll" /pdbtype:sept
     210LIB32=link.exe -lib
     211# ADD BASE LIB32 /nologo
     212# ADD LIB32 /nologo /out:"Win32_LIB_ASM_Debug\zlibd.lib"
    159213
    160214!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
     
    173227# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
    174228# SUBTRACT BASE CPP /YX /Yc /Yu
    175 # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
     229# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "NDEBUG" /FD /c
    176230# SUBTRACT CPP /YX /Yc /Yu
    177231RSC=rc.exe
     
    200254# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
    201255# SUBTRACT BASE CPP /YX /Yc /Yu
    202 # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
     256# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "_DEBUG" /FR /FD /GZ /c
    203257# SUBTRACT CPP /YX /Yc /Yu
    204258RSC=rc.exe
     
    212266# ADD LIB32 /nologo /out:"Win32_LIB_Debug\zlibd.lib"
    213267
    214 !ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
    215 
    216 # PROP BASE Use_MFC 0
    217 # PROP BASE Use_Debug_Libraries 0
    218 # PROP BASE Output_Dir "zlib___Win32_LIB_ASM_Release"
    219 # PROP BASE Intermediate_Dir "zlib___Win32_LIB_ASM_Release"
    220 # PROP BASE Target_Dir ""
    221 # PROP Use_MFC 0
    222 # PROP Use_Debug_Libraries 0
    223 # PROP Output_Dir "Win32_LIB_ASM_Release"
    224 # PROP Intermediate_Dir "Win32_LIB_ASM_Release"
    225 # PROP Target_Dir ""
    226 CPP=cl.exe
    227 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
    228 # SUBTRACT BASE CPP /YX /Yc /Yu
    229 # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "ASMV" /D "ASMINF" /FD /c
    230 # SUBTRACT CPP /YX /Yc /Yu
    231 RSC=rc.exe
    232 # ADD BASE RSC /l 0x409 /d "NDEBUG"
    233 # ADD RSC /l 0x409 /d "NDEBUG"
    234 BSC32=bscmake.exe
    235 # ADD BASE BSC32 /nologo
    236 # ADD BSC32 /nologo
    237 LIB32=link.exe -lib
    238 # ADD BASE LIB32 /nologo
    239 # ADD LIB32 /nologo
    240 
    241 !ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
    242 
    243 # PROP BASE Use_MFC 0
    244 # PROP BASE Use_Debug_Libraries 1
    245 # PROP BASE Output_Dir "zlib___Win32_LIB_ASM_Debug"
    246 # PROP BASE Intermediate_Dir "zlib___Win32_LIB_ASM_Debug"
    247 # PROP BASE Target_Dir ""
    248 # PROP Use_MFC 0
    249 # PROP Use_Debug_Libraries 1
    250 # PROP Output_Dir "Win32_LIB_ASM_Debug"
    251 # PROP Intermediate_Dir "Win32_LIB_ASM_Debug"
    252 # PROP Target_Dir ""
    253 CPP=cl.exe
    254 # ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
    255 # SUBTRACT BASE CPP /YX /Yc /Yu
    256 # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "ASMV" /D "ASMINF" /FD /GZ /c
    257 # SUBTRACT CPP /YX /Yc /Yu
    258 RSC=rc.exe
    259 # ADD BASE RSC /l 0x409 /d "_DEBUG"
    260 # ADD RSC /l 0x409 /d "_DEBUG"
    261 BSC32=bscmake.exe
    262 # ADD BASE BSC32 /nologo
    263 # ADD BSC32 /nologo
    264 LIB32=link.exe -lib
    265 # ADD BASE LIB32 /nologo
    266 # ADD LIB32 /nologo /out:"Win32_LIB_ASM_Debug\zlibd.lib"
    267 
    268 !ENDIF
     268!ENDIF
    269269
    270270# Begin Target
    271271
     272# Name "zlib - Win32 DLL ASM Release"
     273# Name "zlib - Win32 DLL ASM Debug"
    272274# Name "zlib - Win32 DLL Release"
    273275# Name "zlib - Win32 DLL Debug"
    274 # Name "zlib - Win32 DLL ASM Release"
    275 # Name "zlib - Win32 DLL ASM Debug"
     276# Name "zlib - Win32 LIB ASM Release"
     277# Name "zlib - Win32 LIB ASM Debug"
    276278# Name "zlib - Win32 LIB Release"
    277279# Name "zlib - Win32 LIB Debug"
    278 # Name "zlib - Win32 LIB ASM Release"
    279 # Name "zlib - Win32 LIB ASM Debug"
    280280# Begin Group "Source Files"
    281281
     
    299299# Begin Source File
    300300
    301 SOURCE=..\..\gzio.c
     301SOURCE=..\..\gzclose.c
     302# End Source File
     303# Begin Source File
     304
     305SOURCE=..\..\gzlib.c
     306# End Source File
     307# Begin Source File
     308
     309SOURCE=..\..\gzread.c
     310# End Source File
     311# Begin Source File
     312
     313SOURCE=..\..\gzwrite.c
    302314# End Source File
    303315# Begin Source File
     
    329341SOURCE=..\..\win32\zlib.def
    330342
    331 !IF  "$(CFG)" == "zlib - Win32 DLL Release"
     343!IF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
     344
     345!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
     346
     347!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Release"
    332348
    333349!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Debug"
    334350
    335 !ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
    336 
    337 !ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
     351!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
     352
     353# PROP Exclude_From_Build 1
     354
     355!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
     356
     357# PROP Exclude_From_Build 1
    338358
    339359!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
     
    345365# PROP Exclude_From_Build 1
    346366
    347 !ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
    348 
    349 # PROP Exclude_From_Build 1
    350 
    351 !ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
    352 
    353 # PROP Exclude_From_Build 1
    354 
    355 !ENDIF
     367!ENDIF
    356368
    357369# End Source File
     
    420432SOURCE=..\..\contrib\masmx86\gvmat32.asm
    421433
    422 !IF  "$(CFG)" == "zlib - Win32 DLL Release"
    423 
    424 # PROP Exclude_From_Build 1
    425 
    426 !ELSEIF  "$(CFG)" == "zlib - Win32 DLL Debug"
    427 
    428 # PROP Exclude_From_Build 1
    429 
    430 !ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
     434!IF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
    431435
    432436# Begin Custom Build - Assembling...
     
    452456# End Custom Build
    453457
    454 !ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
    455 
    456 # PROP Exclude_From_Build 1
    457 
    458 !ELSEIF  "$(CFG)" == "zlib - Win32 LIB Debug"
     458!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Release"
     459
     460# PROP Exclude_From_Build 1
     461
     462!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Debug"
    459463
    460464# PROP Exclude_From_Build 1
     
    484488# End Custom Build
    485489
    486 !ENDIF
     490!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
     491
     492# PROP Exclude_From_Build 1
     493
     494!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Debug"
     495
     496# PROP Exclude_From_Build 1
     497
     498!ENDIF
    487499
    488500# End Source File
     
    491503SOURCE=..\..\contrib\masmx86\gvmat32c.c
    492504
    493 !IF  "$(CFG)" == "zlib - Win32 DLL Release"
     505!IF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
     506
     507# ADD CPP /I "..\.."
     508
     509!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
     510
     511# ADD CPP /I "..\.."
     512
     513!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Release"
    494514
    495515# PROP Exclude_From_Build 1
     
    501521# ADD CPP /I "..\.."
    502522
    503 !ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
    504 
    505 # ADD CPP /I "..\.."
    506 
    507 !ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
     523!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
     524
     525# ADD CPP /I "..\.."
     526
     527!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
    508528
    509529# ADD CPP /I "..\.."
     
    519539# ADD CPP /I "..\.."
    520540
    521 !ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
    522 
    523 # ADD CPP /I "..\.."
    524 
    525 !ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
    526 
    527 # ADD CPP /I "..\.."
    528 
    529 !ENDIF
     541!ENDIF
    530542
    531543# End Source File
     
    534546SOURCE=..\..\contrib\masmx86\inffas32.asm
    535547
    536 !IF  "$(CFG)" == "zlib - Win32 DLL Release"
    537 
    538 # PROP Exclude_From_Build 1
    539 
    540 !ELSEIF  "$(CFG)" == "zlib - Win32 DLL Debug"
    541 
    542 # PROP Exclude_From_Build 1
    543 
    544 !ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
     548!IF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
    545549
    546550# Begin Custom Build - Assembling...
     
    566570# End Custom Build
    567571
    568 !ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
    569 
    570 # PROP Exclude_From_Build 1
    571 
    572 !ELSEIF  "$(CFG)" == "zlib - Win32 LIB Debug"
     572!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Release"
     573
     574# PROP Exclude_From_Build 1
     575
     576!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Debug"
    573577
    574578# PROP Exclude_From_Build 1
     
    598602# End Custom Build
    599603
    600 !ENDIF
     604!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
     605
     606# PROP Exclude_From_Build 1
     607
     608!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Debug"
     609
     610# PROP Exclude_From_Build 1
     611
     612!ENDIF
    601613
    602614# End Source File
  • cpukit/zlib/win32/Makefile.bor

    rf77a868 rd95035a  
    11# Makefile for zlib
    22# Borland C++ for Win32
    3 #
    4 # Updated for zlib 1.2.x by Cosmin Truta, 11-Mar-2003
    5 # Last updated: 28-Aug-2003
    63#
    74# Usage:
     
    2825ZLIB_LIB = zlib.lib
    2926
    30 OBJ1  = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj
    31 OBJ2  = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
     27OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
     28OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
    3229#OBJA =
    33 OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj
    34 OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
     30OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
     31OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
    3532#OBJPA=
    3633
     
    5350deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
    5451
    55 gzio.obj: gzio.c zutil.h zlib.h zconf.h
     52gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
     53
     54gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
     55
     56gzread.obj: gzread.c zlib.h zconf.h gzguts.h
     57
     58gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
    5659
    5760infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
     
    100103# cleanup
    101104clean:
     105        -del $(ZLIB_LIB)
    102106        -del *.obj
    103         -del *.lib
    104107        -del *.exe
    105108        -del *.tds
  • cpukit/zlib/win32/Makefile.emx

    rf77a868 rd95035a  
    3434exec_prefix = $(prefix)
    3535
    36 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
    37        zutil.o inflate.o infback.o inftrees.o inffast.o
     36OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
     37       gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
    3838
    3939TEST_OBJS = example.o minigzip.o
Note: See TracChangeset for help on using the changeset viewer.