Corrected spelling of 'unrecognized'

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

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 97fec5e99fa52d185ba3ea4c91c2874f1c646a28..fbcde4675ff18984e3a8a6f1f26b35cd3c8a642b 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


@@ -58,6 +62,7 @@ GENERICOBJS= \
   $(GENDIR)\listctrl.obj \
   $(GENDIR)\notebook.obj \
   $(GENDIR)\panelg.obj \
   $(GENDIR)\listctrl.obj \
   $(GENDIR)\notebook.obj \
   $(GENDIR)\panelg.obj \

+  $(GENDIR)\progdlgg.obj \

   $(GENDIR)\prop.obj \
   $(GENDIR)\propform.obj \
   $(GENDIR)\proplist.obj \
   $(GENDIR)\prop.obj \
   $(GENDIR)\propform.obj \
   $(GENDIR)\proplist.obj \


@@ -66,6 +71,7 @@ GENERICOBJS= \
   $(GENDIR)\statusbr.obj \
   $(GENDIR)\tabg.obj \
   $(GENDIR)\textdlgg.obj\
   $(GENDIR)\statusbr.obj \
   $(GENDIR)\tabg.obj \
   $(GENDIR)\textdlgg.obj\

+  $(GENDIR)\prntdlgg.obj \

   $(GENDIR)\treectrl.obj
 
 # Don't need these generic objects for Windows
   $(GENDIR)\treectrl.obj
 
 # Don't need these generic objects for Windows


@@ -73,7 +79,6 @@ GENERICOBJS= \
 #  $(GENDIR)\fontdlgg.obj \
 #  $(GENDIR)\colrdlgg.obj \
 #  $(GENDIR)\printps.obj \
 #  $(GENDIR)\fontdlgg.obj \
 #  $(GENDIR)\colrdlgg.obj \
 #  $(GENDIR)\printps.obj \

-#  $(GENDIR)\prntdlgg.obj \

 # $(GENDIR)\helpxlp.obj \
  
 COMMONOBJS = \
 # $(GENDIR)\helpxlp.obj \
  
 COMMONOBJS = \


@@ -112,6 +117,7 @@ COMMONOBJS = \
   $(COMMDIR)\hash.obj \
   $(COMMDIR)\list.obj \
   $(COMMDIR)\variant.obj \
   $(COMMDIR)\hash.obj \
   $(COMMDIR)\list.obj \
   $(COMMDIR)\variant.obj \

+  $(COMMDIR)\paper.obj \

   $(COMMDIR)\string.obj \
   $(COMMDIR)\time.obj \
   $(COMMDIR)\y_tab.obj \
   $(COMMDIR)\string.obj \
   $(COMMDIR)\time.obj \
   $(COMMDIR)\y_tab.obj \


@@ -121,7 +127,8 @@ COMMONOBJS = \
   $(COMMDIR)\zstream.obj \
   $(COMMDIR)\datstrm.obj \
   $(COMMDIR)\extended.obj \
   $(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\
 
 # Doesn't compile (nested classes)
 # $(COMMDIR)\fileconf.obj\


@@ -141,6 +148,7 @@ MSWOBJS = \
   $(MSWDIR)\button.obj \
   $(MSWDIR)\checkbox.obj \
   $(MSWDIR)\checklst.obj \
   $(MSWDIR)\button.obj \
   $(MSWDIR)\checkbox.obj \
   $(MSWDIR)\checklst.obj \

+  $(MSWDIR)\caret.obj \

   $(MSWDIR)\choice.obj \
   $(MSWDIR)\clipbrd.obj \
   $(MSWDIR)\colordlg.obj \
   $(MSWDIR)\choice.obj \
   $(MSWDIR)\clipbrd.obj \
   $(MSWDIR)\colordlg.obj \


@@ -311,6 +319,11 @@ $(MSWDIR)/button.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 

+$(MSWDIR)/caret.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+

 $(MSWDIR)/choice.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 $(MSWDIR)/choice.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)


@@ -869,6 +882,11 @@ $(COMMDIR)/variant.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(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)
 $(COMMDIR)/string.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)


@@ -929,6 +947,11 @@ $(COMMDIR)/wincmn.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(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
 $(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c
         cl @<<
 $(CPPFLAGS2) -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ /I ..\common /c $*.c


@@ -1009,6 +1032,11 @@ $(GENDIR)/prntdlgg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 

+$(GENDIR)/progdlgg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+

 $(GENDIR)/prop.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 $(GENDIR)/prop.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)


@@ -1059,12 +1087,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