fix for new watcom

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-03-26 20:44:28 +00:00
parent 9eb210eadb
commit c7999962a3
16 changed files with 155 additions and 169 deletions

View File

@@ -7,7 +7,6 @@
WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
THISDIR = $(WXDIR)\contrib\samples\animate
PROGRAM = anitest
EXTRALIBS = $(WXDIR)\lib\anim_w.lib

View File

@@ -4,9 +4,6 @@
WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
THISDIR = $(WXDIR)\contrib\samples\gizmos\multicell
PROGRAM = mtest
EXTRALIBS = $(WXDIR)\lib\gizmos_w.lib
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -4,7 +4,6 @@
WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
THISDIR = $(WXDIR)\contrib\samples\gizmos\splittree
PROGRAM = tree
EXTRALIBS = $(WXDIR)\lib\gizmos_w.lib

View File

@@ -8,7 +8,6 @@
WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
THISDIR = $(WXDIR)\contrib\samples\ogl\ogledit
PROGRAM = ogledit
EXTRALIBS = $(WXDIR)\lib\ogl_w.lib

View File

@@ -8,7 +8,6 @@
WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
THISDIR = $(WXDIR)\contrib\samples\ogl\studio
PROGRAM = studio
EXTRALIBS = $(WXDIR)\lib\ogl_w.lib

View File

@@ -1,17 +1,13 @@
#
# Makefile for WATCOM
#
# Purpose: makefile for SVG example (Watcom)
# Created 2000-07-28
WXDIR = $(WXWIN)
WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
THISDIR = $(WXDIR)\contrib\samples\stc
OUTPUTDIR = $(THISDIR)\
PROGRAM = stctest
EXTRALIBS = $(WXDIR)\lib\stc.lib
OBJECTS = $(PROGRAM).obj
EXTRALIBS = $(WXDIR)\lib\stc_w.lib
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat

View File

@@ -1,17 +1,13 @@
#
# Makefile for WATCOM
#
# Purpose: makefile for SVG example (Watcom)
# Created 2000-07-28
WXDIR = $(%WXWIN)
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
THISDIR = $(WXDIR)\contrib\samples\svg
OUTPUTDIR = $(THISDIR)\
PROGRAM = svgtest
EXTRALIBS = $(WXDIR)\lib\svg.lib
OBJECTS = $(PROGRAM).obj
EXTRALIBS = $(WXDIR)\lib\svg_w.lib
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat

View File

@@ -0,0 +1,13 @@
# ANIM src makefile for Watcom C++
WXDIR = ..\..\..
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
LIBTARGET = $(WXDIR)\lib\anim_w.lib
OBJECTS = &
$(OUTPUTDIR)\animate.obj &
!include $(WXDIR)\src\makelib.wat

View File

@@ -1,29 +1,17 @@
# Gizmos makefile for Watcom C++
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
WXDIR = ..\..\..
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
!include $(WXDIR)\src\makewat.env
LIBTARGET = $(WXDIR)\lib\gizmos_w.lib
GIZMOSLIB = $(WXDIR)\lib\gizmos_w.lib
THISDIR = $(WXDIR)\contrib\src\gizmos
OUTPUTDIR = $(THISDIR)\
OBJECTS = &
$(OUTPUTDIR)\multicell.obj &
$(OUTPUTDIR)\splittree.obj &
$(OUTPUTDIR)\editlbox.obj &
$(OUTPUTDIR)\dynamicsash.obj &
$(OUTPUTDIR)\ledctrl.obj
NAME = gizmos
LNK = $(name).lnk
!include $(WXDIR)\src\makelib.wat
OBJECTS = multicell.obj splittree.obj editlbox.obj dynamicsash.obj ledctrl.obj
all: $(GIZMOSLIB) .SYMBOLIC
$(GIZMOSLIB): $(OBJECTS)
*wlib /b /c /n /P=256 $(GIZMOSLIB) $(OBJECTS)
clean: .SYMBOLIC
-erase *.obj
-erase *.bak
-erase *.err
-erase *.pch
-erase $(GIZMOSLIB)
-erase *.lbc

View File

@@ -11,33 +11,28 @@
WXDIR = ..\..\..
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
!include $(WXDIR)\src\makewat.env
THISDIR = $(WXDIR)\contrib\src\mmedia
OUTPUTDIR = $(THISDIR)\
NAME = mmedia
LNK = $(name).lnk
LIBTARGET=$(WXDIR)\lib\mmedia_w.lib
OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj &
g723_40.obj g72x.obj sndaiff.obj sndbase.obj sndcodec.obj &
sndcpcm.obj sndfile.obj sndg72x.obj sndpcm.obj sndulaw.obj &
sndwav.obj sndwin.obj vidbase.obj vidwin.obj
all: $(LIBTARGET) .SYMBOLIC
$(LIBTARGET): $(OBJECTS)
*wlib /b /c /n /P=256 $(SVGLIB) $(OBJECTS)
clean: .SYMBOLIC
-erase *.obj
-erase *.bak
-erase *.err
-erase *.pch
-erase $(LIBTARGET)
-erase *.lbc
OBJECTS = &
$(OUTPUTDIR)\cdbase.obj &
$(OUTPUTDIR)\cdwin.obj &
$(OUTPUTDIR)\g711.obj &
$(OUTPUTDIR)\g721.obj &
$(OUTPUTDIR)\g723_24.obj &
$(OUTPUTDIR)\g723_40.obj &
$(OUTPUTDIR)\g72x.obj &
$(OUTPUTDIR)\sndaiff.obj &
$(OUTPUTDIR)\sndbase.obj &
$(OUTPUTDIR)\sndcodec.obj &
$(OUTPUTDIR)\sndcpcm.obj &
$(OUTPUTDIR)\sndfile.obj &
$(OUTPUTDIR)\sndg72x.obj &
$(OUTPUTDIR)\sndpcm.obj &
$(OUTPUTDIR)\sndulaw.obj &
$(OUTPUTDIR)\sndwav.obj &
$(OUTPUTDIR)\sndwin.obj &
$(OUTPUTDIR)\vidbase.obj &
$(OUTPUTDIR)\vidwin.obj
!include $(WXDIR)\src\makelib.wat

View File

@@ -1,30 +1,24 @@
# Objects makefile
# OGL makefile
WXDIR = ..\..\..
EXTRACPPFLAGS=-I$(WXDIR)\contrib\include;/DPROLOGIO
!include $(WXDIR)\src\makewat.env
LIBTARGET= $(WXDIR)\lib\ogl_w.lib
OGLLIB = $(WXDIR)\lib\ogl_w.lib
THISDIR = $(WXDIR)\contrib\src\ogl
OUTPUTDIR = $(THISDIR)\
OBJECTS = &
$(OUTPUTDIR)\basic.obj &
$(OUTPUTDIR)\basic2.obj &
$(OUTPUTDIR)\canvas.obj &
$(OUTPUTDIR)\lines.obj &
$(OUTPUTDIR)\divided.obj &
$(OUTPUTDIR)\constrnt.obj &
$(OUTPUTDIR)\composit.obj &
$(OUTPUTDIR)\drawn.obj &
$(OUTPUTDIR)\bmpshape.obj &
$(OUTPUTDIR)\mfutils.obj &
$(OUTPUTDIR)\ogldiag.obj &
$(OUTPUTDIR)\oglmisc.obj
NAME = ogl
LNK = $(name).lnk
OBJECTS = basic.obj basic2.obj canvas.obj lines.obj divided.obj constrnt.obj &
composit.obj drawn.obj bmpshape.obj mfutils.obj ogldiag.obj oglmisc.obj
all: $(OGLLIB) .SYMBOLIC
$(OGLLIB): $(OBJECTS)
*wlib /b /c /n /P=256 $(OGLLIB) $(OBJECTS)
clean: .SYMBOLIC
-erase *.obj
-erase *.bak
-erase *.err
-erase *.pch
-erase $(OGLLIB)
-erase *.lbc
!include $(WXDIR)\src\makelib.wat

View File

@@ -10,7 +10,7 @@ EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
!include $(WXDIR)\src\makewat.env
STCLIB = $(WXDIR)\lib\stc.lib
STCLIB = $(WXDIR)\lib\stc_w.lib
THISDIR = $(WXDIR)\contrib\src\stc
OUTPUTDIR = $(THISDIR)\

View File

@@ -1,26 +1,13 @@
# svg makefile for Watcom C++
# SVG src makefile for Watcom C++
WXDIR = ..\..\..
EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
!include $(WXDIR)\src\makewat.env
LIBTARGET = $(WXDIR)\lib\svg_w.lib
SVGLIB = $(WXDIR)\lib\svg.lib
THISDIR = $(WXDIR)\contrib\src\svg
OUTPUTDIR = $(THISDIR)\
OBJECTS = &
$(OUTPUTDIR)\dcsvg.obj &
NAME = svg
LNK = $(name).lnk
OBJECTS = dcsvg.obj
!include $(WXDIR)\src\makelib.wat
all: $(SVGLIB) .SYMBOLIC
$(SVGLIB): $(OBJECTS)
*wlib /b /c /n /P=256 $(SVGLIB) $(OBJECTS)
clean: .SYMBOLIC
-erase *.obj *.bak *.err *.pch $(SVGLIB) *.lbc

View File

@@ -9,32 +9,44 @@ EXTRACPPFLAGS = -I$(WXDIR)\contrib\include;-I$(XMLDIR)\libxml2-2.1.1
!include $(WXDIR)\src\makewat.env
WXXMLLIB = $(WXDIR)\lib\wxxrc_w.lib
THISDIR = $(WXDIR)\contrib\src\xrc
OUTPUTDIR = $(THISDIR)\
LIBTARGET = $(WXDIR)\lib\wxxrc_w.lib
NAME = wxxrc
LNK = $(name).lnk
OBJECTS=xml.obj xmlres.obj xmlrsall.obj &
xh_bttn.obj xh_chckb.obj xh_chckl.obj xh_choic.obj xh_combo.obj xh_dlg.obj &
xh_gauge.obj xh_html.obj xh_menu.obj xh_notbk.obj xh_panel.obj xh_radbt.obj &
xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj &
xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj &
xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj &
xh_tree.obj xh_unkwn.obj xh_frame.obj xh_scwin.obj xh_split.obj
all: $(WXXMLLIB) .SYMBOLIC
$(WXXMLLIB): $(OBJECTS)
*wlib /b /c /n /P=256 $(WXXMLLIB) $(OBJECTS)
clean: .SYMBOLIC
-erase *.obj
-erase *.bak
-erase *.err
-erase *.pch
-erase $(WXXMLLIB)
-erase *.lbc
OBJECTS=&
$(OUTPUTDIR)\xml.obj &
$(OUTPUTDIR)\xmlres.obj &
$(OUTPUTDIR)\xmlrsall.obj &
$(OUTPUTDIR)\xh_bttn.obj &
$(OUTPUTDIR)\xh_chckb.obj &
$(OUTPUTDIR)\xh_chckl.obj &
$(OUTPUTDIR)\xh_choic.obj &
$(OUTPUTDIR)\xh_combo.obj &
$(OUTPUTDIR)\xh_dlg.obj &
$(OUTPUTDIR)\xh_gauge.obj &
$(OUTPUTDIR)\xh_html.obj &
$(OUTPUTDIR)\xh_menu.obj &
$(OUTPUTDIR)\xh_notbk.obj &
$(OUTPUTDIR)\xh_panel.obj &
$(OUTPUTDIR)\xh_radbt.obj &
$(OUTPUTDIR)\xh_radbx.obj &
$(OUTPUTDIR)\xh_sizer.obj &
$(OUTPUTDIR)\xh_slidr.obj &
$(OUTPUTDIR)\xh_spin.obj &
$(OUTPUTDIR)\xh_stbmp.obj &
$(OUTPUTDIR)\xh_sttxt.obj &
$(OUTPUTDIR)\xh_text.obj &
$(OUTPUTDIR)\xh_listb.obj&
$(OUTPUTDIR)\xh_toolb.obj &
$(OUTPUTDIR)\xh_stlin.obj &
$(OUTPUTDIR)\xh_bmp.obj &
$(OUTPUTDIR)\xh_bmpbt.obj &
$(OUTPUTDIR)\xh_cald.obj &
$(OUTPUTDIR)\xh_listc.obj &
$(OUTPUTDIR)\xh_scrol.obj &
$(OUTPUTDIR)\xh_stbox.obj &
$(OUTPUTDIR)\xh_tree.obj &
$(OUTPUTDIR)\xh_unkwn.obj &
$(OUTPUTDIR)\xh_frame.obj &
$(OUTPUTDIR)\xh_scwin.obj &
$(OUTPUTDIR)\xh_split.obj
!include $(WXDIR)\src\makelib.wat

View File

@@ -10,7 +10,7 @@ EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
!include $(WXDIR)\src\makewat.env
STCLIB = $(WXDIR)\lib\stc.lib
STCLIB = $(WXDIR)\lib\stc_w.lib
THISDIR = $(WXDIR)\contrib\src\stc
OUTPUTDIR = $(THISDIR)\

View File

@@ -9,32 +9,44 @@ EXTRACPPFLAGS = -I$(WXDIR)\contrib\include;-I$(XMLDIR)\libxml2-2.1.1
!include $(WXDIR)\src\makewat.env
WXXMLLIB = $(WXDIR)\lib\wxxrc_w.lib
THISDIR = $(WXDIR)\contrib\src\xrc
OUTPUTDIR = $(THISDIR)\
LIBTARGET = $(WXDIR)\lib\wxxrc_w.lib
NAME = wxxrc
LNK = $(name).lnk
OBJECTS=xml.obj xmlres.obj xmlrsall.obj &
xh_bttn.obj xh_chckb.obj xh_chckl.obj xh_choic.obj xh_combo.obj xh_dlg.obj &
xh_gauge.obj xh_html.obj xh_menu.obj xh_notbk.obj xh_panel.obj xh_radbt.obj &
xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj &
xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj &
xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj &
xh_tree.obj xh_unkwn.obj xh_frame.obj xh_scwin.obj xh_split.obj
all: $(WXXMLLIB) .SYMBOLIC
$(WXXMLLIB): $(OBJECTS)
*wlib /b /c /n /P=256 $(WXXMLLIB) $(OBJECTS)
clean: .SYMBOLIC
-erase *.obj
-erase *.bak
-erase *.err
-erase *.pch
-erase $(WXXMLLIB)
-erase *.lbc
OBJECTS=&
$(OUTPUTDIR)\xml.obj &
$(OUTPUTDIR)\xmlres.obj &
$(OUTPUTDIR)\xmlrsall.obj &
$(OUTPUTDIR)\xh_bttn.obj &
$(OUTPUTDIR)\xh_chckb.obj &
$(OUTPUTDIR)\xh_chckl.obj &
$(OUTPUTDIR)\xh_choic.obj &
$(OUTPUTDIR)\xh_combo.obj &
$(OUTPUTDIR)\xh_dlg.obj &
$(OUTPUTDIR)\xh_gauge.obj &
$(OUTPUTDIR)\xh_html.obj &
$(OUTPUTDIR)\xh_menu.obj &
$(OUTPUTDIR)\xh_notbk.obj &
$(OUTPUTDIR)\xh_panel.obj &
$(OUTPUTDIR)\xh_radbt.obj &
$(OUTPUTDIR)\xh_radbx.obj &
$(OUTPUTDIR)\xh_sizer.obj &
$(OUTPUTDIR)\xh_slidr.obj &
$(OUTPUTDIR)\xh_spin.obj &
$(OUTPUTDIR)\xh_stbmp.obj &
$(OUTPUTDIR)\xh_sttxt.obj &
$(OUTPUTDIR)\xh_text.obj &
$(OUTPUTDIR)\xh_listb.obj&
$(OUTPUTDIR)\xh_toolb.obj &
$(OUTPUTDIR)\xh_stlin.obj &
$(OUTPUTDIR)\xh_bmp.obj &
$(OUTPUTDIR)\xh_bmpbt.obj &
$(OUTPUTDIR)\xh_cald.obj &
$(OUTPUTDIR)\xh_listc.obj &
$(OUTPUTDIR)\xh_scrol.obj &
$(OUTPUTDIR)\xh_stbox.obj &
$(OUTPUTDIR)\xh_tree.obj &
$(OUTPUTDIR)\xh_unkwn.obj &
$(OUTPUTDIR)\xh_frame.obj &
$(OUTPUTDIR)\xh_scwin.obj &
$(OUTPUTDIR)\xh_split.obj
!include $(WXDIR)\src\makelib.wat