fixes to wxMGL build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 03b00424358e0b460ff39c229e3e131695eeb65b..e8da36e5d50c66d977403c963d459d5dd60a6fb0 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -350,9 +350,9 @@ wave.cpp    MSW
 window.cpp     MSW     LowLevel
 
 dialup.cpp     Unix    NotMac
 window.cpp     MSW     LowLevel
 
 dialup.cpp     Unix    NotMac

-dir.cpp        Unix    Base,NotMac
-fontenum.cpp   Unix    NotMac
-fontutil.cpp   Unix    NotMac
+dir.cpp        Unix    Base,NotMac,NotMGL
+fontenum.cpp   Unix    NotMac,NotMGL
+fontutil.cpp   Unix    NotMac,NotMGL

 gsocket.c      Unix    Base,NotMac
 mimetype.cpp   Unix    Base,NotMac
 snglinst.cpp   Unix    Base
 gsocket.c      Unix    Base,NotMac
 mimetype.cpp   Unix    Base,NotMac
 snglinst.cpp   Unix    Base


@@ -1444,11 +1444,12 @@ brush.cpp       MGL     LowLevel
 pen.cpp        MGL     LowLevel
 font.cpp       MGL     LowLevel
 data.cpp       MGL     LowLevel
 pen.cpp        MGL     LowLevel
 font.cpp       MGL     LowLevel
 data.cpp       MGL     LowLevel

-#fontenum.cpp  MGL     LowLevel
-#fontutil.cpp  MGL     LowLevel
+fontenum.cpp   MGL     LowLevel
+fontutil.cpp   MGL     LowLevel

 evtloop.cpp    MGL     LowLevel
 app.cpp        MGL     LowLevel
 bitmap.cpp     MGL     LowLevel
 evtloop.cpp    MGL     LowLevel
 app.cpp        MGL     LowLevel
 bitmap.cpp     MGL     LowLevel

+dir.cpp        MGL     LowLevel

 clipbrd.cpp    MGL     LowLevel
 cursor.cpp     MGL     LowLevel
 dcclient.cpp   MGL     LowLevel
 clipbrd.cpp    MGL     LowLevel
 cursor.cpp     MGL     LowLevel
 dcclient.cpp   MGL     LowLevel

diff --git a/distrib/msw/tmake/mgl.t b/distrib/msw/tmake/mgl.t
index ad1a8d1a427df755df7bb08648f8467a2f34d835..978def3479a15e09c4f89c50180da1847cc28ed1 100644 (file)
--- a/distrib/msw/tmake/mgl.t
+++ b/distrib/msw/tmake/mgl.t
@@ -45,6 +45,8 @@
     }
 
     foreach $file (sort keys %wxUNIX) {
     }
 
     foreach $file (sort keys %wxUNIX) {

+        next if $wxUNIX{$file} =~ /\bNotMGL\b/;
+

         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
         $project{"MGL_SOURCES"} .= "unix/" . $file . " ";
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
         $project{"MGL_SOURCES"} .= "unix/" . $file . " ";

diff --git a/src/mgl/files.lst b/src/mgl/files.lst
index d8553477d070ca1192a78fdeff162040de20d0d6..45e7a47780ec0cb50ed12a179c0c60a2fa039468 100644 (file)
--- a/src/mgl/files.lst
+++ b/src/mgl/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 16:36, 2001/11/20
+# This file was automatically generated by tmake at 20:44, 2001/12/09

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/accel.cpp \
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
                generic/accel.cpp \


@@ -181,8 +181,11 @@ ALL_SOURCES = \
                mgl/dcclient.cpp \
                mgl/dcmemory.cpp \
                mgl/dcscreen.cpp \
                mgl/dcclient.cpp \
                mgl/dcmemory.cpp \
                mgl/dcscreen.cpp \

+               mgl/dir.cpp \

                mgl/evtloop.cpp \
                mgl/font.cpp \
                mgl/evtloop.cpp \
                mgl/font.cpp \

+               mgl/fontenum.cpp \
+               mgl/fontutil.cpp \

                mgl/gdiobj.cpp \
                mgl/icon.cpp \
                mgl/palette.cpp \
                mgl/gdiobj.cpp \
                mgl/icon.cpp \
                mgl/palette.cpp \


@@ -194,9 +197,6 @@ ALL_SOURCES = \
                mgl/utils.cpp \
                mgl/window.cpp \
                unix/dialup.cpp \
                mgl/utils.cpp \
                mgl/window.cpp \
                unix/dialup.cpp \

-               unix/dir.cpp \
-               unix/fontenum.cpp \
-               unix/fontutil.cpp \

                unix/gsocket.c \
                unix/mimetype.cpp \
                unix/snglinst.cpp \
                unix/gsocket.c \
                unix/mimetype.cpp \
                unix/snglinst.cpp \


@@ -760,8 +760,11 @@ GUI_LOWLEVEL_OBJS = \
                dcclient.o \
                dcmemory.o \
                dcscreen.o \
                dcclient.o \
                dcmemory.o \
                dcscreen.o \

+               dir.o \

                evtloop.o \
                font.o \
                evtloop.o \
                font.o \

+               fontenum.o \
+               fontutil.o \

                gdiobj.o \
                icon.o \
                palette.o \
                gdiobj.o \
                icon.o \
                palette.o \


@@ -775,9 +778,6 @@ GUI_LOWLEVEL_OBJS = \
 
 UNIXOBJS = \
                dialup.o \
 
 UNIXOBJS = \
                dialup.o \

-               dir.o \
-               fontenum.o \
-               fontutil.o \

                gsocket.o \
                mimetype.o \
                snglinst.o \
                gsocket.o \
                mimetype.o \
                snglinst.o \

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index c7ae6293cd76b37c5ebe555b08fe1f50da038284..ef43abac920afebde7547dea58a1f76d0b630641 100644 (file)
--- a/src/mgl/makefile.wat
+++ b/src/mgl/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
 #!/binb/wmake.exe
 

-# This file was automatically generated by tmake at 16:22, 2001/12/09
+# This file was automatically generated by tmake at 20:44, 2001/12/09

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #


@@ -224,8 +224,11 @@ MGLOBJS = app.obj &
        dcclient.obj &
        dcmemory.obj &
        dcscreen.obj &
        dcclient.obj &
        dcmemory.obj &
        dcscreen.obj &

+       dir.obj &

        evtloop.obj &
        font.obj &
        evtloop.obj &
        font.obj &

+       fontenum.obj &
+       fontutil.obj &

        gdiobj.obj &
        icon.obj &
        palette.obj &
        gdiobj.obj &
        icon.obj &
        palette.obj &


@@ -347,12 +350,21 @@ dcmemory.obj:     $(MGLDIR)\dcmemory.cpp
 dcscreen.obj:     $(MGLDIR)\dcscreen.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 dcscreen.obj:     $(MGLDIR)\dcscreen.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+dir.obj:     $(MGLDIR)\dir.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 evtloop.obj:     $(MGLDIR)\evtloop.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 font.obj:     $(MGLDIR)\font.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 evtloop.obj:     $(MGLDIR)\evtloop.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 font.obj:     $(MGLDIR)\font.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

+fontenum.obj:     $(MGLDIR)\fontenum.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fontutil.obj:     $(MGLDIR)\fontutil.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+

 gdiobj.obj:     $(MGLDIR)\gdiobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 gdiobj.obj:     $(MGLDIR)\gdiobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

diff --git a/src/mgl/makewat.env b/src/mgl/makewat.env
index 775c5470a2dbb4c05265bdeb2a36d582633a7e81..2a552d4ca9fa0764ea6c4523dc3e865091d9956d 100644 (file)
--- a/src/mgl/makewat.env
+++ b/src/mgl/makewat.env
@@ -35,16 +35,14 @@ WXDEBUG=0
 PRECOMP     = /fh=$(WXDIR)\src\mgl\watcom.pch
 !endif
 
 PRECOMP     = /fh=$(WXDIR)\src\mgl\watcom.pch
 !endif
 

-!ifeq WXDEBUG 1
-DEBUGFLAGS     = /D__WXDEBUG__ /o1
+!ifeq FINAL 0
+DEBUGFLAGS     = /D__WXDEBUG__ /d2

 DEBUGINFO   = debug all
 !else
 DEBUGFLAGS     =
 DEBUGINFO   =
 !endif
 
 DEBUGINFO   = debug all
 !else
 DEBUGFLAGS     =
 DEBUGINFO   =
 !endif
 

-RC = wrc
-

 LEVEL       = 386
 CCC         = wpp$(LEVEL)
 CC         =  wcc$(LEVEL)
 LEVEL       = 386
 CCC         = wpp$(LEVEL)
 CC         =  wcc$(LEVEL)


@@ -56,12 +54,10 @@ WATLIBDIR   = $(WATCOMDIR)\lib386\dos
 MINDATA     =
 MAXDATA     =
 STACK       = option stack=200k
 MINDATA     =
 MAXDATA     =
 STACK       = option stack=200k

-LIBS   = $(WXDIR)\lib\wxmgl.lib $(WXDIR)\lib\regex.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\tiff.lib $(WXDIR)\lib\jpeg.lib &
+LIBS   = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\regex.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\tiff.lib $(WXDIR)\lib\jpeg.lib &

       $(MGLLIBDIR)\dos4gw\pm.lib $(MGLLIBDIR)\mgl.lib $(MGLLIBDIR)\mglcpp.lib  
 IFLAGS      = -i=$(WXDIR)\lib\mgl;$(WXINC) -i=$(WXDIR)\contrib\include -i=$(%watcom)\h;$(%watcom)\h\dos;$(WXDIR)\src\regex;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\src\tiff
 ;$(MGLROOT)\include
       $(MGLLIBDIR)\dos4gw\pm.lib $(MGLLIBDIR)\mgl.lib $(MGLLIBDIR)\mglcpp.lib  
 IFLAGS      = -i=$(WXDIR)\lib\mgl;$(WXINC) -i=$(WXDIR)\contrib\include -i=$(%watcom)\h;$(%watcom)\h\dos;$(WXDIR)\src\regex;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\src\tiff
 ;$(MGLROOT)\include

-RESFLAGS1   = -r -bt=nt /i$(WXDIR)\include /i$(WXDIR)\contrib\include
-RESFLAGS2   = -R $(name) /i$(WXDIR)\include /i$(WXDIR)\contrib\include

 
 # Here are some possible optimization flags:
 # /5r  Pentium timings
 
 # Here are some possible optimization flags:
 # /5r  Pentium timings