wxTipWindow added and is now used by wxSimpleHelpProvider

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

diff --git a/distrib/msw/tmake/dos.t b/distrib/msw/tmake/dos.t
index 592ab83d3ef43778a12bfb8e0feb7b6025261000..8cb5b66e3100b35fd152c4e167b13170e1ed615b 100644 (file)
--- a/distrib/msw/tmake/dos.t
+++ b/distrib/msw/tmake/dos.t
@@ -14,7 +14,7 @@
     #! now transform these hashes into $project tags
     foreach $file (sort keys %wxGeneric) {
         if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) {
     #! now transform these hashes into $project tags
     foreach $file (sort keys %wxGeneric) {
         if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) {

-            #! this file for some reason wasn't compiled for VC++ 1.52
+            #! Need this file too since it has wxGenericPageSetupDialog

             next unless $file =~ /^prntdlgg\./;
         }
 
             next unless $file =~ /^prntdlgg\./;
         }
 


@@ -78,7 +78,7 @@ DUMMYOBJ=dummy.obj
 # This one overrides the others, to be consistent with the settings in wx_setup.h
 MINIMAL_WXWINDOWS_SETUP=0
 
 # This one overrides the others, to be consistent with the settings in wx_setup.h
 MINIMAL_WXWINDOWS_SETUP=0
 

-USE_XPM_IN_MSW=0
+USE_XPM_IN_MSW=1

 USE_CTL3D=1
 
 !if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"
 USE_CTL3D=1
 
 !if "$(MINIMAL_WXWINDOWS_SETUP)" == "1"


@@ -95,7 +95,7 @@ PERIPH_CLEAN_TARGET=
 # !endif
 
 !if "$(USE_XPM_IN_MSW)" == "1"
 # !endif
 
 !if "$(USE_XPM_IN_MSW)" == "1"

-PERIPH_LIBS=$(WXDIR)\contrib\wxxpm\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


@@ -235,6 +235,8 @@ $(OBJECTS): $(WXDIR)/include/wx/setup.h
 
 # Peripheral components
 
 
 # Peripheral components
 

+$(WXDIR)\lib\xpm.lib: xpm
+

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