wxMGL Watcom makefiles fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2002-01-17 19:38:20 +00:00
parent 2eebeb077b
commit 84664b4684
2 changed files with 14 additions and 7 deletions

View File

@ -1,6 +1,6 @@
#!/binb/wmake.exe
# This file was automatically generated by tmake at 16:57, 2002/01/15
# This file was automatically generated by tmake at 11:57, 2002/01/17
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
#
@ -142,7 +142,6 @@ COMMONOBJS = &
hash.obj &
helpbase.obj &
http.obj &
iffdecod.obj &
imagall.obj &
imagbmp.obj &
image.obj &
@ -302,7 +301,16 @@ HTMLOBJS = helpctrl.obj &
# Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MGLOBJS) $(UNIVOBJS) $(UNIVTHEMEOBJS) $(HTMLOBJS)
all: $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
SETUP_H=$(ARCHINCDIR)\wx\setup.h
all: $(SETUP_H) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
$(ARCHINCDIR)\wx:
mkdir $(ARCHINCDIR)
mkdir $(ARCHINCDIR)\wx
$(SETUP_H): $(WXDIR)\include\wx\mgl\setup.h $(ARCHINCDIR)\wx
copy $(WXDIR)\include\wx\mgl\setup.h $@
$(LIBTARGET) : $(OBJECTS)
%create tmp.lbc
@ -675,9 +683,6 @@ helpbase.obj: $(COMMDIR)\helpbase.cpp
http.obj: $(COMMDIR)\http.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
iffdecod.obj: $(COMMDIR)\iffdecod.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
imagall.obj: $(COMMDIR)\imagall.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<

View File

@ -38,9 +38,11 @@ PRECOMP = /fh=$(WXDIR)\src\mgl\watcom.pch
!ifeq FINAL 0
DEBUGFLAGS = /D__WXDEBUG__ /d2
DEBUGINFO = debug all
ARCHINCDIR=$(WXDIR)\lib\mgld
!else
DEBUGFLAGS =
DEBUGINFO =
ARCHINCDIR=$(WXDIR)\lib\mgl
!endif
LEVEL = 386
@ -56,7 +58,7 @@ MAXDATA =
STACK = option stack=200k
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
IFLAGS = -i=$(ARCHINCDIR);$(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
# Here are some possible optimization flags: