added Append(wxArrayString) to wxItemContainer (and so to wxChoice, wxComboBox, wxLis...

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

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index 1c6346aac205ac8fb424097d091791306b04f9c4..faaf8da49317d9febe13470557e4e6475065fec4 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 11:19, 2001/12/15
+# This file was automatically generated by tmake at 11:57, 2002/01/17
 # 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 &
@@ -145,6 +146,7 @@ COMMONOBJS = &
        imagbmp.obj &
        image.obj &
        imaggif.obj &
+       imagiff.obj &
        imagjpeg.obj &
        imagpcx.obj &
        imagpng.obj &
@@ -209,8 +211,7 @@ COMMONOBJS = &
        wxexpr.obj &
        xpmdecod.obj &
        zipstrm.obj &
-       zstream.obj &
-       bmpbase.obj
+       zstream.obj
 
 MGLOBJS = app.obj &
        bitmap.obj &
@@ -223,7 +224,7 @@ MGLOBJS = app.obj &
        dcclient.obj &
        dcmemory.obj &
        dcscreen.obj &
-       dir.obj &
+       dirmgl.obj &
        evtloop.obj &
        font.obj &
        fontenum.obj &
@@ -300,7 +301,16 @@ HTMLOBJS = helpctrl.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
@@ -349,7 +359,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
@@ -514,6 +524,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) $<
 
@@ -682,6 +695,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) $<
 
@@ -877,9 +893,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