Commiting remaining files of configure change for X11.

[wxWidgets.git] / src / mgl / makefile.wat

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index 6f0a6912edf3b2a63091566481c569670373522f..40f1caf6c499f726eedd2db7a1664c47e6ac14e7 100644 (file)
--- a/src/mgl/makefile.wat
+++ b/src/mgl/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 16:57, 2002/01/15
+# This file was automatically generated by tmake 
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -140,9 +140,9 @@ COMMONOBJS = &
        geometry.obj &
        gifdecod.obj &
        hash.obj &
+       hashmap.obj &
        helpbase.obj &
        http.obj &
-       iffdecod.obj &
        imagall.obj &
        imagbmp.obj &
        image.obj &
@@ -296,13 +296,23 @@ HTMLOBJS = helpctrl.obj &
        m_list.obj &
        m_meta.obj &
        m_pre.obj &
+       m_style.obj &
        m_tables.obj &
        winpars.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MGLOBJS) $(UNIVOBJS) $(UNIVTHEMEOBJS) $(HTMLOBJS)
 
-all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
+
+all:        $(SETUP_H) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
+
+$(ARCHINCDIR)\wx:
+    mkdir $(ARCHINCDIR)
+    mkdir $(ARCHINCDIR)\wx
+
+$(SETUP_H): $(WXDIR)\include\wx\mgl\setup.h $(ARCHINCDIR)\wx
+    copy $(WXDIR)\include\wx\mgl\setup.h $@
 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc
@@ -669,13 +679,13 @@ gifdecod.obj:     $(COMMDIR)\gifdecod.cpp
 hash.obj:     $(COMMDIR)\hash.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-helpbase.obj:     $(COMMDIR)\helpbase.cpp
+hashmap.obj:     $(COMMDIR)\hashmap.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-http.obj:     $(COMMDIR)\http.cpp
+helpbase.obj:     $(COMMDIR)\helpbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-iffdecod.obj:     $(COMMDIR)\iffdecod.cpp
+http.obj:     $(COMMDIR)\http.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 imagall.obj:     $(COMMDIR)\imagall.cpp
@@ -1100,6 +1110,9 @@ m_meta.obj:     $(HTMLDIR)\m_meta.cpp
 m_pre.obj:     $(HTMLDIR)\m_pre.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+m_style.obj:     $(HTMLDIR)\m_style.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 m_tables.obj:     $(HTMLDIR)\m_tables.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<