Changed order of #ifdefs to get native version on OS/2, even if

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

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 21d2e49c6c609f2cc414866ceab4e34f57b3bf52..62abd23ccfc485c51d2c07cd522499b1962832fb 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 02:45, 1999/12/21
+# This file was automatically generated by tmake at 14:31, 2000/01/19
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -40,12 +40,14 @@ OLEDIR=$(MSWDIR)\ole
 DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= busyinfo.obj &
+       calctrl.obj &
        choicdgg.obj &
        grid.obj &
        laywin.obj &
        logg.obj &
        numdlgg.obj &
        panelg.obj &
+       plot.obj &
        progdlgg.obj &
        prop.obj &
        propform.obj &
@@ -86,6 +88,7 @@ COMMONOBJS = &
        appcmn.obj &
        choiccmn.obj &
        clipcmn.obj &
+       cmdline.obj &
        cmndata.obj &
        config.obj &
        ctrlcmn.obj &
@@ -101,6 +104,7 @@ COMMONOBJS = &
        docview.obj &
        dynarray.obj &
        dynlib.obj &
+       encconv.obj &
        event.obj &
        extended.obj &
        ffile.obj &
@@ -136,7 +140,7 @@ COMMONOBJS = &
        longlong.obj &
        memory.obj &
        menucmn.obj &
-       mimetype.obj &
+       mimecmn.obj &
        module.obj &
        mstream.obj &
        object.obj &
@@ -212,6 +216,7 @@ MSWOBJS = accel.obj &
        dragimag.obj &
        dropsrc.obj &
        droptgt.obj &
+       enhmeta.obj &
        filedlg.obj &
        font.obj &
        fontdlg.obj &
@@ -235,6 +240,7 @@ MSWOBJS = accel.obj &
        menu.obj &
        menuitem.obj &
        metafile.obj &
+       mimetype.obj &
        minifram.obj &
        msgdlg.obj &
        nativdlg.obj &
@@ -408,6 +414,9 @@ dropsrc.obj:     $(OLEDIR)\dropsrc.cpp
 droptgt.obj:     $(OLEDIR)\droptgt.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+enhmeta.obj:     $(MSWDIR)\enhmeta.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 filedlg.obj:     $(MSWDIR)\filedlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -477,6 +486,9 @@ menuitem.obj:     $(MSWDIR)\menuitem.cpp
 metafile.obj:     $(MSWDIR)\metafile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+mimetype.obj:     $(MSWDIR)\mimetype.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 minifram.obj:     $(MSWDIR)\minifram.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -617,6 +629,9 @@ choiccmn.obj:     $(COMMDIR)\choiccmn.cpp
 clipcmn.obj:     $(COMMDIR)\clipcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+cmdline.obj:     $(COMMDIR)\cmdline.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 cmndata.obj:     $(COMMDIR)\cmndata.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -662,6 +677,9 @@ dynarray.obj:     $(COMMDIR)\dynarray.cpp
 dynlib.obj:     $(COMMDIR)\dynlib.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+encconv.obj:     $(COMMDIR)\encconv.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 event.obj:     $(COMMDIR)\event.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -767,7 +785,7 @@ memory.obj:     $(COMMDIR)\memory.cpp
 menucmn.obj:     $(COMMDIR)\menucmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-mimetype.obj:     $(COMMDIR)\mimetype.cpp
+mimecmn.obj:     $(COMMDIR)\mimecmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 module.obj:     $(COMMDIR)\module.cpp
@@ -907,6 +925,9 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
 busyinfo.obj:     $(GENDIR)\busyinfo.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+calctrl.obj:     $(GENDIR)\calctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -925,6 +946,9 @@ numdlgg.obj:     $(GENDIR)\numdlgg.cpp
 panelg.obj:     $(GENDIR)\panelg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+plot.obj:     $(GENDIR)\plot.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 progdlgg.obj:     $(GENDIR)\progdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<