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
This commit is contained in:
@@ -8,7 +8,7 @@
|
|||||||
WXDIR = $(%WXWIN)
|
WXDIR = $(%WXWIN)
|
||||||
|
|
||||||
PROGRAM = bombs
|
PROGRAM = bombs
|
||||||
OBJECTS = $(PROGRAM).obj bombs1.obj game.obj
|
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj $(OUTPUTDIR)\bombs1.obj $(OUTPUTDIR)\game.obj
|
||||||
|
|
||||||
!include $(WXDIR)\src\makeprog.wat
|
!include $(WXDIR)\src\makeprog.wat
|
||||||
|
|
||||||
|
@@ -8,7 +8,8 @@
|
|||||||
WXDIR = $(%WXWIN)
|
WXDIR = $(%WXWIN)
|
||||||
|
|
||||||
PROGRAM = forty
|
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
|
!include $(WXDIR)\src\makeprog.wat
|
||||||
|
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
WXDIR = $(%WXWIN)
|
WXDIR = $(%WXWIN)
|
||||||
|
|
||||||
PROGRAM = fractal
|
PROGRAM = fractal
|
||||||
OBJECTS = $(PROGRAM).obj
|
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
|
||||||
|
|
||||||
!include $(WXDIR)\src\makeprog.wat
|
!include $(WXDIR)\src\makeprog.wat
|
||||||
|
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
WXDIR = $(%WXWIN)
|
WXDIR = $(%WXWIN)
|
||||||
|
|
||||||
PROGRAM = life
|
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
|
!include $(WXDIR)\src\makeprog.wat
|
||||||
|
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
WXDIR = $(%WXWIN)
|
WXDIR = $(%WXWIN)
|
||||||
|
|
||||||
PROGRAM = wxpoem
|
PROGRAM = wxpoem
|
||||||
OBJECTS = $(PROGRAM).obj
|
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
|
||||||
|
|
||||||
!include $(WXDIR)\src\makeprog.wat
|
!include $(WXDIR)\src\makeprog.wat
|
||||||
|
|
||||||
|
@@ -2,29 +2,32 @@
|
|||||||
# 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
|
||||||
#
|
#
|
||||||
|
|
||||||
|
OUTPUTDIR= $+ $(%cdrive):$(%cwd)\WATCOM $-
|
||||||
|
|
||||||
!include $(WXDIR)\src\makewat.env
|
!include $(WXDIR)\src\makewat.env
|
||||||
|
|
||||||
all: $(OUTPUTDIR) $(LIBTARGET)
|
|
||||||
|
|
||||||
$(OUTPUTDIR):
|
all: MAKDIR $(LIBTARGET) .SYMBOLIC
|
||||||
@if not exist $^@ mkdir $^@
|
|
||||||
|
MAKDIR: .SYMBOLIC
|
||||||
|
@if not exist $(OUTPUTDIR) mkdir $(OUTPUTDIR)
|
||||||
|
|
||||||
# the name of the file containing the objects to be put in the library
|
# the name of the file containing the objects to be put in the library
|
||||||
LBCFILE=$(OUTPUTDIR)$(LIBTARGET).lbc
|
LBCFILE=$(LIBTARGET).lbc
|
||||||
$(LIBTARGET) : $(OBJECTS)
|
$(LIBTARGET) : $(OBJECTS)
|
||||||
%create $(LBCFILE)
|
%create $(LBCFILE)
|
||||||
@for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
|
@for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
|
||||||
$(LIB) /b /c /n /p=512 $^@ @$(LBCFILE)
|
$(LIB) /b /c /n /p=512 $^@ @$(LBCFILE)
|
||||||
|
|
||||||
clean: .SYMBOLIC
|
clean: .SYMBOLIC
|
||||||
-erase $(OUTPUTDIR)*.obj
|
-erase $(OUTPUTDIR)\*.obj
|
||||||
-erase $(OUTPUTDIR)*.bak
|
-erase $(OUTPUTDIR)\*.bak
|
||||||
-erase $(OUTPUTDIR)*.err
|
-erase $(OUTPUTDIR)\*.err
|
||||||
-erase $(OUTPUTDIR)*.pch
|
-erase $(OUTPUTDIR)\*.pch
|
||||||
-erase $(OUTPUTDIR)*.lib
|
-erase $(OUTPUTDIR)\*.lib
|
||||||
-erase $(OUTPUTDIR)*.lbc
|
-erase $(OUTPUTDIR)\*.lbc
|
||||||
-erase $(OUTPUTDIR)*.res
|
-erase $(OUTPUTDIR)\*.res
|
||||||
-erase $(OUTPUTDIR)*.exe
|
-erase $(OUTPUTDIR)\*.exe
|
||||||
-erase $(OUTPUTDIR)*.lbc
|
-erase $(OUTPUTDIR)\*.lbc
|
||||||
-erase $(LIBTARGET)
|
-erase $(LIBTARGET)
|
||||||
|
|
||||||
|
@@ -4,7 +4,7 @@
|
|||||||
WXDIR = $(%WXWIN)
|
WXDIR = $(%WXWIN)
|
||||||
|
|
||||||
PROGRAM = toolbar
|
PROGRAM = toolbar
|
||||||
OBJECTS = $(PROGRAM).obj
|
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
|
||||||
|
|
||||||
!include $(WXDIR)\src\makeprog.wat
|
!include $(WXDIR)\src\makeprog.wat
|
||||||
|
|
||||||
|
@@ -7,8 +7,10 @@
|
|||||||
|
|
||||||
WXDIR = $(%WXWIN)
|
WXDIR = $(%WXWIN)
|
||||||
|
|
||||||
PROGRAM = dialoged
|
PROGRAM = $(OUTPUTDIR)\dialoged
|
||||||
OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj symbtabl.obj winstyle.obj
|
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
|
!include $(WXDIR)\src\makeprog.wat
|
||||||
|
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
WXDIR = $(%WXWIN)
|
WXDIR = $(%WXWIN)
|
||||||
|
|
||||||
PROGRAM = hhp2cached
|
PROGRAM = hhp2cached
|
||||||
OBJECTS = $(PROGRAM).obj
|
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
|
||||||
|
|
||||||
!include $(WXDIR)\src\makeprog.wat
|
!include $(WXDIR)\src\makeprog.wat
|
||||||
|
|
||||||
|
@@ -4,7 +4,7 @@
|
|||||||
WXDIR = $(%WXWIN)
|
WXDIR = $(%WXWIN)
|
||||||
|
|
||||||
PROGRAM = makegen
|
PROGRAM = makegen
|
||||||
OBJECTS = $(PROGRAM).obj
|
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
|
||||||
|
|
||||||
!include $(WXDIR)\src\makeprog.wat
|
!include $(WXDIR)\src\makeprog.wat
|
||||||
|
|
||||||
|
@@ -4,7 +4,7 @@
|
|||||||
WXDIR = $(%WXWIN)
|
WXDIR = $(%WXWIN)
|
||||||
|
|
||||||
PROGRAM = #NAME
|
PROGRAM = #NAME
|
||||||
OBJECTS = $(PROGRAM).obj
|
OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj
|
||||||
|
|
||||||
!include $(WXDIR)\src\makeprog.wat
|
!include $(WXDIR)\src\makeprog.wat
|
||||||
|
|
||||||
|
@@ -7,7 +7,9 @@
|
|||||||
WXDIR = $(%WXWIN)
|
WXDIR = $(%WXWIN)
|
||||||
|
|
||||||
PROGRAM = tex2rtf
|
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
|
!include $(WXDIR)\src\makeprog.wat
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user