From f05605ff4db5e401ec235c5b271aa6dc86155f9c Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Fri, 14 Dec 2001 19:24:04 +0000
Subject: [PATCH] fixes to wxMGL build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/tmake/filelist.txt | 11 ++++++-----
 distrib/msw/tmake/mgl.t        |  2 ++
 src/mgl/files.lst              | 14 +++++++-------
 src/mgl/makefile.wat           | 14 +++++++++++++-
 src/mgl/makewat.env            | 10 +++-------
 5 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 03b0042435..e8da36e5d5 100644
--- 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
-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
@@ -1444,11 +1444,12 @@ brush.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
+dir.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 ad1a8d1a42..978def3479 100644
--- a/distrib/msw/tmake/mgl.t
+++ b/distrib/msw/tmake/mgl.t
@@ -45,6 +45,8 @@
     }
 
     foreach $file (sort keys %wxUNIX) {
+        next if $wxUNIX{$file} =~ /\bNotMGL\b/;
+
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
         $project{"MGL_SOURCES"} .= "unix/" . $file . " ";
diff --git a/src/mgl/files.lst b/src/mgl/files.lst
index d8553477d0..45e7a47780 100644
--- 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 \
@@ -181,8 +181,11 @@ ALL_SOURCES = \
 		mgl/dcclient.cpp \
 		mgl/dcmemory.cpp \
 		mgl/dcscreen.cpp \
+		mgl/dir.cpp \
 		mgl/evtloop.cpp \
 		mgl/font.cpp \
+		mgl/fontenum.cpp \
+		mgl/fontutil.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 \
-		unix/dir.cpp \
-		unix/fontenum.cpp \
-		unix/fontutil.cpp \
 		unix/gsocket.c \
 		unix/mimetype.cpp \
 		unix/snglinst.cpp \
@@ -760,8 +760,11 @@ GUI_LOWLEVEL_OBJS = \
 		dcclient.o \
 		dcmemory.o \
 		dcscreen.o \
+		dir.o \
 		evtloop.o \
 		font.o \
+		fontenum.o \
+		fontutil.o \
 		gdiobj.o \
 		icon.o \
 		palette.o \
@@ -775,9 +778,6 @@ GUI_LOWLEVEL_OBJS = \
 
 UNIXOBJS = \
 		dialup.o \
-		dir.o \
-		fontenum.o \
-		fontutil.o \
 		gsocket.o \
 		mimetype.o \
 		snglinst.o \
diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index c7ae6293cd..ef43abac92 100644
--- 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 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!
 
 #
@@ -224,8 +224,11 @@ MGLOBJS = app.obj &
 	dcclient.obj &
 	dcmemory.obj &
 	dcscreen.obj &
+	dir.obj &
 	evtloop.obj &
 	font.obj &
+	fontenum.obj &
+	fontutil.obj &
 	gdiobj.obj &
 	icon.obj &
 	palette.obj &
@@ -347,12 +350,21 @@ dcmemory.obj:     $(MGLDIR)\dcmemory.cpp
 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) $<
 
+fontenum.obj:     $(MGLDIR)\fontenum.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fontutil.obj:     $(MGLDIR)\fontutil.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 775c5470a2..2a552d4ca9 100644
--- a/src/mgl/makewat.env
+++ b/src/mgl/makewat.env
@@ -35,16 +35,14 @@ WXDEBUG=0
 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
 
-RC = wrc
-
 LEVEL       = 386
 CCC         = wpp$(LEVEL)
 CC         =  wcc$(LEVEL)
@@ -56,12 +54,10 @@ WATLIBDIR   = $(WATCOMDIR)\lib386\dos
 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
-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
-- 
2.45.2