fixed paper size calculation (convert from 10ths of mm to mm correctly)

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

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index 40f1caf6c499f726eedd2db7a1664c47e6ac14e7..3571e590eab02f716bd8a5fe82a2cfe5a5172c26 100644 (file)
--- a/src/mgl/makefile.wat
+++ b/src/mgl/makefile.wat
@@ -46,6 +46,7 @@ GENERICOBJS= accel.obj &
        caret.obj &
        choicdgg.obj &
        colrdlgg.obj &
+       dcbuffer.obj &
        dcpsg.obj &
        dirctrlg.obj &
        dirdlgg.obj &
@@ -58,7 +59,6 @@ GENERICOBJS= accel.obj &
        gridsel.obj &
        helpext.obj &
        helphtml.obj &
-       helpwxht.obj &
        imaglist.obj &
        laywin.obj &
        listctrl.obj &
@@ -80,6 +80,7 @@ GENERICOBJS= accel.obj &
        tabg.obj &
        tbarsmpl.obj &
        textdlgg.obj &
+       timer.obj &
        tipdlg.obj &
        tipwin.obj &
        treectlg.obj &
@@ -89,6 +90,8 @@ GENERICOBJS= accel.obj &
 COMMONOBJS = &
        y_tab.obj &
        appcmn.obj &
+       artprov.obj &
+       artstd.obj &
        bmpbase.obj &
        choiccmn.obj &
        clipcmn.obj &
@@ -143,6 +146,7 @@ COMMONOBJS = &
        hashmap.obj &
        helpbase.obj &
        http.obj &
+       iconbndl.obj &
        imagall.obj &
        imagbmp.obj &
        image.obj &
@@ -236,7 +240,6 @@ MGLOBJS = app.obj &
        pen.obj &
        region.obj &
        settings.obj &
-       timer.obj &
        toplevel.obj &
        utils.obj &
        window.obj
@@ -272,6 +275,7 @@ UNIVOBJS = bmpbuttn.obj &
        statusbr.obj &
        textctrl.obj &
        theme.obj &
+       toolbar.obj &
        topluniv.obj &
        winuniv.obj
 
@@ -311,8 +315,8 @@ $(ARCHINCDIR)\wx:
     mkdir $(ARCHINCDIR)
     mkdir $(ARCHINCDIR)\wx
 
-$(SETUP_H): $(WXDIR)\include\wx\mgl\setup.h $(ARCHINCDIR)\wx
-    copy $(WXDIR)\include\wx\mgl\setup.h $@
+$(SETUP_H): $(WXDIR)\include\wx\univ\setup.h $(ARCHINCDIR)\wx
+    copy $(WXDIR)\include\wx\univ\setup.h $@
 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc
@@ -394,9 +398,6 @@ region.obj:     $(MGLDIR)\region.cpp
 settings.obj:     $(MGLDIR)\settings.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-timer.obj:     $(MGLDIR)\timer.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 toplevel.obj:     $(MGLDIR)\toplevel.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -504,6 +505,9 @@ textctrl.obj:     $(UNIVDIR)\textctrl.cpp
 theme.obj:     $(UNIVDIR)\theme.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+toolbar.obj:     $(UNIVDIR)\toolbar.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 topluniv.obj:     $(UNIVDIR)\topluniv.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -526,6 +530,12 @@ win32.obj:     $(UNIVTHEMEDIR)\win32.cpp
 appcmn.obj:     $(COMMDIR)\appcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+artprov.obj:     $(COMMDIR)\artprov.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+artstd.obj:     $(COMMDIR)\artstd.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 bmpbase.obj:     $(COMMDIR)\bmpbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -688,6 +698,9 @@ helpbase.obj:     $(COMMDIR)\helpbase.cpp
 http.obj:     $(COMMDIR)\http.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+iconbndl.obj:     $(COMMDIR)\iconbndl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 imagall.obj:     $(COMMDIR)\imagall.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -933,6 +946,9 @@ choicdgg.obj:     $(GENDIR)\choicdgg.cpp
 colrdlgg.obj:     $(GENDIR)\colrdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dcbuffer.obj:     $(GENDIR)\dcbuffer.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dcpsg.obj:     $(GENDIR)\dcpsg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -969,9 +985,6 @@ helpext.obj:     $(GENDIR)\helpext.cpp
 helphtml.obj:     $(GENDIR)\helphtml.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-helpwxht.obj:     $(GENDIR)\helpwxht.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 imaglist.obj:     $(GENDIR)\imaglist.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -1035,6 +1048,9 @@ tbarsmpl.obj:     $(GENDIR)\tbarsmpl.cpp
 textdlgg.obj:     $(GENDIR)\textdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+timer.obj:     $(GENDIR)\timer.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 tipdlg.obj:     $(GENDIR)\tipdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<