Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes to wxMGL build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-12-14 19:24:04 +00:00
parent 24eb81cbcf
commit f05605ff4d
5 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mgl/files.lst
View File

@@ -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 \

14
src/mgl/makefile.wat
View File

@@ -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) $<

10
src/mgl/makewat.env
View File

@@ -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