From 2fd1eea0fdb1b4a377464a869fe4e1ccda709012 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Wed, 26 Feb 2003 10:10:18 +0000 Subject: [PATCH] fix for open watcom git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/makeprog.wat | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/makeprog.wat b/src/makeprog.wat index 3e0742c21b..e9968c8ec3 100644 --- a/src/makeprog.wat +++ b/src/makeprog.wat @@ -3,16 +3,24 @@ # WXDIR = $(%WXWIN) +!ifndef EXEDIR +OUTPUTDIR = $(THISDIR)\Watcom +!else +OUTPUTDIR = $(THISDIR)\$(EXEDIR) +!ifeq EXEDIR "." +OUTPUTDIR = $(THISDIR) +!endif +!endif !include $(WXDIR)\src\makewat.env WXLIB = $(WXDIR)\lib LNK = $(OUTPUTDIR)\$(PROGRAM).lnk -all: $(OUTPUTDIR) $(OUTPUTDIR)\$(PROGRAM).exe $(EXTRATARGETS) .SYMBOLIC +all: MAKEDIR $(OUTPUTDIR)\$(PROGRAM).exe $(EXTRATARGETS) .SYMBOLIC -$(OUTPUTDIR): - @if not exist $^@ mkdir $^@ +MAKEDIR: .SYMBOLIC + @if not exist $(OUTPUTDIR) mkdir $(OUTPUTDIR) !ifeq wxUSE_GUI 0 RESFILE=