AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove conflicts

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott 2003-06-26 11:22:50 +00:00
parent 034957673c
commit df2309bac7
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/makelib.wat
View File

@ -2,7 +2,7 @@
# 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
# #
<<<<<<< makelib.wat
THISDIR = $+ $(%cdrive):$(%cwd) $- THISDIR = $+ $(%cdrive):$(%cwd) $-
# set OUTPUTDIR to the directory to be used for the .obj files created during # set OUTPUTDIR to the directory to be used for the .obj files created during
# the build (under $THISDIR) # the build (under $THISDIR)
@ -11,31 +11,15 @@ OUTPUTDIR=$(THISDIR)\$(BASEDIRPREFIX)$(CONFIGURATION)Watcom
# no trailing slash for win98 # no trailing slash for win98
!endif !endif
=======
OUTPUTDIR= $+ $(%cdrive):$(%cwd)\WATCOM $-
>>>>>>> 1.1.8.2
!include $(WXDIR)\src\makewat.env !include $(WXDIR)\src\makewat.env
<<<<<<< makelib.wat
all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC
=======
>>>>>>> 1.1.8.2
<<<<<<< makelib.wat
$(OUTPUTDIR):
@if not exist $^@ mkdir $^@
=======
all: MAKDIR $(LIBTARGET) .SYMBOLIC all: MAKDIR $(LIBTARGET) .SYMBOLIC
>>>>>>> 1.1.8.2
<<<<<<< makelib.wat
=======
MAKDIR: .SYMBOLIC MAKDIR: .SYMBOLIC
@if not exist $(OUTPUTDIR) mkdir $(OUTPUTDIR) @if not exist $(OUTPUTDIR) mkdir $(OUTPUTDIR)
>>>>>>> 1.1.8.2
# 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=$(LIBTARGET).lbc LBCFILE=$(LIBTARGET).lbc
$(LIBTARGET) : $(OBJECTS) $(LIBTARGET) : $(OBJECTS)