oops, fixed typo breaking iconv constness detection in the previous commit

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

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index ef43abac920afebde7547dea58a1f76d0b630641..72bbd65a8d84ae4cb8b98f6bd2a85ec7989acb85 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 20:44, 2001/12/09
+# This file was automatically generated by tmake at 11:30, 2002/01/23
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -89,6 +89,7 @@ GENERICOBJS= accel.obj &
 COMMONOBJS = &
        y_tab.obj &
        appcmn.obj &
+       bmpbase.obj &
        choiccmn.obj &
        clipcmn.obj &
        clntdata.obj &
@@ -115,6 +116,7 @@ COMMONOBJS = &
        dseldlg.obj &
        dynarray.obj &
        dynlib.obj &
+       dynload.obj &
        effects.obj &
        encconv.obj &
        event.obj &
@@ -144,6 +146,7 @@ COMMONOBJS = &
        imagbmp.obj &
        image.obj &
        imaggif.obj &
+       imagiff.obj &
        imagjpeg.obj &
        imagpcx.obj &
        imagpng.obj &
@@ -165,7 +168,6 @@ COMMONOBJS = &
        mstream.obj &
        nbkbase.obj &
        object.obj &
-       objstrm.obj &
        odbc.obj &
        paper.obj &
        popupcmn.obj &
@@ -180,7 +182,6 @@ COMMONOBJS = &
        sckfile.obj &
        sckipc.obj &
        sckstrm.obj &
-       serbase.obj &
        sizer.obj &
        socket.obj &
        statbar.obj &
@@ -210,8 +211,7 @@ COMMONOBJS = &
        wxexpr.obj &
        xpmdecod.obj &
        zipstrm.obj &
-       zstream.obj &
-       bmpbase.obj
+       zstream.obj
 
 MGLOBJS = app.obj &
        bitmap.obj &
@@ -224,7 +224,7 @@ MGLOBJS = app.obj &
        dcclient.obj &
        dcmemory.obj &
        dcscreen.obj &
-       dir.obj &
+       dirmgl.obj &
        evtloop.obj &
        font.obj &
        fontenum.obj &
@@ -295,13 +295,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
@@ -350,7 +360,7 @@ dcmemory.obj:     $(MGLDIR)\dcmemory.cpp
 dcscreen.obj:     $(MGLDIR)\dcscreen.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dir.obj:     $(MGLDIR)\dir.cpp
+dirmgl.obj:     $(MGLDIR)\dirmgl.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 evtloop.obj:     $(MGLDIR)\evtloop.cpp
@@ -515,6 +525,9 @@ win32.obj:     $(UNIVTHEMEDIR)\win32.cpp
 appcmn.obj:     $(COMMDIR)\appcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+bmpbase.obj:     $(COMMDIR)\bmpbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 choiccmn.obj:     $(COMMDIR)\choiccmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -593,6 +606,9 @@ dynarray.obj:     $(COMMDIR)\dynarray.cpp
 dynlib.obj:     $(COMMDIR)\dynlib.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dynload.obj:     $(COMMDIR)\dynload.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 effects.obj:     $(COMMDIR)\effects.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -680,6 +696,9 @@ image.obj:     $(COMMDIR)\image.cpp
 imaggif.obj:     $(COMMDIR)\imaggif.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imagiff.obj:     $(COMMDIR)\imagiff.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 imagjpeg.obj:     $(COMMDIR)\imagjpeg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -743,9 +762,6 @@ nbkbase.obj:     $(COMMDIR)\nbkbase.cpp
 object.obj:     $(COMMDIR)\object.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-objstrm.obj:     $(COMMDIR)\objstrm.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 odbc.obj:     $(COMMDIR)\odbc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -788,9 +804,6 @@ sckipc.obj:     $(COMMDIR)\sckipc.cpp
 sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-serbase.obj:     $(COMMDIR)\serbase.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 sizer.obj:     $(COMMDIR)\sizer.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -881,9 +894,6 @@ zipstrm.obj:     $(COMMDIR)\zipstrm.cpp
 zstream.obj:     $(COMMDIR)\zstream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-bmpbase.obj:     $(COMMDIR)\bmpbase.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 
 
 y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
@@ -1096,6 +1106,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) $<