Added $(NEW_WXLIBNAME) to allow changing the library or DLL name

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

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 07528f8dad27bd3cff653dc80b2ae24482fe40be..15c72478441a99d94ed22b55a389c57edaf846de 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


@@ -66,6 +70,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 +78,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 = \


@@ -105,12 +109,14 @@ COMMONOBJS = \
   $(COMMDIR)\timercmn.obj \
   $(COMMDIR)\utilscmn.obj \
   $(COMMDIR)\validate.obj \
   $(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)\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 \
   $(COMMDIR)\string.obj \
   $(COMMDIR)\time.obj \
   $(COMMDIR)\y_tab.obj \


@@ -120,17 +126,18 @@ 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\
 

+# Uses WIN32 registry functions
+#  $(COMMDIR)\mimetype.obj \
+

 # Fails when including png.h, on jmp_buf.
 #  $(COMMDIR)\image.obj \
 
 # Fails when including png.h, on jmp_buf.
 #  $(COMMDIR)\image.obj \
 

-# Don't need this
-# $(COMMDIR)\postscrp.obj \
- 

 MSWOBJS = \
   $(MSWDIR)\accel.obj \
   $(MSWDIR)\app.obj \
 MSWOBJS = \
   $(MSWDIR)\accel.obj \
   $(MSWDIR)\app.obj \


@@ -206,6 +213,11 @@ MSWOBJS = \
 #  $(OLEDIR)\dataobj.obj \
 #  $(OLEDIR)\oleutils.obj \
 #  $(OLEDIR)\uuid.obj
 #  $(OLEDIR)\dataobj.obj \
 #  $(OLEDIR)\oleutils.obj \
 #  $(OLEDIR)\uuid.obj

+#  $(MSWDIR)\tooltip.obj \
+
+# TODO: Implement XPM and PNG targets in this makefile!
+#  $(OLEDIR)\xpmhand \
+#  $(OLEDIR)\pnghand \

 
 # Not appropriate for 16-bit Windows
 #  $(MSWDIR)\registry.obj \
 
 # Not appropriate for 16-bit Windows
 #  $(MSWDIR)\registry.obj \


@@ -610,6 +622,11 @@ $(MSWDIR)/timer.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(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)
 $(MSWDIR)/treectrl.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)


@@ -758,22 +775,22 @@ $(COMMDIR)/memory.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 

-$(COMMDIR)/module.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/mimetype.obj:     $*.$(SRCSUFF)

         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 

-$(COMMDIR)/object.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/module.obj:     $*.$(SRCSUFF)

         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 

-$(COMMDIR)/odbc.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/object.obj:     $*.$(SRCSUFF)

         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 

-$(COMMDIR)/postscrp.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/odbc.obj:     $*.$(SRCSUFF)

         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<


@@ -823,6 +840,11 @@ $(COMMDIR)/validate.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(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)
 $(COMMDIR)/valtext.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)


@@ -853,6 +875,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)


@@ -913,6 +940,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


@@ -1043,12 +1075,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