[llvm-commits] [parallel] CVS: llvm/runtime/libpng/projects/borland/libpng.bpf libpng.bpg libpng.bpr libpng.cpp libpng.readme.txt libpngstat.bpf libpngstat.bpr zlib+libpng.bpg zlib.bpf zlib.bpg zlib.bpr zlib.cpp zlibstat.bpf zlibstat.bpr
Misha Brukman
brukman at cs.uiuc.edu
Mon Mar 1 18:09:07 PST 2004
Changes in directory llvm/runtime/libpng/projects/borland:
libpng.bpf added (r1.1.2.1)
libpng.bpg added (r1.1.2.1)
libpng.bpr added (r1.1.2.1)
libpng.cpp added (r1.1.2.1)
libpng.readme.txt added (r1.1.2.1)
libpngstat.bpf added (r1.1.2.1)
libpngstat.bpr added (r1.1.2.1)
zlib+libpng.bpg added (r1.1.2.1)
zlib.bpf added (r1.1.2.1)
zlib.bpg added (r1.1.2.1)
zlib.bpr added (r1.1.2.1)
zlib.cpp added (r1.1.2.1)
zlibstat.bpf added (r1.1.2.1)
zlibstat.bpr added (r1.1.2.1)
---
Log message:
Merge from trunk
---
Diffs of the changes: (+789 -0)
Index: llvm/runtime/libpng/projects/borland/libpng.bpf
diff -c /dev/null llvm/runtime/libpng/projects/borland/libpng.bpf:1.1.2.1
*** /dev/null Mon Mar 1 17:58:56 2004
--- llvm/runtime/libpng/projects/borland/libpng.bpf Mon Mar 1 17:58:46 2004
***************
*** 0 ****
--- 1,22 ----
+ USEUNIT("libpng.cpp");
+ USEUNIT("..\..\pngwutil.c");
+ USEUNIT("..\..\pngerror.c");
+ USEUNIT("..\..\pngget.c");
+ USEUNIT("..\..\pngmem.c");
+ USEUNIT("..\..\pngpread.c");
+ USEUNIT("..\..\pngread.c");
+ USEUNIT("..\..\pngrio.c");
+ USEUNIT("..\..\pngrtran.c");
+ USEUNIT("..\..\pngrutil.c");
+ USEUNIT("..\..\pngset.c");
+ USEUNIT("..\..\pngtrans.c");
+ USEUNIT("..\..\pngwio.c");
+ USEUNIT("..\..\pngwrite.c");
+ USEUNIT("..\..\pngwtran.c");
+ USEUNIT("..\..\png.c");
+ USELIB("zlib.lib");
+ //---------------------------------------------------------------------------
+ This file is used by the project manager only and should be treated like the project file
+
+
+ DllEntryPoint
\ No newline at end of file
Index: llvm/runtime/libpng/projects/borland/libpng.bpg
diff -c /dev/null llvm/runtime/libpng/projects/borland/libpng.bpg:1.1.2.1
*** /dev/null Mon Mar 1 17:58:56 2004
--- llvm/runtime/libpng/projects/borland/libpng.bpg Mon Mar 1 17:58:46 2004
***************
*** 0 ****
--- 1,25 ----
+ #------------------------------------------------------------------------------
+ VERSION = BWS.01
+ #------------------------------------------------------------------------------
+ !ifndef ROOT
+ ROOT = $(MAKEDIR)\..
+ !endif
+ #------------------------------------------------------------------------------
+ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
+ DCC = $(ROOT)\bin\dcc32.exe $**
+ BRCC = $(ROOT)\bin\brcc32.exe $**
+ #------------------------------------------------------------------------------
+ PROJECTS = libpngstat.lib libpng.dll
+ #------------------------------------------------------------------------------
+ default: $(PROJECTS)
+ #------------------------------------------------------------------------------
+
+ libpngstat.lib: libpngstat.bpr
+ $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+ libpng.dll: libpng.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+
Index: llvm/runtime/libpng/projects/borland/libpng.bpr
diff -c /dev/null llvm/runtime/libpng/projects/borland/libpng.bpr:1.1.2.1
*** /dev/null Mon Mar 1 17:58:56 2004
--- llvm/runtime/libpng/projects/borland/libpng.bpr Mon Mar 1 17:58:46 2004
***************
*** 0 ****
--- 1,157 ----
+ <?xml version='1.0' encoding='utf-8' ?>
+ <!-- C++Builder XML Project -->
+ <PROJECT>
+ <MACROS>
+ <VERSION value="BCB.05.03"/>
+ <PROJECT value="libpng.dll"/>
+ <OBJFILES value="libpng.obj ..\..\pngwutil.obj ..\..\pngerror.obj ..\..\pngget.obj
+ ..\..\pngmem.obj ..\..\pngpread.obj ..\..\pngread.obj ..\..\pngrio.obj
+ ..\..\pngrtran.obj ..\..\pngrutil.obj ..\..\pngset.obj ..\..\pngtrans.obj
+ ..\..\pngwio.obj ..\..\pngwrite.obj ..\..\pngwtran.obj ..\..\png.obj"/>
+ <RESFILES value=""/>
+ <DEFFILE value=""/>
+ <RESDEPEN value="$(RESFILES)"/>
+ <LIBFILES value="zlib.lib"/>
+ <LIBRARIES value="bcbsmp50.lib dclocx50.lib NMFast50.lib Tee50.lib Vclx50.lib Vcl50.lib"/>
+ <SPARELIBS value="Vcl50.lib Vclx50.lib Tee50.lib NMFast50.lib dclocx50.lib bcbsmp50.lib"/>
+ <PACKAGES value="Vcl50.bpi Vclx50.bpi bcbsmp50.bpi Qrpt50.bpi Vcldb50.bpi Vclbde50.bpi
+ ibsmp50.bpi vcldbx50.bpi TeeUI50.bpi TeeDB50.bpi Tee50.bpi TeeQR50.bpi
+ VCLIB50.bpi bcbie50.bpi vclie50.bpi Inetdb50.bpi Inet50.bpi NMFast50.bpi
+ dclocx50.bpi bcb97axserver50.bpi SIMULUSCOMPONENTS.bpi Simulus2.bpi"/>
+ <PATHCPP value=".;..\.."/>
+ <PATHPAS value=".;"/>
+ <PATHRC value=".;"/>
+ <PATHASM value=".;"/>
+ <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+ <RELEASELIBPATH value="$(BCB)\lib\release"/>
+ <LINKER value="tlink32"/>
+ <USERDEFINES value="ZLIB_DLL;Z_PREFIX;PNG_BUILD_DLL;PNG_NO_MODULEDEF"/>
+ <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL"/>
+ <MAINSOURCE value="libpng.bpf"/>
+ <INCLUDEPATH value="..\..;..\..\..\zlib;$(BCB)\include"/>
+ <LIBPATH value="..\..;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wucp -wstv -wstu -wsig -wpin
+ -wnod -wnak -wdef -wcln -wbbf -wasm -wamp -wamb"/>
+ </MACROS>
+ <OPTIONS>
+ <CFLAG1 value="-WD -O2 -w -Vx -Ve -x- -RT- -X- -a8 -5 -b- -d -k- -vi -tWD -tWM -c"/>
+ <PFLAGS value="-$Y- -$L- -$D- -$C- -v -JPHNE -M"/>
+ <RFLAGS value=""/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-D"" -aa -Tpd -x -Gn -Gi -w"/>
+ </OPTIONS>
+ <LINKER>
+ <ALLOBJ value="c0d32.obj $(OBJFILES)"/>
+ <ALLRES value="$(RESFILES)"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mti.lib"/>
+ </LINKER>
+ <IDEOPTIONS>
+ [Version Info]
+ IncludeVerInfo=0
+ AutoIncBuild=0
+ MajorVer=1
+ MinorVer=0
+ Release=0
+ Build=0
+ Debug=0
+ PreRelease=0
+ Special=0
+ Private=0
+ DLL=1
+ Locale=2057
+ CodePage=1252
+
+ [Version Info Keys]
+ CompanyName=
+ FileDescription=
+ FileVersion=1.0.0.0
+ InternalName=
+ LegalCopyright=
+ LegalTrademarks=
+ OriginalFilename=
+ ProductName=
+ ProductVersion=
+ Comments=
+
+ [HistoryLists\hlIncludePath]
+ Count=18
+ Item0=..\..;..\..\..\zlib;$(BCB)\include
+ Item1=..\..;P:\My Documents\Source\PNG+ZLib\zlib;$(BCB)\include
+ Item2=..\..;..\Source\ThirdParty\PortableNetworkGraphics\external;..\Source\ThirdParty\PortableNetworkGraphics;..\Source\ThirdParty\ZLibCompression\external;$(BCB)\include
+ Item3=..\Source\ThirdParty\PortableNetworkGraphics\external;..\Source\ThirdParty\PortableNetworkGraphics;..\Source\ThirdParty\ZLibCompression\external;$(BCB)\include
+ Item4=..\Source\ThirdParty\PortableNetworkGraphics\external;..\Source\ThirdParty\PortableNetworkGraphics;..\Source\ThirdParty\ZLibCompression;$(BCB)\include
+ Item5=..\Source\ThirdParty\PortableNetworkGraphics;..\Source\ThirdParty\ZLibCompression;$(BCB)\include
+ Item6=..\Source\ThirdParty\PortableNetworkGraphics;P:\Development\Source\ThirdParty\ZLibCompression;$(BCB)\include
+ Item7=..\Source\ThirdParty\PortableNetworkGraphics;$(BCB)\include
+ Item8=$(BCB)\include
+ Item9=..\Source;..\Source\General\Templates;..\Source\SIMUtilities;$(BCB)\include;$(BCB)\include\vcl
+ Item10=P:\Development\Source\;P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities\;$(BCB)\include;$(BCB)\include\vcl
+ Item11=P:\Development\Source;P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities\;$(BCB)\include;$(BCB)\include\vcl
+ Item12=P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities\;$(BCB)\include;$(BCB)\include\vcl
+ Item13=P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities;$(BCB)\include;$(BCB)\include\vcl
+ Item14=P:\Development\Source\General\Templates\;$(BCB)\include;$(BCB)\include\vcl
+ Item15=P:\Development\Source\General\Templates;$(BCB)\include;$(BCB)\include\vcl
+ Item16=P:\Development\Source;$(BCB)\include;$(BCB)\include\vcl
+ Item17=$(BCB)\include;$(BCB)\include\vcl
+
+ [HistoryLists\hlLibraryPath]
+ Count=10
+ Item0=..\..;$(BCB)\lib\obj;$(BCB)\lib
+ Item1=..\..;..\Source\ThirdParty\PortableNetworkGraphics\external;..\Source\ThirdParty\PortableNetworkGraphics;$(BCB)\lib\obj;$(BCB)\lib
+ Item2=..\Source\ThirdParty\PortableNetworkGraphics\external;..\Source\ThirdParty\PortableNetworkGraphics;$(BCB)\lib\obj;$(BCB)\lib
+ Item3=..\Source\ThirdParty\PortableNetworkGraphics;$(BCB)\lib\obj;$(BCB)\lib
+ Item4=$(BCB)\lib\obj;$(BCB)\lib
+ Item5=..\Source\SIMUtilities;..\Source;$(BCB)\lib\obj;$(BCB)\lib
+ Item6=P:\Development\Source\SIMUtilities\;P:\Development\Source\;$(BCB)\lib\obj;$(BCB)\lib
+ Item7=P:\Development\Source\SIMUtilities;P:\Development\Source\;$(BCB)\lib\obj;$(BCB)\lib
+ Item8=P:\Development\Source\;$(BCB)\lib\obj;$(BCB)\lib
+ Item9=P:\Development\Source;$(BCB)\lib\obj;$(BCB)\lib
+
+ [HistoryLists\hlDebugSourcePath]
+ Count=1
+ Item0=$(BCB)\source\vcl
+
+ [HistoryLists\hlConditionals]
+ Count=20
+ Item0=ZLIB_DLL;Z_PREFIX;PNG_BUILD_DLL;PNG_NO_MODULEDEF
+ Item1=_DEBUG;ZLIB_DLL;Z_PREFIX;PNG_BUILD_DLL;PNG_NO_MODULEDEF
+ Item2=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_NO_MODULEDEF
+ Item3=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG=5;PNG_NO_MODULEDEF;PNG_NO_GLOBAL_ARRAYS
+ Item4=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG=5;PNG_NO_MODULEDEF;PNG_SETJMP_NOT_SUPPORTED;PNG_DEBUG_FILE=stderr
+ Item5=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG;PNG_NO_MODULEDEF;PNG_SETJMP_NOT_SUPPORTED
+ Item6=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG=5;PNG_NO_MODULEDEF;PNG_SETJMP_NOT_SUPPORTED
+ Item7=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG=5;PNG_NO_MODULEDEF
+ Item8=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG=5
+ Item9=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG
+ Item10=PNG_BUILD_DLL;ZLIB_DLL
+ Item11=PNG_BUILD_DLL
+ Item12=PNG_DLL;PNG_BUILD_DLL;ZLIB_DLL
+ Item13=PNG_DLL;PNG_BUILD_DLL;PNG_NO_GLOBAL_ARRAYS;ZLIB_DLL
+ Item14=PNG_DLL;PNG_BUILD_DLL;PNG_NO_GLOBAL_ARRAYS
+ Item15=PNG_DLL;PNG_BUILD_DLL
+ Item16=PNG_DLL;PNG_BUILD_DLL;PNG_MODULEDEF
+ Item17=_HTML_FORM
+ Item18=_DEBUG;_HTML_FORM
+ Item19=_DEBUG
+
+ [HistoryLists\hlIntOutputDir]
+ Count=2
+ Item0=..\Obj
+ Item1=P:\Development\Obj
+
+ [Debugging]
+ DebugSourceDirs=
+
+ [Parameters]
+ RunParams=
+ HostApplication=P:\Development\Executables\LibPNGTestApp.exe
+ RemoteHost=
+ RemotePath=
+ RemoteDebug=0
+
+ [Compiler]
+ ShowInfoMsgs=0
+ LinkDebugVcl=0
+ LinkCGLIB=0
+ </IDEOPTIONS>
+ </PROJECT>
\ No newline at end of file
Index: llvm/runtime/libpng/projects/borland/libpng.cpp
diff -c /dev/null llvm/runtime/libpng/projects/borland/libpng.cpp:1.1.2.1
*** /dev/null Mon Mar 1 17:58:56 2004
--- llvm/runtime/libpng/projects/borland/libpng.cpp Mon Mar 1 17:58:46 2004
***************
*** 0 ****
--- 1,29 ----
+ //---------------------------------------------------------------------------
+ #include <windows.h>
+ //---------------------------------------------------------------------------
+ // Important note about DLL memory management when your DLL uses the
+ // static version of the RunTime Library:
+ //
+ // If your DLL exports any functions that pass String objects (or structs/
+ // classes containing nested Strings) as parameter or function results,
+ // you will need to add the library MEMMGR.LIB to both the DLL project and
+ // any other projects that use the DLL. You will also need to use MEMMGR.LIB
+ // if any other projects which use the DLL will be performing new or delete
+ // operations on any non-TObject-derived classes which are exported from the
+ // DLL. Adding MEMMGR.LIB to your project will change the DLL and its calling
+ // EXE's to use the BORLNDMM.DLL as their memory manager. In these cases,
+ // the file BORLNDMM.DLL should be deployed along with your DLL.
+ //
+ // To avoid using BORLNDMM.DLL, pass string information using "char *" or
+ // ShortString parameters.
+ //
+ // If your DLL uses the dynamic version of the RTL, you do not need to
+ // explicitly add MEMMGR.LIB as this will be done implicitly for you
+ //---------------------------------------------------------------------------
+
+ int WINAPI DllEntryPoint(HINSTANCE, unsigned long, void*)
+ {
+ return 1;
+ }
+ //---------------------------------------------------------------------------
+
\ No newline at end of file
Index: llvm/runtime/libpng/projects/borland/libpng.readme.txt
diff -c /dev/null llvm/runtime/libpng/projects/borland/libpng.readme.txt:1.1.2.1
*** /dev/null Mon Mar 1 17:58:56 2004
--- llvm/runtime/libpng/projects/borland/libpng.readme.txt Mon Mar 1 17:58:46 2004
***************
*** 0 ****
--- 1,19 ----
+ Project files to build libpng using Borland C++ Builder v5.0
+
+ To use this dll, you will need to:
+
+ 1) add the following conditional defines to your project
+
+ PNG_USE_DLL
+ Z_PREFIX
+
+ 2) add the paths to png.h and zlib.h to your include path
+
+ 3) add libpng.lib or libpngstat.lib to the project.
+
+ If you are using libpng.dll, libpng.dll and zlib.dll will be required for the code to run.
+
+ Alternatively, the libpng.dll can be built using zlibstat.lib to produce one dll containing both the zlib and png code.
+
+ See the libpng documentation for instructions on how to use the code.
+
Index: llvm/runtime/libpng/projects/borland/libpngstat.bpf
diff -c /dev/null llvm/runtime/libpng/projects/borland/libpngstat.bpf:1.1.2.1
*** /dev/null Mon Mar 1 17:58:56 2004
--- llvm/runtime/libpng/projects/borland/libpngstat.bpf Mon Mar 1 17:58:46 2004
***************
*** 0 ****
--- 1,22 ----
+ USELIB("zlibstat.lib");
+ USEUNIT("..\..\pngerror.c");
+ USEUNIT("..\..\png.c");
+ USEUNIT("..\..\pngwutil.c");
+ USEUNIT("..\..\pngmem.c");
+ USEUNIT("..\..\pngpread.c");
+ USEUNIT("..\..\pngread.c");
+ USEUNIT("..\..\pngrio.c");
+ USEUNIT("..\..\pngrtran.c");
+ USEUNIT("..\..\pngrutil.c");
+ USEUNIT("..\..\pngset.c");
+ USEUNIT("..\..\pngtrans.c");
+ USEUNIT("..\..\pngwio.c");
+ USEUNIT("..\..\pngwrite.c");
+ USEUNIT("..\..\pngwtran.c");
+ USEUNIT("..\..\pngget.c");
+ //---------------------------------------------------------------------------
+ #define Library
+
+ // To add a file to the library use the Project menu 'Add to Project'.
+
+
\ No newline at end of file
Index: llvm/runtime/libpng/projects/borland/libpngstat.bpr
diff -c /dev/null llvm/runtime/libpng/projects/borland/libpngstat.bpr:1.1.2.1
*** /dev/null Mon Mar 1 17:58:56 2004
--- llvm/runtime/libpng/projects/borland/libpngstat.bpr Mon Mar 1 17:58:46 2004
***************
*** 0 ****
--- 1,109 ----
+ <?xml version='1.0' encoding='utf-8' ?>
+ <!-- C++Builder XML Project -->
+ <PROJECT>
+ <MACROS>
+ <VERSION value="BCB.05.03"/>
+ <PROJECT value="libpngstat.lib"/>
+ <OBJFILES value="..\..\pngerror.obj ..\..\png.obj ..\..\pngwutil.obj ..\..\pngmem.obj
+ ..\..\pngpread.obj ..\..\pngread.obj ..\..\pngrio.obj ..\..\pngrtran.obj
+ ..\..\pngrutil.obj ..\..\pngset.obj ..\..\pngtrans.obj ..\..\pngwio.obj
+ ..\..\pngwrite.obj ..\..\pngwtran.obj ..\..\pngget.obj"/>
+ <RESFILES value=""/>
+ <DEFFILE value=""/>
+ <RESDEPEN value="$(RESFILES)"/>
+ <LIBFILES value="zlibstat.lib"/>
+ <LIBRARIES value=""/>
+ <PACKAGES value=""/>
+ <PATHCPP value=".;..\.."/>
+ <PATHPAS value=".;"/>
+ <PATHRC value=".;"/>
+ <PATHASM value=".;"/>
+ <LINKER value="TLib"/>
+ <USERDEFINES value=""/>
+ <SYSDEFINES value="_RTLDLL;NO_STRICT"/>
+ <MAINSOURCE value="libpngstat.bpf"/>
+ <INCLUDEPATH value="..\..;..\..\..\zlib;$(BCB)\include"/>
+ <LIBPATH value="..\..;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <WARNINGS value="-w-par"/>
+ <LISTFILE value=""/>
+ </MACROS>
+ <OPTIONS>
+ <CFLAG1 value="-O2 -w -Vx -Ve -X- -a8 -5 -b- -d -k- -vi -c -tW -tWM"/>
+ <PFLAGS value="-$Y- -$L- -$D- -$C- -v -JPHNE -M"/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value=""/>
+ </OPTIONS>
+ <LINKER>
+ <ALLOBJ value="$(OBJFILES)"/>
+ <ALLLIB value=""/>
+ </LINKER>
+ <IDEOPTIONS>
+ [Version Info]
+ IncludeVerInfo=0
+ AutoIncBuild=0
+ MajorVer=1
+ MinorVer=0
+ Release=0
+ Build=0
+ Debug=0
+ PreRelease=0
+ Special=0
+ Private=0
+ DLL=0
+ Locale=2057
+ CodePage=1252
+
+ [Version Info Keys]
+ CompanyName=
+ FileDescription=
+ FileVersion=1.0.0.0
+ InternalName=
+ LegalCopyright=
+ LegalTrademarks=
+ OriginalFilename=
+ ProductName=
+ ProductVersion=1.0.0.0
+ Comments=
+
+ [HistoryLists\hlIncludePath]
+ Count=2
+ Item0=..\..;P:\My Documents\Source\PNG+ZLib\zlib;$(BCB)\include
+ Item1=..\..;$(BCB)\include;$(BCB)\include\vcl
+
+ [HistoryLists\hlLibraryPath]
+ Count=1
+ Item0=..\..;$(BCB)\lib\obj;$(BCB)\lib
+
+ [HistoryLists\hlDebugSourcePath]
+ Count=1
+ Item0=$(BCB)\source\vcl
+
+ [HistoryLists\hlConditionals]
+ Count=1
+ Item0=_DEBUG
+
+ [HistoryLists\hlTlibPageSize]
+ Count=1
+ Item0=0x0010
+
+ [Debugging]
+ DebugSourceDirs=$(BCB)\source\vcl
+
+ [Parameters]
+ RunParams=
+ HostApplication=
+ RemoteHost=
+ RemotePath=
+ RemoteDebug=0
+
+ [Compiler]
+ ShowInfoMsgs=0
+ LinkDebugVcl=0
+ LinkCGLIB=0
+
+ [Language]
+ ActiveLang=
+ ProjectLang=
+ RootDir=
+ </IDEOPTIONS>
+ </PROJECT>
\ No newline at end of file
Index: llvm/runtime/libpng/projects/borland/zlib+libpng.bpg
diff -c /dev/null llvm/runtime/libpng/projects/borland/zlib+libpng.bpg:1.1.2.1
*** /dev/null Mon Mar 1 17:58:56 2004
--- llvm/runtime/libpng/projects/borland/zlib+libpng.bpg Mon Mar 1 17:58:46 2004
***************
*** 0 ****
--- 1,33 ----
+ #------------------------------------------------------------------------------
+ VERSION = BWS.01
+ #------------------------------------------------------------------------------
+ !ifndef ROOT
+ ROOT = $(MAKEDIR)\..
+ !endif
+ #------------------------------------------------------------------------------
+ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
+ DCC = $(ROOT)\bin\dcc32.exe $**
+ BRCC = $(ROOT)\bin\brcc32.exe $**
+ #------------------------------------------------------------------------------
+ PROJECTS = zlibstat.lib libpngstat.lib zlib.dll libpng.dll
+ #------------------------------------------------------------------------------
+ default: $(PROJECTS)
+ #------------------------------------------------------------------------------
+
+ libpng.dll: libpng.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+ zlibstat.lib: zlibstat.bpr
+ $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+ zlib.dll: zlib.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+ libpngstat.lib: libpngstat.bpr
+ $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+
Index: llvm/runtime/libpng/projects/borland/zlib.bpf
diff -c /dev/null llvm/runtime/libpng/projects/borland/zlib.bpf:1.1.2.1
*** /dev/null Mon Mar 1 17:58:56 2004
--- llvm/runtime/libpng/projects/borland/zlib.bpf Mon Mar 1 17:58:46 2004
***************
*** 0 ****
--- 1,20 ----
+ USEUNIT("zlib.cpp");
+ USEUNIT("..\..\..\zlib\zutil.c");
+ USEUNIT("..\..\..\zlib\compress.c");
+ USEUNIT("..\..\..\zlib\crc32.c");
+ USEUNIT("..\..\..\zlib\deflate.c");
+ USEUNIT("..\..\..\zlib\gzio.c");
+ USEUNIT("..\..\..\zlib\infblock.c");
+ USEUNIT("..\..\..\zlib\infcodes.c");
+ USEUNIT("..\..\..\zlib\inffast.c");
+ USEUNIT("..\..\..\zlib\inflate.c");
+ USEUNIT("..\..\..\zlib\inftrees.c");
+ USEUNIT("..\..\..\zlib\infutil.c");
+ USEUNIT("..\..\..\zlib\trees.c");
+ USEUNIT("..\..\..\zlib\uncompr.c");
+ USEUNIT("..\..\..\zlib\adler32.c");
+ //---------------------------------------------------------------------------
+ This file is used by the project manager only and should be treated like the project file
+
+
+ DllEntryPoint
\ No newline at end of file
Index: llvm/runtime/libpng/projects/borland/zlib.bpg
diff -c /dev/null llvm/runtime/libpng/projects/borland/zlib.bpg:1.1.2.1
*** /dev/null Mon Mar 1 17:58:56 2004
--- llvm/runtime/libpng/projects/borland/zlib.bpg Mon Mar 1 17:58:46 2004
***************
*** 0 ****
--- 1,25 ----
+ #------------------------------------------------------------------------------
+ VERSION = BWS.01
+ #------------------------------------------------------------------------------
+ !ifndef ROOT
+ ROOT = $(MAKEDIR)\..
+ !endif
+ #------------------------------------------------------------------------------
+ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
+ DCC = $(ROOT)\bin\dcc32.exe $**
+ BRCC = $(ROOT)\bin\brcc32.exe $**
+ #------------------------------------------------------------------------------
+ PROJECTS = zlibstat.lib zlib.dll
+ #------------------------------------------------------------------------------
+ default: $(PROJECTS)
+ #------------------------------------------------------------------------------
+
+ zlibstat.lib: zlibstat.bpr
+ $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+ zlib.dll: zlib.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+
Index: llvm/runtime/libpng/projects/borland/zlib.bpr
diff -c /dev/null llvm/runtime/libpng/projects/borland/zlib.bpr:1.1.2.1
*** /dev/null Mon Mar 1 17:58:56 2004
--- llvm/runtime/libpng/projects/borland/zlib.bpr Mon Mar 1 17:58:46 2004
***************
*** 0 ****
--- 1,147 ----
+ <?xml version='1.0' encoding='utf-8' ?>
+ <!-- C++Builder XML Project -->
+ <PROJECT>
+ <MACROS>
+ <VERSION value="BCB.05.03"/>
+ <PROJECT value="zlib.dll"/>
+ <OBJFILES value="zlib.obj ..\..\..\zlib\zutil.obj ..\..\..\zlib\compress.obj
+ ..\..\..\zlib\crc32.obj ..\..\..\zlib\deflate.obj ..\..\..\zlib\gzio.obj
+ ..\..\..\zlib\infblock.obj ..\..\..\zlib\infcodes.obj
+ ..\..\..\zlib\inffast.obj ..\..\..\zlib\inflate.obj
+ ..\..\..\zlib\inftrees.obj ..\..\..\zlib\infutil.obj
+ ..\..\..\zlib\trees.obj ..\..\..\zlib\uncompr.obj ..\..\..\zlib\adler32.obj"/>
+ <RESFILES value=""/>
+ <DEFFILE value=""/>
+ <RESDEPEN value="$(RESFILES)"/>
+ <LIBFILES value=""/>
+ <LIBRARIES value="bcbsmp50.lib dclocx50.lib NMFast50.lib Tee50.lib Vclx50.lib Vcl50.lib"/>
+ <SPARELIBS value="Vcl50.lib Vclx50.lib Tee50.lib NMFast50.lib dclocx50.lib bcbsmp50.lib"/>
+ <PACKAGES value="Vcl50.bpi Vclx50.bpi bcbsmp50.bpi Qrpt50.bpi Vcldb50.bpi Vclbde50.bpi
+ ibsmp50.bpi vcldbx50.bpi TeeUI50.bpi TeeDB50.bpi Tee50.bpi TeeQR50.bpi
+ VCLIB50.bpi bcbie50.bpi vclie50.bpi Inetdb50.bpi Inet50.bpi NMFast50.bpi
+ dclocx50.bpi bcb97axserver50.bpi SIMULUSCOMPONENTS.bpi Simulus2.bpi"/>
+ <PATHCPP value=".;..\..\..\zlib"/>
+ <PATHPAS value=".;"/>
+ <PATHRC value=".;"/>
+ <PATHASM value=".;"/>
+ <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+ <RELEASELIBPATH value="$(BCB)\lib\release"/>
+ <LINKER value="tlink32"/>
+ <USERDEFINES value="ZLIB_DLL;Z_PREFIX"/>
+ <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL"/>
+ <MAINSOURCE value="zlib.bpf"/>
+ <INCLUDEPATH value="..\..\..\zlib;$(BCB)\include"/>
+ <LIBPATH value="..\..\..\zlib;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wpin
+ -w-par -wnod -wnak -wdef -wcln -wbbf -w-aus -wasm -wamp -wamb"/>
+ </MACROS>
+ <OPTIONS>
+ <CFLAG1 value="-WD -O2 -w -Vx -Ve -x- -RT- -ff -X- -a8 -5 -b- -d -k- -vi -tWD -tWM -c"/>
+ <PFLAGS value="-$Y- -$L- -$D- -$C- -v -JPHNE -M"/>
+ <RFLAGS value=""/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-D"" -aa -Tpd -x -Gn -Gi -w"/>
+ </OPTIONS>
+ <LINKER>
+ <ALLOBJ value="c0d32.obj $(OBJFILES)"/>
+ <ALLRES value="$(RESFILES)"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mti.lib"/>
+ </LINKER>
+ <IDEOPTIONS>
+ [Version Info]
+ IncludeVerInfo=0
+ AutoIncBuild=0
+ MajorVer=1
+ MinorVer=0
+ Release=0
+ Build=0
+ Debug=0
+ PreRelease=0
+ Special=0
+ Private=0
+ DLL=1
+ Locale=2057
+ CodePage=1252
+
+ [Version Info Keys]
+ CompanyName=
+ FileDescription=
+ FileVersion=1.0.0.0
+ InternalName=
+ LegalCopyright=
+ LegalTrademarks=
+ OriginalFilename=
+ ProductName=
+ ProductVersion=1.0.0.0
+ Comments=
+
+ [HistoryLists\hlIncludePath]
+ Count=16
+ Item0=..\..\..\zlib;$(BCB)\include
+ Item1=..\..\..;..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression;..\..\..\zlib;$(BCB)\include
+ Item2=..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression;..\..\..\zlib;$(BCB)\include
+ Item3=P:\My Documents\Source\PNG+ZLib\zlib;$(BCB)\include
+ Item4=..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression;$(BCB)\include
+ Item5=..\Source\ThirdParty\ZLibCompression;$(BCB)\include
+ Item6=$(BCB)\include
+ Item7=..\Source;..\Source\General\Templates;..\Source\SIMUtilities;$(BCB)\include;$(BCB)\include\vcl
+ Item8=P:\Development\Source\;P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities\;$(BCB)\include;$(BCB)\include\vcl
+ Item9=P:\Development\Source;P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities\;$(BCB)\include;$(BCB)\include\vcl
+ Item10=P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities\;$(BCB)\include;$(BCB)\include\vcl
+ Item11=P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities;$(BCB)\include;$(BCB)\include\vcl
+ Item12=P:\Development\Source\General\Templates\;$(BCB)\include;$(BCB)\include\vcl
+ Item13=P:\Development\Source\General\Templates;$(BCB)\include;$(BCB)\include\vcl
+ Item14=P:\Development\Source;$(BCB)\include;$(BCB)\include\vcl
+ Item15=$(BCB)\include;$(BCB)\include\vcl
+
+ [HistoryLists\hlLibraryPath]
+ Count=12
+ Item0=..\..\..\zlib;$(BCB)\lib\obj;$(BCB)\lib
+ Item1=..\..\..;..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression;..\..\..\zlib;$(BCB)\lib\obj;$(BCB)\lib
+ Item2=..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression;..\..\..\zlib;$(BCB)\lib\obj;$(BCB)\lib
+ Item3=P:\My Documents\Source\PNG+ZLib\zlib;$(BCB)\lib\obj;$(BCB)\lib
+ Item4=..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression;$(BCB)\lib\obj;$(BCB)\lib
+ Item5=$(BCB)\lib\obj;$(BCB)\lib
+ Item6=..\Source\ThirdParty\ZLibCompression;$(BCB)\lib\obj;$(BCB)\lib
+ Item7=..\Source\SIMUtilities;..\Source;$(BCB)\lib\obj;$(BCB)\lib
+ Item8=P:\Development\Source\SIMUtilities\;P:\Development\Source\;$(BCB)\lib\obj;$(BCB)\lib
+ Item9=P:\Development\Source\SIMUtilities;P:\Development\Source\;$(BCB)\lib\obj;$(BCB)\lib
+ Item10=P:\Development\Source\;$(BCB)\lib\obj;$(BCB)\lib
+ Item11=P:\Development\Source;$(BCB)\lib\obj;$(BCB)\lib
+
+ [HistoryLists\hlDebugSourcePath]
+ Count=1
+ Item0=$(BCB)\source\vcl
+
+ [HistoryLists\hlConditionals]
+ Count=8
+ Item0=ZLIB_DLL;Z_PREFIX
+ Item1=ZLIB_DLL;_DEBUG;Z_PREFIX
+ Item2=ZLIB_DLL;_DEBUG
+ Item3=ZLIB_DLL
+ Item4=_WINDOWS;ZLIB_DLL
+ Item5=_HTML_FORM
+ Item6=_DEBUG;_HTML_FORM
+ Item7=_DEBUG
+
+ [HistoryLists\hlIntOutputDir]
+ Count=2
+ Item0=..\Obj
+ Item1=P:\Development\Obj
+
+ [Debugging]
+ DebugSourceDirs=
+
+ [Parameters]
+ RunParams=
+ HostApplication=
+ RemoteHost=
+ RemotePath=
+ RemoteDebug=0
+
+ [Compiler]
+ ShowInfoMsgs=0
+ LinkDebugVcl=0
+ LinkCGLIB=0
+ </IDEOPTIONS>
+ </PROJECT>
\ No newline at end of file
Index: llvm/runtime/libpng/projects/borland/zlib.cpp
diff -c /dev/null llvm/runtime/libpng/projects/borland/zlib.cpp:1.1.2.1
*** /dev/null Mon Mar 1 17:58:56 2004
--- llvm/runtime/libpng/projects/borland/zlib.cpp Mon Mar 1 17:58:46 2004
***************
*** 0 ****
--- 1,30 ----
+ //---------------------------------------------------------------------------
+
+ #include <windows.h>
+ //---------------------------------------------------------------------------
+ // Important note about DLL memory management when your DLL uses the
+ // static version of the RunTime Library:
+ //
+ // If your DLL exports any functions that pass String objects (or structs/
+ // classes containing nested Strings) as parameter or function results,
+ // you will need to add the library MEMMGR.LIB to both the DLL project and
+ // any other projects that use the DLL. You will also need to use MEMMGR.LIB
+ // if any other projects which use the DLL will be performing new or delete
+ // operations on any non-TObject-derived classes which are exported from the
+ // DLL. Adding MEMMGR.LIB to your project will change the DLL and its calling
+ // EXE's to use the BORLNDMM.DLL as their memory manager. In these cases,
+ // the file BORLNDMM.DLL should be deployed along with your DLL.
+ //
+ // To avoid using BORLNDMM.DLL, pass string information using "char *" or
+ // ShortString parameters.
+ //
+ // If your DLL uses the dynamic version of the RTL, you do not need to
+ // explicitly add MEMMGR.LIB as this will be done implicitly for you
+ //---------------------------------------------------------------------------
+
+ int WINAPI DllEntryPoint(HINSTANCE, unsigned long, void*)
+ {
+ return 1;
+ }
+ //---------------------------------------------------------------------------
+
\ No newline at end of file
Index: llvm/runtime/libpng/projects/borland/zlibstat.bpf
diff -c /dev/null llvm/runtime/libpng/projects/borland/zlibstat.bpf:1.1.2.1
*** /dev/null Mon Mar 1 17:58:56 2004
--- llvm/runtime/libpng/projects/borland/zlibstat.bpf Mon Mar 1 17:58:46 2004
***************
*** 0 ****
--- 1,20 ----
+ USEUNIT("..\..\..\zlib\zutil.c");
+ USEUNIT("..\..\..\zlib\compress.c");
+ USEUNIT("..\..\..\zlib\crc32.c");
+ USEUNIT("..\..\..\zlib\deflate.c");
+ USEUNIT("..\..\..\zlib\gzio.c");
+ USEUNIT("..\..\..\zlib\infblock.c");
+ USEUNIT("..\..\..\zlib\infcodes.c");
+ USEUNIT("..\..\..\zlib\inffast.c");
+ USEUNIT("..\..\..\zlib\inflate.c");
+ USEUNIT("..\..\..\zlib\inftrees.c");
+ USEUNIT("..\..\..\zlib\infutil.c");
+ USEUNIT("..\..\..\zlib\trees.c");
+ USEUNIT("..\..\..\zlib\uncompr.c");
+ USEUNIT("..\..\..\zlib\adler32.c");
+ //---------------------------------------------------------------------------
+ #define Library
+
+ // To add a file to the library use the Project menu 'Add to Project'.
+
+
\ No newline at end of file
Index: llvm/runtime/libpng/projects/borland/zlibstat.bpr
diff -c /dev/null llvm/runtime/libpng/projects/borland/zlibstat.bpr:1.1.2.1
*** /dev/null Mon Mar 1 17:58:56 2004
--- llvm/runtime/libpng/projects/borland/zlibstat.bpr Mon Mar 1 17:58:46 2004
***************
*** 0 ****
--- 1,131 ----
+ <?xml version='1.0' encoding='utf-8' ?>
+ <!-- C++Builder XML Project -->
+ <PROJECT>
+ <MACROS>
+ <VERSION value="BCB.05.03"/>
+ <PROJECT value="zlibstat.lib"/>
+ <OBJFILES value="..\..\..\zlib\zutil.obj ..\..\..\zlib\compress.obj ..\..\..\zlib\crc32.obj
+ ..\..\..\zlib\deflate.obj ..\..\..\zlib\gzio.obj
+ ..\..\..\zlib\infblock.obj ..\..\..\zlib\infcodes.obj
+ ..\..\..\zlib\inffast.obj ..\..\..\zlib\inflate.obj
+ ..\..\..\zlib\inftrees.obj ..\..\..\zlib\infutil.obj
+ ..\..\..\zlib\trees.obj ..\..\..\zlib\uncompr.obj ..\..\..\zlib\adler32.obj"/>
+ <RESFILES value=""/>
+ <DEFFILE value=""/>
+ <RESDEPEN value="$(RESFILES)"/>
+ <LIBFILES value=""/>
+ <LIBRARIES value=""/>
+ <PACKAGES value=""/>
+ <PATHCPP value=".;..\..\..\zlib"/>
+ <PATHPAS value=".;"/>
+ <PATHRC value=".;"/>
+ <PATHASM value=".;"/>
+ <LINKER value="TLib"/>
+ <USERDEFINES value="Z_PREFIX"/>
+ <SYSDEFINES value="_RTLDLL;NO_STRICT"/>
+ <MAINSOURCE value="zlibstat.bpf"/>
+ <INCLUDEPATH value="..\..\..\zlib;$(BCB)\include"/>
+ <LIBPATH value="..\..\..\zlib;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wpin
+ -wnod -wnak -wdef -wcln -wbbf -w-aus -wasm -wamp -wamb"/>
+ <LISTFILE value=""/>
+ </MACROS>
+ <OPTIONS>
+ <CFLAG1 value="-O2 -w -Vx -Ve -x- -RT- -X- -a8 -5 -b- -d -k- -vi -c -tW -tWM"/>
+ <PFLAGS value="-$Y- -$L- -$D- -$C- -v -JPHNE -M"/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value=""/>
+ </OPTIONS>
+ <LINKER>
+ <ALLOBJ value="$(OBJFILES)"/>
+ <ALLLIB value=""/>
+ </LINKER>
+ <IDEOPTIONS>
+ [Version Info]
+ IncludeVerInfo=0
+ AutoIncBuild=0
+ MajorVer=1
+ MinorVer=0
+ Release=0
+ Build=0
+ Debug=0
+ PreRelease=0
+ Special=0
+ Private=0
+ DLL=0
+ Locale=2057
+ CodePage=1252
+
+ [Version Info Keys]
+ CompanyName=
+ FileDescription=
+ FileVersion=1.0.0.0
+ InternalName=
+ LegalCopyright=
+ LegalTrademarks=
+ OriginalFilename=
+ ProductName=
+ ProductVersion=1.0.0.0
+ Comments=
+
+ [HistoryLists\hlIncludePath]
+ Count=8
+ Item0=..\..\..\zlib;$(BCB)\include
+ Item1=..\Source\ThirdParty\ZLibCompression\external;..\..\..\zlib;$(BCB)\include
+ Item2=P:\My Documents\Source\PNG+ZLib\zlib;$(BCB)\include
+ Item3=..\Source\ThirdParty\ZLibCompression\external;$(BCB)\include
+ Item4=..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression\ext;..\Source\ThirdParty\ZLibCompression;$(BCB)\include
+ Item5=..\Source\ThirdParty\ZLibCompression;$(BCB)\include
+ Item6=$(BCB)\include
+ Item7=$(BCB)\include;$(BCB)\include\vcl
+
+ [HistoryLists\hlLibraryPath]
+ Count=7
+ Item0=..\..\..\zlib;$(BCB)\lib\obj;$(BCB)\lib
+ Item1=$(BCB)\lib\obj;$(BCB)\lib
+ Item2=..\Source\ThirdParty\ZLibCompression\external;..\..\..\zlib;$(BCB)\lib\obj;$(BCB)\lib
+ Item3=P:\My Documents\Source\PNG+ZLib\zlib;$(BCB)\lib\obj;$(BCB)\lib
+ Item4=..\Source\ThirdParty\ZLibCompression\external;$(BCB)\lib\obj;$(BCB)\lib
+ Item5=..\Source\ThirdParty\ZLibCompression\external;..\Source\ThirdParty\ZLibCompression\ext;..\Source\ThirdParty\ZLibCompression;$(BCB)\lib\obj;$(BCB)\lib
+ Item6=..\Source\ThirdParty\ZLibCompression;$(BCB)\lib\obj;$(BCB)\lib
+
+ [HistoryLists\hlDebugSourcePath]
+ Count=1
+ Item0=$(BCB)\source\vcl
+
+ [HistoryLists\hlConditionals]
+ Count=3
+ Item0=Z_PREFIX
+ Item1=ZLIB_DLL
+ Item2=_WINDOWS;ZLIB_DLL
+
+ [HistoryLists\hlIntOutputDir]
+ Count=2
+ Item0=..\Obj
+ Item1=P:\Development\Obj
+
+ [HistoryLists\hlTlibPageSize]
+ Count=1
+ Item0=0x0010
+
+ [Debugging]
+ DebugSourceDirs=
+
+ [Parameters]
+ RunParams=
+ HostApplication=
+ RemoteHost=
+ RemotePath=
+ RemoteDebug=0
+
+ [Compiler]
+ ShowInfoMsgs=0
+ LinkDebugVcl=0
+ LinkCGLIB=0
+
+ [Language]
+ ActiveLang=
+ ProjectLang=
+ RootDir=
+ </IDEOPTIONS>
+ </PROJECT>
\ No newline at end of file
More information about the llvm-commits
mailing list