X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d134d2d49f8f2f67f8d7afe6fc89368814dafa6b..f0492f7d97d77ec085e58d3f4a66c86508bc5f31:/src/msw/makefile.dos

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index b2810c50e9..15c7247844 100644
--- 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
 
+# 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
@@ -66,6 +70,7 @@ GENERICOBJS= \
   $(GENDIR)\statusbr.obj \
   $(GENDIR)\tabg.obj \
   $(GENDIR)\textdlgg.obj\
+  $(GENDIR)\prntdlgg.obj \
   $(GENDIR)\treectrl.obj
 
 # Don't need these generic objects for Windows
@@ -73,7 +78,6 @@ GENERICOBJS= \
 #  $(GENDIR)\fontdlgg.obj \
 #  $(GENDIR)\colrdlgg.obj \
 #  $(GENDIR)\printps.obj \
-#  $(GENDIR)\prntdlgg.obj \
 # $(GENDIR)\helpxlp.obj \
  
 COMMONOBJS = \
@@ -105,12 +109,14 @@ COMMONOBJS = \
   $(COMMDIR)\timercmn.obj \
   $(COMMDIR)\utilscmn.obj \
   $(COMMDIR)\validate.obj \
+  $(COMMDIR)\valgen.obj \
   $(COMMDIR)\valtext.obj \
   $(COMMDIR)\date.obj \
   $(COMMDIR)\wxexpr.obj \
   $(COMMDIR)\hash.obj \
   $(COMMDIR)\list.obj \
   $(COMMDIR)\variant.obj \
+  $(COMMDIR)\paper.obj \
   $(COMMDIR)\string.obj \
   $(COMMDIR)\time.obj \
   $(COMMDIR)\y_tab.obj \
@@ -120,7 +126,8 @@ COMMONOBJS = \
   $(COMMDIR)\zstream.obj \
   $(COMMDIR)\datstrm.obj \
   $(COMMDIR)\extended.obj \
-  $(COMMDIR)\wincmn.obj
+  $(COMMDIR)\wincmn.obj \
+  $(COMMDIR)\wxchar.obj
 
 # Doesn't compile (nested classes)
 # $(COMMDIR)\fileconf.obj\
@@ -206,6 +213,7 @@ MSWOBJS = \
 #  $(OLEDIR)\dataobj.obj \
 #  $(OLEDIR)\oleutils.obj \
 #  $(OLEDIR)\uuid.obj
+#  $(MSWDIR)\tooltip.obj \
 
 # TODO: Implement XPM and PNG targets in this makefile!
 #  $(OLEDIR)\xpmhand \
@@ -614,6 +622,11 @@ $(MSWDIR)/timer.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(MSWDIR)/tooltip.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(MSWDIR)/treectrl.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -827,6 +840,11 @@ $(COMMDIR)/validate.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/valgen.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/valtext.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -857,6 +875,11 @@ $(COMMDIR)/variant.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/paper.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/string.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -917,6 +940,11 @@ $(COMMDIR)/wincmn.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/wxchar.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c
         cl @<<
 $(CPPFLAGS2) -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ /I ..\common /c $*.c
@@ -1047,12 +1075,32 @@ $(OBJECTS):	$(WXDIR)/include/wx/setup.h
 # Peripheral components
 
 xpm:
-    cd $(WXDIR)\contrib\wxxpm
+    cd $(WXDIR)\src\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