Added png, zlib targets to 16-bit makefiles

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index a1b91fc8a61b9a441f15ef9d9ab2d9969cdb175f..3fbd6ac1b074544e5a9637e5ed265c5914ee560a 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -54,6 +54,8 @@ copy %src\docs\msw\install.txt %dest\install_msw.txt
 copy %src\docs\motif\install.txt %dest\install_motif.txt
 copy %src\docs\gtk\install.txt %dest\install_gtk.txt
 copy %src\docs\readme.txt %dest
 copy %src\docs\motif\install.txt %dest\install_motif.txt
 copy %src\docs\gtk\install.txt %dest\install_gtk.txt
 copy %src\docs\readme.txt %dest

+copy %src\docs\motif\makewxmotif %dest
+copy %src\docs\gtk\makewxgtk %dest

 
 cd %dest
 
 
 cd %dest
 

diff --git a/docs/latex/wx/stream.tex b/docs/latex/wx/stream.tex
index 56b43ae61a1a5fc4ec010c6a444bb497d25503a8..69395451d0e9e752394f96da278a9dc5e2e49a4f 100644 (file)
--- a/docs/latex/wx/stream.tex
+++ b/docs/latex/wx/stream.tex
@@ -43,12 +43,13 @@ to a stream. \it{mode} specifies the type of the buffer (read, write, read\_writ
 work only on memory buffers but it is still compatible with the rest of the
 wxStream classes. You can write, read to this special stream and it will
 grow (if it is allowed by the user) its internal buffer. Briefly, it has all
 work only on memory buffers but it is still compatible with the rest of the
 wxStream classes. You can write, read to this special stream and it will
 grow (if it is allowed by the user) its internal buffer. Briefly, it has all

-functionnalities of a ``normal'' stream.
+functionality of a ``normal'' stream.

 
 \wxheading{Warning}
 
 The "read\_write" mode may not work: it isn't completely finished.
 You can create "memory" streams by this way:
 
 \wxheading{Warning}
 
 The "read\_write" mode may not work: it isn't completely finished.
 You can create "memory" streams by this way:

+

 \begin{verbatim}
   wxStreamBuffer *sb = new wxStreamBuffer(wxStreamBuffer::read)
   wxInputStream *input = new wxInputStream(sb);
 \begin{verbatim}
   wxStreamBuffer *sb = new wxStreamBuffer(wxStreamBuffer::read)
   wxInputStream *input = new wxInputStream(sb);


@@ -57,13 +58,10 @@ You can create "memory" streams by this way:
 
   // input is now a read-only memory stream.
 \end{verbatim}
 
   // input is now a read-only memory stream.
 \end{verbatim}

-But you should care about destroying the stream buffer \it{YOURSELF}.
-
-\wxheading{See also}

 
 

-\helpref{wxStreamBuffer:SetBufferIO}{wxstreambuffersetbufferio}
+But you should take care when destroying the stream buffer yourself.

 
 

-\func{}{wxStreamBuffer}{\param{const wxStreamBuffer &}{buffer}}
+\func{}{wxStreamBuffer}{\param{const wxStreamBuffer\&}{buffer}}

 
 Constructor. It initializes the stream buffer with the data of the specified
 stream buffer. The new stream buffer is nearly exactly the same as the
 
 Constructor. It initializes the stream buffer with the data of the specified
 stream buffer. The new stream buffer is nearly exactly the same as the


@@ -78,6 +76,10 @@ segmentation violation if the parent is destroyed and the children continues
 operating. It is advised to use this feature only in very local area of the
 program.
 
 operating. It is advised to use this feature only in very local area of the
 program.
 

+\wxheading{See also}
+
+\helpref{wxStreamBuffer:SetBufferIO}{wxstreambuffersetbufferio}
+

 \membersection{wxStreamBuffer::\destruct{wxStreamBuffer}}
 
 \func{}{wxStreamBuffer}{\destruct{wxStreamBuffer}}
 \membersection{wxStreamBuffer::\destruct{wxStreamBuffer}}
 
 \func{}{wxStreamBuffer}{\destruct{wxStreamBuffer}}

diff --git a/samples/image/image.def b/samples/image/image.def
new file mode 100644 (file)
index 0000000..8586389
--- /dev/null
+++ b/samples/image/image.def
@@ -0,0 +1,7 @@
+NAME         Image
+DESCRIPTION  'wxWindows Image sample'
+EXETYPE      WINDOWS
+CODE         PRELOAD MOVEABLE DISCARDABLE
+DATA         PRELOAD MOVEABLE MULTIPLE
+HEAPSIZE     4048
+STACKSIZE    16000

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 3f81e49cbc95fbe10afd0eaeaa4245c7f3a9c8fa..77acee38f627312dc34143700b60b1465895c76c 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -13,7 +13,7 @@
 WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 
 WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 

-LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib

 
 !if "$(FINAL)" == "0"
 LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib $(EXTRALINKFLAGS)
 
 !if "$(FINAL)" == "0"
 LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib $(EXTRALINKFLAGS)

diff --git a/src/makeprog.bcc b/src/makeprog.bcc
index 3be08ebda148d707b5f372f3ac3dd0ce4036b4dd..e5e43c5b1702623d297f140ad7bcb32725b81c32 100644 (file)
--- a/src/makeprog.bcc
+++ b/src/makeprog.bcc
@@ -4,7 +4,7 @@
 !include $(WXDIR)\src\makebcc.env
 
 WXLIB = $(WXDIR)\lib\wx.lib
 !include $(WXDIR)\src\makebcc.env
 
 WXLIB = $(WXDIR)\lib\wx.lib

-LIBS=$(WXLIB) $(EXTRALIBS) mathwl cwl import ole2w16
+LIBS=$(WXLIB) $(EXTRALIBS) mathwl cwl import ole2w16 winpng zlib

 
 all:    $(TARGET).exe $(EXTRATARGETS)
 
 
 all:    $(TARGET).exe $(EXTRATARGETS)
 

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index fdbd53bab7ea8b0950c2befd6d7211ad9bc6f055..9c9ec91f4e16a4e658bb70eafb4d58dbefb8004c 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -53,8 +53,8 @@ PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 
 # TODO: add these libraries
 # PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS)
 
 # TODO: add these libraries
 # PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS)

-# PERIPH_TARGET=zlib png $(PERIPH_TARGET)
-# PERIPH_CLEAN_TARGET=clean_zlib clean_png $(PERIPH_CLEAN_TARGET)
+PERIPH_TARGET=zlib png $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_zlib clean_png $(PERIPH_CLEAN_TARGET)

 
 CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
 
 
 CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
 


@@ -635,57 +635,57 @@ $(MSWDIR)\notebook.obj:     $(GENDIR)\notebook.$(SRCSUFF)
 
 all_utils:
     cd $(WXDIR)\utils
 
 all_utils:
     cd $(WXDIR)\utils

-    make -f makefile.b32
+    make -f makefile.bcc

     cd $(WXDIR)\src\msw
 
 all_samples:
     cd $(WXDIR)\samples
     cd $(WXDIR)\src\msw
 
 all_samples:
     cd $(WXDIR)\samples

-    make -f makefile.b32
+    make -f makefile.bcc

     cd $(WXDIR)\src\msw
 
 all_execs:
     cd $(WXDIR)\utils
     cd $(WXDIR)\src\msw
 
 all_execs:
     cd $(WXDIR)\utils

-    make -f makefile.b32 all_execs
+    make -f makefile.bcc all_execs

     cd $(WXDIR)\src\msw
 
 all_libs:
     cd $(WXDIR)\src\msw
     cd $(WXDIR)\src\msw
 
 all_libs:
     cd $(WXDIR)\src\msw

-    make -f makefile.b32 ctl3d dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
+    make -f makefile.bcc ctl3d dib fafa gauge hytext itsy prologio rcparser wx wxgraph\

           wxstring wxtree mfutils # wxxpm
 
 all_contribs:
     cd $(WXDIR)\src\msw
           wxstring wxtree mfutils # wxxpm
 
 all_contribs:
     cd $(WXDIR)\src\msw

-    make -f makefile.b32 ctl3d fafa wxstring itsy gauge # wxxpm
+    make -f makefile.bcc ctl3d fafa wxstring itsy gauge # wxxpm

 
 # CONTRIB
 ctl3d:  $(CFG)
         cd $(WXDIR)\src\msw\ctl3d\borland
 
 # CONTRIB
 ctl3d:  $(CFG)
         cd $(WXDIR)\src\msw\ctl3d\borland

-        make -f makefile.b32 -DCFG=$(CFG)
+        make -f makefile.bcc -DCFG=$(CFG)

         cd $(WXDIR)\src\msw
 
 wxxpm: $(CFG)
        cd $(WXDIR)\src\xpm
         cd $(WXDIR)\src\msw
 
 wxxpm: $(CFG)
        cd $(WXDIR)\src\xpm

-       make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
+       make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)

        cd $(WXDIR)\src\msw
 
 png:    $(CFG)
         cd $(WXDIR)\src\png
        cd $(WXDIR)\src\msw
 
 png:    $(CFG)
         cd $(WXDIR)\src\png

-        make -f makefile.b32 
+        make -f makefile.bcc 

         cd $(WXDIR)\src\msw
 
 clean_png:
         cd $(WXDIR)\src\png
         cd $(WXDIR)\src\msw
 
 clean_png:
         cd $(WXDIR)\src\png

-        make -f makefile.b32 clean
+        make -f makefile.bcc clean

         cd $(WXDIR)\src\msw
 
 zlib:   $(CFG)
         cd $(WXDIR)\src\zlib
         cd $(WXDIR)\src\msw
 
 zlib:   $(CFG)
         cd $(WXDIR)\src\zlib

-        make -f makefile.b32 lib
+        make -f makefile.bcc

         cd $(WXDIR)\src\msw
 
 clean_zlib:
         cd $(WXDIR)\src\zlib
         cd $(WXDIR)\src\msw
 
 clean_zlib:
         cd $(WXDIR)\src\zlib

-        make -f makefile.b32 clean
+        make -f makefile.bcc clean

         cd $(WXDIR)\src\msw
 
 $(CFG): makefile.bcc
         cd $(WXDIR)\src\msw
 
 $(CFG): makefile.bcc

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 97fec5e99fa52d185ba3ea4c91c2874f1c646a28..adba1c6dd1831372eb6497efb5582cb58a553ee0 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -45,6 +45,10 @@ PERIPH_TARGET=xpm $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif
 
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif
 

+# PNG and Zlib
+PERIPH_TARGET=png zlib $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_png clean_zlib $(PERIPH_CLEAN_TARGET)
+

 GENDIR=..\generic
 COMMDIR=..\common
 OLEDIR=.\ole
 GENDIR=..\generic
 COMMDIR=..\common
 OLEDIR=.\ole


@@ -1059,12 +1063,32 @@ $(OBJECTS):     $(WXDIR)/include/wx/setup.h
 # Peripheral components
 
 xpm:
 # Peripheral components
 
 xpm:

-    cd $(WXDIR)\contrib\wxxpm
+    cd $(WXDIR)\src\xpm

     nmake -f makefile.dos FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
 clean_xpm:
     nmake -f makefile.dos FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
 clean_xpm:

-    cd $(WXDIR)\contrib\wxxpm
+    cd $(WXDIR)\src\xpm
+    nmake -f makefile.dos clean
+    cd $(WXDIR)\src\msw
+
+zlib:
+    cd $(WXDIR)\src\zlib
+    nmake -f makefile.dos FINAL=$(FINAL)
+    cd $(WXDIR)\src\msw
+
+clean_zlib:
+    cd $(WXDIR)\src\zlib
+    nmake -f makefile.dos clean
+    cd $(WXDIR)\src\msw
+
+png:
+    cd $(WXDIR)\src\png
+    nmake -f makefile.dos FINAL=$(FINAL)
+    cd $(WXDIR)\src\msw
+
+clean_png:
+    cd $(WXDIR)\src\png

     nmake -f makefile.dos clean
     cd $(WXDIR)\src\msw
 
     nmake -f makefile.dos clean
     cd $(WXDIR)\src\msw
 

diff --git a/src/png/makefile.b32 b/src/png/makefile.b32
index 6401e0a2de7fe569eb8602031abff5eeb431d99a..c812bbcb943794c16b20d428cd8c383ae7294896 100644 (file)
--- a/src/png/makefile.b32
+++ b/src/png/makefile.b32
@@ -7,7 +7,7 @@
 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #

-# Makefile : Builds minimal example
+# Makefile : Builds PNG library (BC++ 32-bit)

 
 # WXWIN and BCCDIR are set by parent make
 
 
 # WXWIN and BCCDIR are set by parent make
 


@@ -19,14 +19,11 @@ WINPNGLIB = ..\..\lib\winpng.lib
 WXLIBDIR = $(WXDIR)\lib
 WXINC = $(WXDIR)\include\msw
 WXLIB = $(WXLIBDIR)\wx32.lib 
 WXLIBDIR = $(WXDIR)\lib
 WXINC = $(WXDIR)\include\msw
 WXLIB = $(WXLIBDIR)\wx32.lib 

-LIBS=$(WXLIB) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib cw32 import32 ole2w32

 
 !if "$(FINAL)" == "0"
 
 !if "$(FINAL)" == "0"

-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib

 OPT = -Od
 DEBUG_FLAGS= -v
 !else
 OPT = -Od
 DEBUG_FLAGS= -v
 !else

-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib

 OPT = -Od
 DEBUG_FLAGS =
 !endif
 OPT = -Od
 DEBUG_FLAGS =
 !endif

diff --git a/src/png/makefile.bcc b/src/png/makefile.bcc
index efd3c07795a722d4cdfc8d4a60d810ac83bab9e3..e9e63e30518c2f68be00bb87fd5e1dc8f6f9a5b0 100644 (file)
--- a/src/png/makefile.bcc
+++ b/src/png/makefile.bcc
@@ -1,107 +1,92 @@
-# This file is special for Widows because setjmp 
-# is incompatible with the DOS version.
-# Alejandro Aguilar, 1995
-
-#
-# Borland C++ tools
-#
-IMPLIB  = Implib
-BCC     = Bcc +BccW16.cfg
-TLINK   = TLink
-TLIB    = TLib
-BRC     = Brc
-TASM    = Tasm
-
-

 #
 #

-# Options
-#   
-IDE_LFLAGS =  -LC:\BC4\LIB
-IDE_RFLAGS =  -IC:\BC4\INCLUDE;..\zlib;
-LLATW16_winpngdlib =  -Twe
-RLATW16_winpngdlib =  -31
-BLATW16_winpngdlib = 
-LEAT_winpngdlib = $(LLATW16_winpngdlib)
-REAT_winpngdlib = $(RLATW16_winpngdlib)
-BEAT_winpngdlib = $(BLATW16_winpngdlib)
-ZLIB=..\..\lib\zlib.lib
-LOBJECTS = png.obj pngrcb.obj pngread.obj pngrtran.obj pngrutil.obj pngstub.obj\
-       pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj
-
+# File:                makefile.bcc
+# Author:      Julian Smart
+# Created:     1993
+# Updated:     
+# Copyright:

 #
 #

-# Dependency List
+# "%W% %G%"

 #
 #

-Dep_winpng = \
-       ..\..\lib\winpng.lib
-
-winpng : BccW16.cfg $(Dep_winpng)
-  echo MakeNode winpng
-
-Dep_winpngdlib = \
-       png.obj\
-       pngrcb.obj\
-       pngread.obj\
-       pngrtran.obj\
-       pngrutil.obj\
-       pngstub.obj\
-       pngtrans.obj\
-       pngwrite.obj\
-       pngwtran.obj\
-       pngwutil.obj
-
-$(ZLIB): 
-       cd ..\zlib
-       make -fmakefile.bcc
-       cd ..\png
-       
-winpng.lib : $(Dep_winpngdlib) $(ZLIB)  
-  copy /b $(ZLIB) winpng.lib
-  $(TLIB) $< $(IDE_BFLAGS) $(BEAT_winpngdlib) @&&|    
-+$(LOBJECTS:.obj =.obj +)
-|
-
-png.obj :  png.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ png.c
-
-pngrcb.obj :  pngrcb.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngrcb.c
-
-pngread.obj :  pngread.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngread.c
-
-pngrtran.obj :  pngrtran.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngrtran.c
-
-pngrutil.obj :  pngrutil.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngrutil.c
-
-pngstub.obj :  pngstub.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngstub.c
-
-pngtrans.obj :  pngtrans.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngtrans.c
-
-pngwrite.obj :  pngwrite.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngwrite.c
-
-pngwtran.obj :  pngwtran.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngwtran.c
-
-pngwutil.obj :  pngwutil.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngwutil.c
-
-# Compiler configuration file
-BccW16.cfg :
-       Copy &&|
--v
--vi
--X-
--H
--IC:\BC4\INCLUDE
--H=winpng.csm
+# Makefile : Builds PNG library (BC++ 16-bit) 
+
+# WXWIN and BCCDIR are set by parent make
+
+WXDIR = $(WXWIN)
+!include $(WXDIR)\src\makebcc.env
+
+WINPNGLIB = ..\..\lib\winpng.lib
+
+WXLIBDIR = $(WXDIR)\lib
+WXINC = $(WXDIR)\include\msw
+WXLIB = $(WXLIBDIR)\wx.lib 
+
+!if "$(FINAL)" == "0"
+OPT = -Od
+DEBUG_FLAGS= -v
+!else
+OPT = -Od
+DEBUG_FLAGS =
+!endif
+CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
+
+OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \
+ pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj \
+ pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj
+
+all: $(WINPNGLIB)
+
+$(WINPNGLIB): $(OBJECTS) 
+        erase $(WINPNGLIB)
+       tlib $(WINPNGLIB) /P512 @&&!
+-+$(OBJECTS:.obj =.obj -+) 
+!
+
+.$(SRCSUFF).obj:
+       bcc $(CPPFLAGS) -c {$< }
+
+.c.obj:
+       bcc $(CPPFLAGS) -P- -c {$< }
+
+$(CFG): makefile.bcc
+       copy &&!
+-H=$(WXDIR)\src\msw\borland.pch
+-2
+-P
+-d
+-w-hid
+-w-par
+-w-pia
+-w-aus
+-w-rch

 -ml
 -ml

--WS
--3
--Ff
-| $@
+-Od
+-WE
+-Fs-
+-Vf
+-Ff=4
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
+-I$(WXDIR)\include\wx\msw\gnuwin32
+-L$(BCCDIR)\lib
+-D__WXWIN__
+-D__WXMSW__
+-D__WINDOWS__
+-D__WIN16__
+! $(CFG)
+!if "$(BOR_VER)" == "3.1"
+       echo -Ff=4 >>$(CFG)
+!elif "$(BOR_VER)" == "4"
+       echo -Ff=512 >>$(CFG)
+       echo -dc >>$(CFG)
+!else
+       echo -Ff=512 >>$(CFG)
+       echo -dc >>$(CFG)
+!endif
+
+clean:
+        -erase *.obj
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.rws
+        -erase $(WINPNGLIB)

 
 

diff --git a/src/png/makefile.dos b/src/png/makefile.dos
index bbea801c4d2f326527e9c92109ace68a081168dd..41f1712e65b7ea62080331b35f077f45afb73f2e 100644 (file)
--- a/src/png/makefile.dos
+++ b/src/png/makefile.dos
@@ -14,7 +14,7 @@ WXDIR = $(WXWIN)
 WXLIB = $(WXDIR)\lib\wx.lib
 WXINC = $(WXDIR)\include
 
 WXLIB = $(WXDIR)\lib\wx.lib
 WXINC = $(WXDIR)\include
 

-WINPNGDIR = $(WXDIR)\utils\imatest\png
+WINPNGDIR = $(WXDIR)\src\png

 WINPNGINC = $(WINPNGDIR)
 WINPNGLIB = ..\..\lib\winpng.lib
 
 WINPNGINC = $(WINPNGDIR)
 WINPNGLIB = ..\..\lib\winpng.lib
 


@@ -33,19 +33,20 @@ PRECOMP=/YuWX.H
 
 !if "$(FINAL)" == "0"
 OPT = /Od
 
 !if "$(FINAL)" == "0"
 OPT = /Od

-CPPFLAGS= /AL /W4 /Gt4 /Zi $(ZOPTION) /G2sw $(OPT) /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch
-CFLAGS= /AL /W4 /Gt4 /Zi /G2sw /Od /Dwx_msw $(INC)
+CPPFLAGS= /AL /W4 /Gt4 /Zi $(ZOPTION) /G2sw $(OPT) /D__WXMSW__ $(INC)
+CFLAGS= /AL /W4 /Gt4 /Zi /G2sw /Od /D__WXMSW__ $(INC)

 LINKFLAGS=/NOD /CO /ONERROR:NOEXE
 !else
 # /Ox for real FINAL version
 OPT = /Ox
 LINKFLAGS=/NOD /CO /ONERROR:NOEXE
 !else
 # /Ox for real FINAL version
 OPT = /Ox

-CPPFLAGS= /AL /W4 /Gt4 /Zi /Os /G2sw $(OPT) /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch
-CFLAGS= /AL /W4 /Gt4 /Zi /Os /G2sw /Dwx_msw $(INC)
+CPPFLAGS= /AL /W4 /Gt4 /Zi /Os /G2sw $(OPT) /D__WXMSW__ $(INC)
+CFLAGS= /AL /W4 /Gt4 /Zi /Os /G2sw /D__WXMSW__ $(INC)

 LINKFLAGS=/NOD /ONERROR:NOEXE
 !endif
 
 LINKFLAGS=/NOD /ONERROR:NOEXE
 !endif
 

-OBJECTS = png.obj pngrcb.obj pngread.obj pngrtran.obj pngrutil.obj pngstub.obj \
- pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj
+OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \
+ pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj \
+ pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj

 
 all:    $(WINPNGLIB)
 
 
 all:    $(WINPNGLIB)
 

diff --git a/src/png/makefile.vc b/src/png/makefile.vc
index 9094b9ee13f4fefc0901858254a002c229e55762..b467d41b63128c6056d352b23e0805cfca4cdc93 100644 (file)
--- a/src/png/makefile.vc
+++ b/src/png/makefile.vc
@@ -31,14 +31,14 @@ PRECOMP=/YuWX.H
 
 !if "$(FINAL)" == "0"
 OPT = /Od
 
 !if "$(FINAL)" == "0"
 OPT = /Od

-CPPFLAGS= /W4 /Zi /MD /GX $(ZOPTION) $(OPT) /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch
-CFLAGS= /W4 /Zi /MD /GX /Od /Dwx_msw $(INC)
+CPPFLAGS= /W4 /Zi /MD /GX $(ZOPTION) $(OPT) /D__WXMSW__ $(INC)
+CFLAGS= /W4 /Zi /MD /GX /Od /D__WXMSW__ $(INC)

 LINKFLAGS=/NOD /CO /ONERROR:NOEXE
 !else
 # /Ox for real FINAL version
 OPT = /O2
 LINKFLAGS=/NOD /CO /ONERROR:NOEXE
 !else
 # /Ox for real FINAL version
 OPT = /O2

-CPPFLAGS= /W4 /MD /GX /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch
-CFLAGS= /W4 /MD /GX /Dwx_msw $(INC)
+CPPFLAGS= /W4 /MD /GX /D__WXMSW__ $(INC)
+CFLAGS= /W4 /MD /GX /D__WXMSW__ $(INC)

 LINKFLAGS=/NOD /ONERROR:NOEXE
 !endif
 
 LINKFLAGS=/NOD /ONERROR:NOEXE
 !endif
 

diff --git a/src/zlib/makefile.dos b/src/zlib/makefile.dos
new file mode 100644 (file)
index 0000000..a508948
--- /dev/null
+++ b/src/zlib/makefile.dos
@@ -0,0 +1,91 @@
+# Makefile for zlib
+# Borland C++   ************ UNTESTED ***********
+
+# To use, do "make -fmakefile.bor"
+
+# WARNING: the small model is supported but only for small values of
+# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
+# requirements (default 256K for big objects plus a few K), you can add
+# to CFLAGS below: -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# See zconf.h for details about the memory requirements.
+
+# ------------- Turbo C++, Borland C++ -------------
+CFLAGS=-O2 /MD # /GX
+CC=cl
+LD=cl
+LIB=tlib
+#   replace bcc with tcc for Turbo C++ 1.0
+LDFLAGS=$(MODEL)
+O=.obj
+
+LIBTARGET=..\..\lib\zlib.lib
+
+# variables
+OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
+  trees$(O) 
+OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
+  infutil$(O) inffast$(O) 
+
+all: $(LIBTARGET)
+
+adler32.obj: adler32.c zutil.h zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+compress.obj: compress.c zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+crc32.obj: crc32.c zutil.h zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+gzio.obj: gzio.c zutil.h zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
+   infcodes.h infutil.h
+       $(CC) -c $(CFLAGS) $*.c
+
+infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
+   infcodes.h inffast.h
+       $(CC) -c $(CFLAGS) $*.c
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
+       $(CC) -c $(CFLAGS) $*.c
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+       $(CC) -c $(CFLAGS) $*.c
+
+infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
+       $(CC) -c $(CFLAGS) $*.c
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+       $(CC) -c $(CFLAGS) $*.c
+
+trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+       $(CC) -c $(CFLAGS) $*.c
+
+LIBOBJECTS = $(OBJ1) $(OBJ2)
+
+$(LIBTARGET): $(OBJ1) $(OBJ2)
+        del $(LIBTARGET)
+           lib /PAGESIZE:128 @<<
+$(LIBTARGET)
+y
+$(OBJ1) $(OBJ2)
+nul
+;
+<<
+
+clean:
+    -erase *.obj
+    -erase *.exe
+    -erase *.sbr
+    -erase $(LIBTARGET)