modify makefile for watcom

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-03-25 21:17:41 +00:00
parent 607422284d
commit 068dd44056
74 changed files with 9 additions and 74 deletions

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\artprov
# #
PROGRAM = artprov PROGRAM = artprov
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\calendar
# #
PROGRAM = calendar PROGRAM = calendar
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\caret
# #
PROGRAM = caret PROGRAM = caret
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\checklst
# #
PROGRAM = checklst PROGRAM = checklst
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\config
# #
PROGRAM = config PROGRAM = config
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -6,7 +6,6 @@
# #
# #
wxUSE_GUI=0 wxUSE_GUI=0
THISDIR = $(%WXWIN)\samples\console
# #
PROGRAM = console PROGRAM = console
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\controls
# #
PROGRAM = controls PROGRAM = controls
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\db
# #
PROGRAM = db PROGRAM = db
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\dialogs
# #
PROGRAM = dialogs PROGRAM = dialogs
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\dnd
# #
PROGRAM = dnd PROGRAM = dnd
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\docview
# #
PROGRAM = docview PROGRAM = docview
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\docvwmdi
# #
PROGRAM = docvwmdi PROGRAM = docvwmdi
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\dragimag
# #
PROGRAM = dragimag PROGRAM = dragimag
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\drawing
# #
PROGRAM = drawing PROGRAM = drawing
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\erase
# #
PROGRAM = erase PROGRAM = erase
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\event
# #
PROGRAM = event PROGRAM = event
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\exec
# #
PROGRAM = exec PROGRAM = exec
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\font
# #
PROGRAM = font PROGRAM = font
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\grid
# #
PROGRAM = grid PROGRAM = grid
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\help
# #
PROGRAM = help PROGRAM = help
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\html\about
# #
PROGRAM = about PROGRAM = about
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\html\help
# #
PROGRAM = help PROGRAM = help
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\html\helpview
# #
PROGRAM = helpview PROGRAM = helpview
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\html\printing
# #
PROGRAM = printing PROGRAM = printing
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\html\test
# #
PROGRAM = test PROGRAM = test
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\html\virtual
# #
PROGRAM = virtual PROGRAM = virtual
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\html\widget
# #
PROGRAM = widget PROGRAM = widget
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\zip
# #
PROGRAM = zip PROGRAM = zip
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\image
# #
PROGRAM = image PROGRAM = image
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\internat
# #
PROGRAM = internat PROGRAM = internat
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -8,7 +8,7 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
PROGRAM = client PROGRAM = client
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

View File

@@ -8,7 +8,7 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
PROGRAM = server PROGRAM = server
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\joytest
# #
PROGRAM = joytest PROGRAM = joytest
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\keyboard
# #
PROGRAM = keyboard PROGRAM = keyboard
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\layout
# #
PROGRAM = layout PROGRAM = layout
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\listctrl
# #
PROGRAM = listtest PROGRAM = listtest
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\mdi
# #
PROGRAM = mdi PROGRAM = mdi
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\memcheck
# #
PROGRAM = memcheck PROGRAM = memcheck
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\menu
# #
PROGRAM = menu PROGRAM = menu
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\mfc
# #
PROGRAM = mfc PROGRAM = mfc
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\minifram
# #
PROGRAM = minifram PROGRAM = minifram
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\minimal
# #
PROGRAM = minimal PROGRAM = minimal
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\nativdlg
# #
PROGRAM = nativdlg PROGRAM = nativdlg
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\newgrid
# #
PROGRAM = newgrid PROGRAM = newgrid
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\notebook
# #
PROGRAM = notebook PROGRAM = notebook
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\oleauto
# #
PROGRAM = oleauto PROGRAM = oleauto
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\ownerdrw
# #
PROGRAM = ownerdrw PROGRAM = ownerdrw
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\png
# #
PROGRAM = png PROGRAM = png
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\printing
# #
PROGRAM = printing PROGRAM = printing
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\proplist
# #
PROGRAM = proplist PROGRAM = proplist
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\propsize
# #
PROGRAM = propsize PROGRAM = propsize
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\regtest
# #
PROGRAM = regtest PROGRAM = regtest
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\resource
# #
PROGRAM = resource PROGRAM = resource
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\rotate
# #
PROGRAM = rotate PROGRAM = rotate
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\sashtest
# #
PROGRAM = sashtest PROGRAM = sashtest
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\scroll
# #
PROGRAM = scroll PROGRAM = scroll
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\scrollsub
# #
PROGRAM = scrollsub PROGRAM = scrollsub
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -8,7 +8,7 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
PROGRAM = client PROGRAM = client
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

View File

@@ -8,7 +8,7 @@
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
PROGRAM = server PROGRAM = server
OBJECTS = $(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat !include $(WXDIR)\src\makeprog.wat

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\splitter
# #
PROGRAM = splitter PROGRAM = splitter
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\statbar
# #
PROGRAM = statbar PROGRAM = statbar
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\tab
# #
PROGRAM = tab PROGRAM = tab
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\taskbar
# #
PROGRAM = taskbar PROGRAM = taskbar
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\text
# #
PROGRAM = text PROGRAM = text
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\thread
# #
PROGRAM = thread PROGRAM = thread
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\toolbar
# #
PROGRAM = toolbar PROGRAM = toolbar
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\treectrl
# #
PROGRAM = treetest PROGRAM = treetest
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\treelay
# #
PROGRAM = treelay PROGRAM = treelay
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\typetest
# #
PROGRAM = typetest PROGRAM = typetest
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\validate
# #
PROGRAM = validate PROGRAM = validate
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\widgets
# #
PROGRAM = widgets PROGRAM = widgets
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -5,7 +5,6 @@
# #
# #
# #
THISDIR = $(%WXWIN)\samples\wizard
# #
PROGRAM = wizard PROGRAM = wizard
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj

View File

@@ -1,6 +1,8 @@
# #
# Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch # Changelist: 2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
# #
# $+ .. $- means we get the result directly
THISDIR = $+ $(%cdrive):$(%cwd) $-
WXDIR = $(%WXWIN) WXDIR = $(%WXWIN)
!ifndef EXEDIR !ifndef EXEDIR
@@ -39,7 +41,7 @@ $(RESFILE): $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
$(RC) $(RESFLAGS) /fo=$(RESFILE) $(PROGRAM).rc $(RC) $(RESFLAGS) /fo=$(RESFILE) $(PROGRAM).rc
!endif !endif
$(LNK) : makefile.wat $(LNK) : .SYMBOLIC
%create $(LNK) %create $(LNK)
@%append $(LNK) $(LDFLAGS) @%append $(LNK) $(LDFLAGS)
@%append $(LNK) $(DEBUGINFO) @%append $(LNK) $(DEBUGINFO)

View File

@@ -359,7 +359,8 @@ $(ARCHINCDIR)\wx:
$(OUTPUTDIR): $(OUTPUTDIR):
@if not exist $^@ mkdir $^@ @if not exist $^@ mkdir $^@
$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx $(SETUP_H): $(ARCHINCDIR)\wx
if not exist $(WXDIR)\include\wx\msw\setup.h copy $(WXDIR)\include\wx\msw\setup0.h $(WXDIR)\include\wx\msw\setup.h
copy $(WXDIR)\include\wx\msw\setup.h $@ copy $(WXDIR)\include\wx\msw\setup.h $@
LBCFILE=wx$(TOOLKIT).lbc LBCFILE=wx$(TOOLKIT).lbc