1. fixes to wxDC deleting logic (should fix ~wxPrinterDC leak), some code

[wxWidgets.git] / distrib / msw / tmake / b32.t

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index c81b74c2f7201ad1cfce6afb339826cf0e3dac1b..37f85b10dcb2b987164887e8e5a21ac3eafa055a 100644 (file)
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -39,11 +39,12 @@
     foreach $file (sort keys %wxMSW) {
         next if $wxMSW{$file} =~ /\b16\b/;
 
     foreach $file (sort keys %wxMSW) {
         next if $wxMSW{$file} =~ /\b16\b/;
 

-        if ( $file =~ /^automtn/ ) {
-            #! comment in old makefile.b32 seems to imply that this file can't
-            #! be compiled with Borland (leads to crash in oleauto sample)
-            next;
-        }
+#!        if ( $file =~ /^automtn/ ) {
+#!            #! comment in old makefile.b32 seems to imply that this file can not
+#!            #! be compiled with Borland (leads to crash in oleauto sample)
+#!            No longer true, at least for BC++ 5.2
+#!            next;
+#!        }

 
         $isCFile = $file =~ /\.c$/;
 
 
         $isCFile = $file =~ /\.c$/;
 


@@ -97,7 +98,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
 # 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=
 
 PERIPH_LIBS=
 PERIPH_TARGET=


@@ -111,21 +112,21 @@ PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
 !endif
 
 !if "$(USE_XPM_IN_MSW)" == "1"
 !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_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_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
 
 !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)
 !endif
 
 LIBTARGET=$(WXLIB)


@@ -171,7 +172,7 @@ all:        all_libs all_execs
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         -erase $(LIBTARGET)
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         -erase $(LIBTARGET)

-       tlib $(LIBTARGET) /P1024 @&&!
+       tlib "$(LIBTARGET)" /P1024 @&&!

 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 
 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !
 


@@ -180,7 +181,7 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
        -erase $(LIBTARGET)
        -erase $(WXLIBDIR)\wx.dll
 $(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
 c0d32.obj $(OBJECTS)
 $(WXLIBDIR)\wx
 nul


@@ -320,8 +321,29 @@ clean_jpeg:
         make -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
         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 &&!
 $(CFG): makefile.b32
        copy &&!

+-Hc

 -H=$(WXDIR)\src\msw\wx32.csm
 -3
 -d
 -H=$(WXDIR)\src\msw\wx32.csm
 -3
 -d


@@ -337,7 +359,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
 
 -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__
 -D__WXWIN__
 -D__WXMSW__
 -D__WINDOWS__


@@ -347,11 +369,11 @@ $(DEBUG_FLAGS)
 $(WIN95FLAG)
 ! $(CFG)
 
 $(WIN95FLAG)
 ! $(CFG)
 

-#-I$(WXDIR)\src\common\wxxpm\libxpm.34b\lib
-# -Oxt
-

 clean: $(PERIPH_CLEAN_TARGET)
     -erase $(LIBTARGET)
 clean: $(PERIPH_CLEAN_TARGET)
     -erase $(LIBTARGET)

+    -erase $(WXLIBDIR)\wx.dll
+    -erase $(WXLIBDIR)\wx.tds
+    -erase $(WXLIBDIR)\wx.il?

     -erase *.obj
     -erase *.pch
     -erase *.csm
     -erase *.obj
     -erase *.pch
     -erase *.csm