From 23200777d164fa01fe4cd5a2d29cf247661b5972 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Thu, 27 Mar 2003 13:23:04 +0000 Subject: [PATCH] fix build for watcom git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- demos/bombs/makefile.wat | 2 +- demos/forty/makefile.wat | 3 ++- demos/fractal/makefile.wat | 2 +- demos/life/makefile.wat | 2 +- demos/poem/makefile.wat | 2 +- src/makelib.wat | 29 +++++++++++++++------------- utils/Install/builder/makefile.wat | 2 +- utils/dialoged/src/makefile.wat | 6 ++++-- utils/hhp2cached/makefile.wat | 2 +- utils/makegen/makefile.wat | 2 +- utils/makegen/templates/makefile.wat | 2 +- utils/tex2rtf/src/makefile.wat | 4 +++- 12 files changed, 33 insertions(+), 25 deletions(-) diff --git a/demos/bombs/makefile.wat b/demos/bombs/makefile.wat index 08562fa92a..a7ce420ae1 100644 --- a/demos/bombs/makefile.wat +++ b/demos/bombs/makefile.wat @@ -8,7 +8,7 @@ WXDIR = $(%WXWIN) PROGRAM = bombs -OBJECTS = $(PROGRAM).obj bombs1.obj game.obj +OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\bombs1.obj $(OUTPUTDIR)\game.obj !include $(WXDIR)\src\makeprog.wat diff --git a/demos/forty/makefile.wat b/demos/forty/makefile.wat index 9db1dcaceb..cf6c8c03bc 100644 --- a/demos/forty/makefile.wat +++ b/demos/forty/makefile.wat @@ -8,7 +8,8 @@ WXDIR = $(%WXWIN) PROGRAM = forty -OBJECTS = $(PROGRAM).obj canvas.obj card.obj game.obj pile.obj playerdg.obj scoredg.obj scorefil.obj +OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\canvas.obj $(OUTPUTDIR)\card.obj $(OUTPUTDIR)\game.obj & + $(OUTPUTDIR)\pile.obj $(OUTPUTDIR)\playerdg.obj $(OUTPUTDIR)\scoredg.obj $(OUTPUTDIR)\scorefil.obj !include $(WXDIR)\src\makeprog.wat diff --git a/demos/fractal/makefile.wat b/demos/fractal/makefile.wat index d48fab6488..05bcc43d03 100644 --- a/demos/fractal/makefile.wat +++ b/demos/fractal/makefile.wat @@ -8,7 +8,7 @@ WXDIR = $(%WXWIN) PROGRAM = fractal -OBJECTS = $(PROGRAM).obj +OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj !include $(WXDIR)\src\makeprog.wat diff --git a/demos/life/makefile.wat b/demos/life/makefile.wat index 4fd507ae4b..3fce04a810 100644 --- a/demos/life/makefile.wat +++ b/demos/life/makefile.wat @@ -8,7 +8,7 @@ WXDIR = $(%WXWIN) PROGRAM = life -OBJECTS = $(PROGRAM).obj dialogs.obj game.obj reader.obj +OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\dialogs.obj $(OUTPUTDIR)\game.obj $(OUTPUTDIR)\reader.obj !include $(WXDIR)\src\makeprog.wat diff --git a/demos/poem/makefile.wat b/demos/poem/makefile.wat index b07d6af21e..c03bbda0af 100644 --- a/demos/poem/makefile.wat +++ b/demos/poem/makefile.wat @@ -8,7 +8,7 @@ WXDIR = $(%WXWIN) PROGRAM = wxpoem -OBJECTS = $(PROGRAM).obj +OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj !include $(WXDIR)\src\makeprog.wat diff --git a/src/makelib.wat b/src/makelib.wat index 3c6bcce4cd..da79c36e7a 100644 --- a/src/makelib.wat +++ b/src/makelib.wat @@ -2,29 +2,32 @@ # Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch # +OUTPUTDIR= $+ $(%cdrive):$(%cwd)\WATCOM $- + !include $(WXDIR)\src\makewat.env -all: $(OUTPUTDIR) $(LIBTARGET) -$(OUTPUTDIR): - @if not exist $^@ mkdir $^@ +all: MAKDIR $(LIBTARGET) .SYMBOLIC + +MAKDIR: .SYMBOLIC + @if not exist $(OUTPUTDIR) mkdir $(OUTPUTDIR) # the name of the file containing the objects to be put in the library -LBCFILE=$(OUTPUTDIR)$(LIBTARGET).lbc +LBCFILE=$(LIBTARGET).lbc $(LIBTARGET) : $(OBJECTS) %create $(LBCFILE) @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i $(LIB) /b /c /n /p=512 $^@ @$(LBCFILE) clean: .SYMBOLIC - -erase $(OUTPUTDIR)*.obj - -erase $(OUTPUTDIR)*.bak - -erase $(OUTPUTDIR)*.err - -erase $(OUTPUTDIR)*.pch - -erase $(OUTPUTDIR)*.lib - -erase $(OUTPUTDIR)*.lbc - -erase $(OUTPUTDIR)*.res - -erase $(OUTPUTDIR)*.exe - -erase $(OUTPUTDIR)*.lbc + -erase $(OUTPUTDIR)\*.obj + -erase $(OUTPUTDIR)\*.bak + -erase $(OUTPUTDIR)\*.err + -erase $(OUTPUTDIR)\*.pch + -erase $(OUTPUTDIR)\*.lib + -erase $(OUTPUTDIR)\*.lbc + -erase $(OUTPUTDIR)\*.res + -erase $(OUTPUTDIR)\*.exe + -erase $(OUTPUTDIR)\*.lbc -erase $(LIBTARGET) diff --git a/utils/Install/builder/makefile.wat b/utils/Install/builder/makefile.wat index 95c26443ed..f2b86f4175 100644 --- a/utils/Install/builder/makefile.wat +++ b/utils/Install/builder/makefile.wat @@ -4,7 +4,7 @@ WXDIR = $(%WXWIN) PROGRAM = toolbar -OBJECTS = $(PROGRAM).obj +OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj !include $(WXDIR)\src\makeprog.wat diff --git a/utils/dialoged/src/makefile.wat b/utils/dialoged/src/makefile.wat index 362b289124..4ad8e096de 100644 --- a/utils/dialoged/src/makefile.wat +++ b/utils/dialoged/src/makefile.wat @@ -7,8 +7,10 @@ WXDIR = $(%WXWIN) -PROGRAM = dialoged -OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj symbtabl.obj winstyle.obj +PROGRAM = $(OUTPUTDIR)\dialoged +OBJECTS = $(OUTPUTDIR)\dialoged.obj $(OUTPUTDIR)\reseditr.obj $(OUTPUTDIR)\dlghndlr.obj & + $(OUTPUTDIR)\reswrite.obj $(OUTPUTDIR)\winprop.obj $(OUTPUTDIR)\edtree.obj & + $(OUTPUTDIR)\edlist.obj $(OUTPUTDIR)\symbtabl.obj $(OUTPUTDIR)\winstyle.obj !include $(WXDIR)\src\makeprog.wat diff --git a/utils/hhp2cached/makefile.wat b/utils/hhp2cached/makefile.wat index 7d2d392024..fc22069e01 100644 --- a/utils/hhp2cached/makefile.wat +++ b/utils/hhp2cached/makefile.wat @@ -8,7 +8,7 @@ WXDIR = $(%WXWIN) PROGRAM = hhp2cached -OBJECTS = $(PROGRAM).obj +OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj !include $(WXDIR)\src\makeprog.wat diff --git a/utils/makegen/makefile.wat b/utils/makegen/makefile.wat index af964802ee..54088b9921 100644 --- a/utils/makegen/makefile.wat +++ b/utils/makegen/makefile.wat @@ -4,7 +4,7 @@ WXDIR = $(%WXWIN) PROGRAM = makegen -OBJECTS = $(PROGRAM).obj +OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj !include $(WXDIR)\src\makeprog.wat diff --git a/utils/makegen/templates/makefile.wat b/utils/makegen/templates/makefile.wat index cabb5193e6..61f8382db1 100644 --- a/utils/makegen/templates/makefile.wat +++ b/utils/makegen/templates/makefile.wat @@ -4,7 +4,7 @@ WXDIR = $(%WXWIN) PROGRAM = #NAME -OBJECTS = $(PROGRAM).obj +OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj !include $(WXDIR)\src\makeprog.wat diff --git a/utils/tex2rtf/src/makefile.wat b/utils/tex2rtf/src/makefile.wat index 053db94965..26dfc57964 100644 --- a/utils/tex2rtf/src/makefile.wat +++ b/utils/tex2rtf/src/makefile.wat @@ -7,7 +7,9 @@ WXDIR = $(%WXWIN) PROGRAM = tex2rtf -OBJECTS = tex2rtf.obj tex2any.obj texutils.obj rtfutils.obj xlputils.obj htmlutil.obj readshg.obj table.obj +OBJECTS = $(OUTPUTDIR)\tex2rtf.obj $(OUTPUTDIR)\tex2any.obj $(OUTPUTDIR)\texutils.obj & + $(OUTPUTDIR)\rtfutils.obj $(OUTPUTDIR)\xlputils.obj $(OUTPUTDIR)\htmlutil.obj & + $(OUTPUTDIR)\readshg.obj $(OUTPUTDIR)\table.obj !include $(WXDIR)\src\makeprog.wat