Added chapter on collection and container classes to contents

[wxWidgets.git] / src / msw / makefile.b32

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 62c3bde3d22e1b9ba01d92fc50cbe4930ffdacd1..7e6c0405eaa04ba368f48d6604f5efef70319956 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 14:31, 2000/01/19
+# This file was automatically generated by tmake at 15:57, 2000/08/04
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -37,7 +37,7 @@ WXBUILDDLL=1
 # Please set these according to the settings in wx_setup.h, so we can include
 # the appropriate libraries in wx.lib
 USE_CTL3D=0
-USE_XPM_IN_MSW=0
+USE_XPM_IN_MSW=1
 
 PERIPH_LIBS=
 PERIPH_TARGET=
@@ -51,21 +51,21 @@ PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
 !endif
 
 !if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXLIB)\xpm.lib $(PERIPH_LIBS)
+PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
 PERIPH_TARGET=xpm $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif
 
-#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(PERIPH_LIBS)
+#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
 PERIPH_LIBS=
-PERIPH_TARGET=zlib png jpeg $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg $(PERIPH_CLEAN_TARGET)
+PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET)
 
 !if "$(DLL)" == "0"
 DUMMY=dummy
 !else
 DUMMY=dummydll
-LIBS= cw32 import32 ole2w32
+LIBS= cw32mti import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff
 !endif
 
 LIBTARGET=$(WXLIB)
@@ -81,7 +81,10 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\calctrl.obj \
                $(MSWDIR)\choicdgg.obj \
+               $(MSWDIR)\dirctrlg.obj \
+               $(MSWDIR)\dragimgg.obj \
                $(MSWDIR)\grid.obj \
+               $(MSWDIR)\gridsel.obj \
                $(MSWDIR)\laywin.obj \
                $(MSWDIR)\logg.obj \
                $(MSWDIR)\numdlgg.obj \
@@ -93,11 +96,15 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\proplist.obj \
                $(MSWDIR)\sashwin.obj \
                $(MSWDIR)\scrolwin.obj \
+               $(MSWDIR)\splash.obj \
                $(MSWDIR)\splitter.obj \
                $(MSWDIR)\statusbr.obj \
+               $(MSWDIR)\tabg.obj \
                $(MSWDIR)\tbarsmpl.obj \
                $(MSWDIR)\textdlgg.obj \
                $(MSWDIR)\tipdlg.obj \
+               $(MSWDIR)\treectlg.obj \
+               $(MSWDIR)\treelay.obj \
                $(MSWDIR)\wizard.obj
 
 # Not needed:
@@ -127,11 +134,13 @@ COMMONOBJS = \
                $(MSWDIR)\dbtable.obj \
                $(MSWDIR)\dcbase.obj \
                $(MSWDIR)\dlgcmn.obj \
+               $(MSWDIR)\dndcmn.obj \
                $(MSWDIR)\dobjcmn.obj \
                $(MSWDIR)\docmdi.obj \
                $(MSWDIR)\docview.obj \
                $(MSWDIR)\dynarray.obj \
                $(MSWDIR)\dynlib.obj \
+               $(MSWDIR)\effects.obj \
                $(MSWDIR)\encconv.obj \
                $(MSWDIR)\event.obj \
                $(MSWDIR)\extended.obj \
@@ -144,9 +153,11 @@ COMMONOBJS = \
                $(MSWDIR)\fontmap.obj \
                $(MSWDIR)\framecmn.obj \
                $(MSWDIR)\fs_inet.obj \
+               $(MSWDIR)\fs_mem.obj \
                $(MSWDIR)\fs_zip.obj \
                $(MSWDIR)\ftp.obj \
                $(MSWDIR)\gdicmn.obj \
+               $(MSWDIR)\geometry.obj \
                $(MSWDIR)\gifdecod.obj \
                $(MSWDIR)\hash.obj \
                $(MSWDIR)\helpbase.obj \
@@ -179,6 +190,7 @@ COMMONOBJS = \
                $(MSWDIR)\prntbase.obj \
                $(MSWDIR)\process.obj \
                $(MSWDIR)\protocol.obj \
+               $(MSWDIR)\quantize.obj \
                $(MSWDIR)\resource.obj \
                $(MSWDIR)\sckaddr.obj \
                $(MSWDIR)\sckfile.obj \
@@ -195,6 +207,7 @@ COMMONOBJS = \
                $(MSWDIR)\textfile.obj \
                $(MSWDIR)\timercmn.obj \
                $(MSWDIR)\tokenzr.obj \
+               $(MSWDIR)\treebase.obj \
                $(MSWDIR)\txtstrm.obj \
                $(MSWDIR)\unzip.obj \
                $(MSWDIR)\url.obj \
@@ -212,6 +225,7 @@ COMMONOBJS = \
 
 MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\app.obj \
+               $(MSWDIR)\automtn.obj \
                $(MSWDIR)\bitmap.obj \
                $(MSWDIR)\bmpbuttn.obj \
                $(MSWDIR)\brush.obj \
@@ -254,7 +268,10 @@ MSWOBJS = $(MSWDIR)\accel.obj \
                $(MSWDIR)\gauge95.obj \
                $(MSWDIR)\gdiimage.obj \
                $(MSWDIR)\gdiobj.obj \
+               $(MSWDIR)\glcanvas.obj \
                $(MSWDIR)\gsocket.obj \
+               $(MSWDIR)\gsockmsw.obj \
+               $(MSWDIR)\helpchm.obj \
                $(MSWDIR)\helpwin.obj \
                $(MSWDIR)\icon.obj \
                $(MSWDIR)\imaglist.obj \
@@ -350,7 +367,7 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
        -erase $(LIBTARGET)
        -erase $(WXLIBDIR)\wx.dll
-        tlink32 $(LINK_FLAGS) /v @&&!
+        $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&!
 c0d32.obj $(OBJECTS)
 $(WXLIBDIR)\wx
 nul
@@ -382,6 +399,8 @@ $(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF)
 
 $(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
 
+$(MSWDIR)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
+
 $(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
 
 $(MSWDIR)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF)
@@ -466,8 +485,14 @@ $(MSWDIR)\gdiimage.obj: $(MSWDIR)\gdiimage.$(SRCSUFF)
 
 $(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
 
+$(MSWDIR)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF)
+
 $(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
 
+$(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c
+
+$(MSWDIR)\helpchm.obj: $(MSWDIR)\helpchm.$(SRCSUFF)
+
 $(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 
 $(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
@@ -605,6 +630,8 @@ $(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)
 
 $(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)
 
+$(MSWDIR)\dndcmn.obj: $(COMMDIR)\dndcmn.$(SRCSUFF)
+
 $(MSWDIR)\dobjcmn.obj: $(COMMDIR)\dobjcmn.$(SRCSUFF)
 
 $(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
@@ -615,6 +642,8 @@ $(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
 
 $(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)
 
+$(MSWDIR)\effects.obj: $(COMMDIR)\effects.$(SRCSUFF)
+
 $(MSWDIR)\encconv.obj: $(COMMDIR)\encconv.$(SRCSUFF)
 
 $(MSWDIR)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
@@ -639,12 +668,16 @@ $(MSWDIR)\framecmn.obj: $(COMMDIR)\framecmn.$(SRCSUFF)
 
 $(MSWDIR)\fs_inet.obj: $(COMMDIR)\fs_inet.$(SRCSUFF)
 
+$(MSWDIR)\fs_mem.obj: $(COMMDIR)\fs_mem.$(SRCSUFF)
+
 $(MSWDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF)
 
 $(MSWDIR)\ftp.obj: $(COMMDIR)\ftp.$(SRCSUFF)
 
 $(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
 
+$(MSWDIR)\geometry.obj: $(COMMDIR)\geometry.$(SRCSUFF)
+
 $(MSWDIR)\gifdecod.obj: $(COMMDIR)\gifdecod.$(SRCSUFF)
 
 $(MSWDIR)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF)
@@ -709,6 +742,8 @@ $(MSWDIR)\process.obj: $(COMMDIR)\process.$(SRCSUFF)
 
 $(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
 
+$(MSWDIR)\quantize.obj: $(COMMDIR)\quantize.$(SRCSUFF)
+
 $(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
 
 $(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF)
@@ -741,6 +776,8 @@ $(MSWDIR)\timercmn.obj: $(COMMDIR)\timercmn.$(SRCSUFF)
 
 $(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF)
 
+$(MSWDIR)\treebase.obj: $(COMMDIR)\treebase.$(SRCSUFF)
+
 $(MSWDIR)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF)
 
 $(MSWDIR)\unzip.obj: $(COMMDIR)\unzip.c
@@ -781,8 +818,14 @@ $(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
 
 $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
+$(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF)
+
+$(MSWDIR)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF)
+
 $(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
 
+$(MSWDIR)\gridsel.obj: $(GENDIR)\gridsel.$(SRCSUFF)
+
 $(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
 
 $(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
@@ -805,16 +848,24 @@ $(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
 
 $(MSWDIR)\scrolwin.obj: $(GENDIR)\scrolwin.$(SRCSUFF)
 
+$(MSWDIR)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)
+
 $(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
 
 $(MSWDIR)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF)
 
+$(MSWDIR)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF)
+
 $(MSWDIR)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF)
 
 $(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)
 
 $(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF)
 
+$(MSWDIR)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF)
+
+$(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF)
+
 $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF)
 
 
@@ -920,8 +971,29 @@ clean_jpeg:
         make -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
+xpm:    $(CFG)
+        cd $(WXDIR)\src\xpm
+        make -f makefile.b32 lib
+        cd $(WXDIR)\src\msw
+
+clean_xpm:
+        cd $(WXDIR)\src\xpm
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw
+
+tiff:   $(CFG)
+        cd $(WXDIR)\src\tiff
+        make -f makefile.b32 lib
+        cd $(WXDIR)\src\msw
+
+clean_tiff:
+        cd $(WXDIR)\src\tiff
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw
+
 $(CFG): makefile.b32
        copy &&!
+-Hc
 -H=$(WXDIR)\src\msw\wx32.csm
 -3
 -d
@@ -937,7 +1009,7 @@ $(CFG): makefile.b32
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
 -I$(WXDIR)\include\wx\msw\gnuwin32
 
--L$(BCCDIR)\lib
+-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
 -D__WXWIN__
 -D__WXMSW__
 -D__WINDOWS__
@@ -947,11 +1019,11 @@ $(DEBUG_FLAGS)
 $(WIN95FLAG)
 ! $(CFG)
 
-#-I$(WXDIR)\src\common\wxxpm\libxpm.34b\lib
-# -Oxt
-
 clean: $(PERIPH_CLEAN_TARGET)
     -erase $(LIBTARGET)
+    -erase $(WXLIBDIR)\wx.dll
+    -erase $(WXLIBDIR)\wx.tds
+    -erase $(WXLIBDIR)\wx.il?
     -erase *.obj
     -erase *.pch
     -erase *.csm