20000313-21:00 GMT+1 Victor Szakats <info@szelvesz.hu>

This commit is contained in:
Viktor Szakats
2000-03-13 19:58:36 +00:00
parent 6b72938dee
commit 1909c26931
4 changed files with 663 additions and 648 deletions

View File

@@ -1,3 +1,13 @@
20000313-21:00 GMT+1 Victor Szakats <info@szelvesz.hu>
* source/compiler/harbour.c
! Fixed not to display a newly added message when -q is specified.
* makefile.bc
% Macro names synchronized with makefile.vc. Note that BCC_OPT has changed
to CFLAGS.
% Made more compact and robust.
* makefile.vc
* Minor changed.
20000313-15:57 GMT+1 Victor Szakats <info@szelvesz.hu>
* source/compiler/cmdcheck.c
source/compiler/harbour.c

File diff suppressed because it is too large Load Diff

View File

@@ -80,518 +80,518 @@ RUNNER_DLL = $(BIN_DIR)\runjava.dll
# QUESTION: Any make genius tell us why this doesn't work?
{$(OBJ_DIR)}.obj{$(LIB_DIR)}.lib:
lib /OUT:$@ $**
lib /OUT:$@ $**
# override builtin
.c.obj::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
#
#
#
LIBLIST = \
$(RTL_LIB) \
$(COMMON_LIB) \
$(DEBUG_LIB) \
$(MACRO_LIB) \
$(PP_LIB) \
$(RDD_LIB) \
$(DBFCDX_LIB) \
$(DBFNTX_LIB) \
$(NULSYS_LIB) \
$(RUNNER_LIB) \
$(TOOLS_LIB) \
$(VM_LIB)
$(RTL_LIB) \
$(COMMON_LIB) \
$(DEBUG_LIB) \
$(MACRO_LIB) \
$(PP_LIB) \
$(RDD_LIB) \
$(DBFCDX_LIB) \
$(DBFNTX_LIB) \
$(NULSYS_LIB) \
$(RUNNER_LIB) \
$(TOOLS_LIB) \
$(VM_LIB)
#
# macro.lib needs to be listed twice
#
LIBS = \
$(LIBLIST) \
$(MACRO_LIB)
$(LIBLIST) \
$(MACRO_LIB)
#
# programs that require user32.lib (for OemToAnsi)
#
LIBS2 = \
$(LIBS) \
user32.lib
$(LIBS) \
user32.lib
#
# RTL.LIB rules
#
{$(RTL_DIR)}.c{$(OBJ_DIR)}.obj::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
{$(RTL_DIR)}.prg{$(OBJ_DIR)}.obj:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
{$(RTL_DIR)}.prg{$(OBJ_DIR)}.c:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$@
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
RTL_LIB_OBJS = \
$(OBJ_DIR)\binnum.obj \
$(OBJ_DIR)\console.obj \
$(OBJ_DIR)\copyfile.obj \
$(OBJ_DIR)\dates.obj \
$(OBJ_DIR)\descend.obj \
$(OBJ_DIR)\dir.obj \
$(OBJ_DIR)\do.obj \
$(OBJ_DIR)\empty.obj \
$(OBJ_DIR)\environ.obj \
$(OBJ_DIR)\errorapi.obj \
$(OBJ_DIR)\filesys.obj \
$(OBJ_DIR)\gtapi.obj \
$(OBJ_DIR)\hardcr.obj \
$(OBJ_DIR)\inkey.obj \
$(OBJ_DIR)\isprint.obj \
$(OBJ_DIR)\langapi.obj \
$(OBJ_DIR)\len.obj \
$(OBJ_DIR)\math.obj \
$(OBJ_DIR)\memofile.obj \
$(OBJ_DIR)\memoline.obj \
$(OBJ_DIR)\mlcount.obj \
$(OBJ_DIR)\mlpos.obj \
$(OBJ_DIR)\mouseapi.obj \
$(OBJ_DIR)\mtran.obj \
$(OBJ_DIR)\natmsg.obj \
$(OBJ_DIR)\net.obj \
$(OBJ_DIR)\oemansi.obj \
$(OBJ_DIR)\oldbox.obj \
$(OBJ_DIR)\oldclear.obj \
$(OBJ_DIR)\samples.obj \
$(OBJ_DIR)\set.obj \
$(OBJ_DIR)\setcolor.obj \
$(OBJ_DIR)\soundex.obj \
$(OBJ_DIR)\strings.obj \
$(OBJ_DIR)\tone.obj \
$(OBJ_DIR)\trace.obj \
$(OBJ_DIR)\transfrm.obj \
$(OBJ_DIR)\type.obj \
$(OBJ_DIR)\valtype.obj \
$(OBJ_DIR)\word.obj \
$(OBJ_DIR)\xhelp.obj \
\
$(OBJ_DIR)\gtxxx.obj \
$(OBJ_DIR)\mousexxx.obj \
$(OBJ_DIR)\msgxxx.obj \
\
$(OBJ_DIR)\achoice.obj \
$(OBJ_DIR)\adir.obj \
$(OBJ_DIR)\alert.obj \
$(OBJ_DIR)\asort.obj \
$(OBJ_DIR)\browdb.obj \
$(OBJ_DIR)\browse.obj \
$(OBJ_DIR)\dbedit.obj \
$(OBJ_DIR)\devoutp.obj \
$(OBJ_DIR)\dircmd.obj \
$(OBJ_DIR)\dummy.obj \
$(OBJ_DIR)\errorsys.obj \
$(OBJ_DIR)\fieldbl.obj \
$(OBJ_DIR)\input.obj \
$(OBJ_DIR)\memvarbl.obj \
$(OBJ_DIR)\menuto.obj \
$(OBJ_DIR)\objfunc.obj \
$(OBJ_DIR)\readkey.obj \
$(OBJ_DIR)\setfunc.obj \
$(OBJ_DIR)\setkey.obj \
$(OBJ_DIR)\setta.obj \
$(OBJ_DIR)\tbcolumn.obj \
$(OBJ_DIR)\tbrowse.obj \
$(OBJ_DIR)\tclass.obj \
$(OBJ_DIR)\terror.obj \
$(OBJ_DIR)\text.obj \
$(OBJ_DIR)\tget.obj \
$(OBJ_DIR)\tgetlist.obj \
$(OBJ_DIR)\tlabel.obj \
$(OBJ_DIR)\treport.obj \
$(OBJ_DIR)\typefile.obj \
$(OBJ_DIR)\wait.obj \
$(OBJ_DIR)\xsavescr.obj
$(OBJ_DIR)\binnum.obj \
$(OBJ_DIR)\console.obj \
$(OBJ_DIR)\copyfile.obj \
$(OBJ_DIR)\dates.obj \
$(OBJ_DIR)\descend.obj \
$(OBJ_DIR)\dir.obj \
$(OBJ_DIR)\do.obj \
$(OBJ_DIR)\empty.obj \
$(OBJ_DIR)\environ.obj \
$(OBJ_DIR)\errorapi.obj \
$(OBJ_DIR)\filesys.obj \
$(OBJ_DIR)\gtapi.obj \
$(OBJ_DIR)\hardcr.obj \
$(OBJ_DIR)\inkey.obj \
$(OBJ_DIR)\isprint.obj \
$(OBJ_DIR)\langapi.obj \
$(OBJ_DIR)\len.obj \
$(OBJ_DIR)\math.obj \
$(OBJ_DIR)\memofile.obj \
$(OBJ_DIR)\memoline.obj \
$(OBJ_DIR)\mlcount.obj \
$(OBJ_DIR)\mlpos.obj \
$(OBJ_DIR)\mouseapi.obj \
$(OBJ_DIR)\mtran.obj \
$(OBJ_DIR)\natmsg.obj \
$(OBJ_DIR)\net.obj \
$(OBJ_DIR)\oemansi.obj \
$(OBJ_DIR)\oldbox.obj \
$(OBJ_DIR)\oldclear.obj \
$(OBJ_DIR)\samples.obj \
$(OBJ_DIR)\set.obj \
$(OBJ_DIR)\setcolor.obj \
$(OBJ_DIR)\soundex.obj \
$(OBJ_DIR)\strings.obj \
$(OBJ_DIR)\tone.obj \
$(OBJ_DIR)\trace.obj \
$(OBJ_DIR)\transfrm.obj \
$(OBJ_DIR)\type.obj \
$(OBJ_DIR)\valtype.obj \
$(OBJ_DIR)\word.obj \
$(OBJ_DIR)\xhelp.obj \
\
$(OBJ_DIR)\gtxxx.obj \
$(OBJ_DIR)\mousexxx.obj \
$(OBJ_DIR)\msgxxx.obj \
\
$(OBJ_DIR)\achoice.obj \
$(OBJ_DIR)\adir.obj \
$(OBJ_DIR)\alert.obj \
$(OBJ_DIR)\asort.obj \
$(OBJ_DIR)\browdb.obj \
$(OBJ_DIR)\browse.obj \
$(OBJ_DIR)\dbedit.obj \
$(OBJ_DIR)\devoutp.obj \
$(OBJ_DIR)\dircmd.obj \
$(OBJ_DIR)\dummy.obj \
$(OBJ_DIR)\errorsys.obj \
$(OBJ_DIR)\fieldbl.obj \
$(OBJ_DIR)\input.obj \
$(OBJ_DIR)\memvarbl.obj \
$(OBJ_DIR)\menuto.obj \
$(OBJ_DIR)\objfunc.obj \
$(OBJ_DIR)\readkey.obj \
$(OBJ_DIR)\setfunc.obj \
$(OBJ_DIR)\setkey.obj \
$(OBJ_DIR)\setta.obj \
$(OBJ_DIR)\tbcolumn.obj \
$(OBJ_DIR)\tbrowse.obj \
$(OBJ_DIR)\tclass.obj \
$(OBJ_DIR)\terror.obj \
$(OBJ_DIR)\text.obj \
$(OBJ_DIR)\tget.obj \
$(OBJ_DIR)\tgetlist.obj \
$(OBJ_DIR)\tlabel.obj \
$(OBJ_DIR)\treport.obj \
$(OBJ_DIR)\typefile.obj \
$(OBJ_DIR)\wait.obj \
$(OBJ_DIR)\xsavescr.obj
#
# TOOLS.LIB rules
#
{$(TOOLS_DIR)}.c{$(OBJ_DIR)}.obj::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
{$(TOOLS_DIR)}.prg{$(OBJ_DIR)}.obj:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
{$(TOOLS_DIR)}.prg{$(OBJ_DIR)}.c:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$@
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
TOOLS_LIB_OBJS = \
$(OBJ_DIR)\asciisum.obj \
$(OBJ_DIR)\ascpos.obj \
$(OBJ_DIR)\atdiff.obj \
$(OBJ_DIR)\chareven.obj \
$(OBJ_DIR)\charmix.obj \
$(OBJ_DIR)\charodd.obj \
$(OBJ_DIR)\chrcount.obj \
$(OBJ_DIR)\chrfirst.obj \
$(OBJ_DIR)\chrtotal.obj \
$(OBJ_DIR)\ctchksum.obj \
$(OBJ_DIR)\ctchrmix.obj \
$(OBJ_DIR)\ctcrypt.obj \
$(OBJ_DIR)\dates2.obj \
$(OBJ_DIR)\datesx.obj \
$(OBJ_DIR)\dbftools.obj \
$(OBJ_DIR)\hb_f.obj \
$(OBJ_DIR)\io.obj \
$(OBJ_DIR)\mathx.obj \
$(OBJ_DIR)\strasint.obj \
$(OBJ_DIR)\strcount.obj \
$(OBJ_DIR)\strcspn.obj \
$(OBJ_DIR)\strdiff.obj \
$(OBJ_DIR)\strexpan.obj \
$(OBJ_DIR)\strfmt.obj \
$(OBJ_DIR)\stringsx.obj \
$(OBJ_DIR)\strleft.obj \
$(OBJ_DIR)\strpbrk.obj \
$(OBJ_DIR)\strright.obj \
\
$(OBJ_DIR)\fileread.obj \
$(OBJ_DIR)\html.obj \
$(OBJ_DIR)\nconvert.obj \
$(OBJ_DIR)\ng.obj \
$(OBJ_DIR)\numtxten.obj \
$(OBJ_DIR)\numtxthu.obj \
$(OBJ_DIR)\os2.obj \
$(OBJ_DIR)\rtf.obj \
$(OBJ_DIR)\stringp.obj \
$(OBJ_DIR)\troff.obj
$(OBJ_DIR)\asciisum.obj \
$(OBJ_DIR)\ascpos.obj \
$(OBJ_DIR)\atdiff.obj \
$(OBJ_DIR)\chareven.obj \
$(OBJ_DIR)\charmix.obj \
$(OBJ_DIR)\charodd.obj \
$(OBJ_DIR)\chrcount.obj \
$(OBJ_DIR)\chrfirst.obj \
$(OBJ_DIR)\chrtotal.obj \
$(OBJ_DIR)\ctchksum.obj \
$(OBJ_DIR)\ctchrmix.obj \
$(OBJ_DIR)\ctcrypt.obj \
$(OBJ_DIR)\dates2.obj \
$(OBJ_DIR)\datesx.obj \
$(OBJ_DIR)\dbftools.obj \
$(OBJ_DIR)\hb_f.obj \
$(OBJ_DIR)\io.obj \
$(OBJ_DIR)\mathx.obj \
$(OBJ_DIR)\strasint.obj \
$(OBJ_DIR)\strcount.obj \
$(OBJ_DIR)\strcspn.obj \
$(OBJ_DIR)\strdiff.obj \
$(OBJ_DIR)\strexpan.obj \
$(OBJ_DIR)\strfmt.obj \
$(OBJ_DIR)\stringsx.obj \
$(OBJ_DIR)\strleft.obj \
$(OBJ_DIR)\strpbrk.obj \
$(OBJ_DIR)\strright.obj \
\
$(OBJ_DIR)\fileread.obj \
$(OBJ_DIR)\html.obj \
$(OBJ_DIR)\nconvert.obj \
$(OBJ_DIR)\ng.obj \
$(OBJ_DIR)\numtxten.obj \
$(OBJ_DIR)\numtxthu.obj \
$(OBJ_DIR)\os2.obj \
$(OBJ_DIR)\rtf.obj \
$(OBJ_DIR)\stringp.obj \
$(OBJ_DIR)\troff.obj
#
# MACRO.LIB rules
#
{$(MACRO_DIR)}.c{$(OBJ_DIR)}.obj::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
MACRO_LIB_OBJS = \
$(OBJ_DIR)\macrol.obj \
$(OBJ_DIR)\macroy.obj \
$(OBJ_DIR)\macro.obj
$(OBJ_DIR)\macrol.obj \
$(OBJ_DIR)\macroy.obj \
$(OBJ_DIR)\macro.obj
#
# RDD.LIB rules
#
{$(RDD_DIR)}.c{$(OBJ_DIR)}.obj::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
{$(RDD_DIR)}.prg{$(OBJ_DIR)}.obj:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
{$(RDD_DIR)}.prg{$(OBJ_DIR)}.c:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$@
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
RDD_LIB_OBJS = \
$(OBJ_DIR)\dbcmd.obj \
$(OBJ_DIR)\dbf0.obj \
$(OBJ_DIR)\dbf1.obj \
$(OBJ_DIR)\dbnubs.obj \
$(OBJ_DIR)\dbstrux.obj \
$(OBJ_DIR)\sdf0.obj \
$(OBJ_DIR)\sdf1.obj \
$(OBJ_DIR)\delim0.obj \
$(OBJ_DIR)\delim1.obj \
$(OBJ_DIR)\rddord.obj \
$(OBJ_DIR)\rddsys.obj
$(OBJ_DIR)\dbcmd.obj \
$(OBJ_DIR)\dbf0.obj \
$(OBJ_DIR)\dbf1.obj \
$(OBJ_DIR)\dbnubs.obj \
$(OBJ_DIR)\dbstrux.obj \
$(OBJ_DIR)\sdf0.obj \
$(OBJ_DIR)\sdf1.obj \
$(OBJ_DIR)\delim0.obj \
$(OBJ_DIR)\delim1.obj \
$(OBJ_DIR)\rddord.obj \
$(OBJ_DIR)\rddsys.obj
{$(RDD_DIR)\nulsys}.c{$(OBJ_DIR)}.obj::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
{$(RDD_DIR)\nulsys}.prg{$(OBJ_DIR)}.obj:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
{$(RDD_DIR)\nulsys}.prg{$(OBJ_DIR)}.c:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$@
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
NULSYS_LIB_OBJS = \
$(OBJ_DIR)\nulsys.obj
$(OBJ_DIR)\nulsys.obj
{$(RDD_DIR)\dbfntx}.c{$(OBJ_DIR)}.obj::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
{$(RDD_DIR)\dbfntx}.prg{$(OBJ_DIR)}.obj:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
{$(RDD_DIR)\dbfntx}.prg{$(OBJ_DIR)}.c:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$@
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
DBFNTX_LIB_OBJS = \
$(OBJ_DIR)\dbfntx0.obj \
$(OBJ_DIR)\dbfntx1.obj
$(OBJ_DIR)\dbfntx0.obj \
$(OBJ_DIR)\dbfntx1.obj
{$(RDD_DIR)\dbfcdx}.c{$(OBJ_DIR)}.obj::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
{$(RDD_DIR)\dbfcdx}.prg{$(OBJ_DIR)}.obj:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
{$(RDD_DIR)\dbfcdx}.prg{$(OBJ_DIR)}.c:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$@
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
DBFCDX_LIB_OBJS = \
$(OBJ_DIR)\dbfcdx0.obj \
$(OBJ_DIR)\dbfcdx1.obj
$(OBJ_DIR)\dbfcdx0.obj \
$(OBJ_DIR)\dbfcdx1.obj
#
# RUNNER.LIB rules
#
{$(RUNNER_DIR)}.c{$(OBJ_DIR)}.obj::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
RUNNER_LIB_OBJS = \
$(OBJ_DIR)\runlib.obj
$(OBJ_DIR)\runlib.obj
#
# PP.LIB rules
#
{$(PP_DIR)}.c{$(OBJ_DIR)}.obj::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
PP_LIB_OBJS = \
$(OBJ_DIR)\ppcore.obj \
$(OBJ_DIR)\ppcomp.obj \
$(OBJ_DIR)\pplib.obj \
$(OBJ_DIR)\pptable.obj
$(OBJ_DIR)\ppcore.obj \
$(OBJ_DIR)\ppcomp.obj \
$(OBJ_DIR)\pplib.obj \
$(OBJ_DIR)\pptable.obj
#
# DEBUG.LIB rules
#
{$(DEBUG_DIR)}.c{$(OBJ_DIR)}.obj::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
{$(DEBUG_DIR)}.prg{$(OBJ_DIR)}.obj:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
{$(DEBUG_DIR)}.prg{$(OBJ_DIR)}.c:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$@
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
DEBUG_LIB_OBJS = \
$(OBJ_DIR)\dbgmenu.obj \
$(OBJ_DIR)\debugger.obj \
$(OBJ_DIR)\tbrwtext.obj
$(OBJ_DIR)\dbgmenu.obj \
$(OBJ_DIR)\debugger.obj \
$(OBJ_DIR)\tbrwtext.obj
#
# COMMON.LIB rules
#
{$(COMMON_DIR)}.c{$(OBJ_DIR)}.obj::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
COMMON_LIB_OBJS = \
$(OBJ_DIR)\hbfsapi.obj \
$(OBJ_DIR)\hbstr.obj \
$(OBJ_DIR)\hbtrace.obj \
$(OBJ_DIR)\reserved.obj
$(OBJ_DIR)\hbfsapi.obj \
$(OBJ_DIR)\hbstr.obj \
$(OBJ_DIR)\hbtrace.obj \
$(OBJ_DIR)\reserved.obj
#
# VM.LIB rules
#
{$(VM_DIR)}.asm{$(OBJ_DIR)}.obj:
$(AS) $< $@ $*.lst $*.crf
$(AS) $< $@ $*.lst $*.crf
{$(VM_DIR)}.c{$(OBJ_DIR)}.obj::
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
$(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
{$(VM_DIR)}.prg{$(OBJ_DIR)}.obj:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$*.c
$(CC) $(CLIBFLAGS) -Fo$@ $*.c
{$(VM_DIR)}.prg{$(OBJ_DIR)}.c:
$(HARBOUR_EXE) $** $(HARBOURFLAGS) -o$@
$(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@
VM_LIB_OBJS = \
$(OBJ_DIR)\arrays.obj \
$(OBJ_DIR)\break.obj \
$(OBJ_DIR)\classes.obj \
$(OBJ_DIR)\cmdarg.obj \
$(OBJ_DIR)\codebloc.obj \
$(OBJ_DIR)\debug.obj \
$(OBJ_DIR)\dynsym.obj \
$(OBJ_DIR)\extend.obj \
$(OBJ_DIR)\fm.obj \
$(OBJ_DIR)\hvm.obj \
$(OBJ_DIR)\initexit.obj \
$(OBJ_DIR)\initsymb.obj \
$(OBJ_DIR)\itemapi.obj \
$(OBJ_DIR)\main.obj \
$(OBJ_DIR)\memvars.obj \
$(OBJ_DIR)\pcount.obj \
$(OBJ_DIR)\proc.obj \
$(OBJ_DIR)\pvalue.obj \
\
$(OBJ_DIR)\symbols.obj \
\
$(OBJ_DIR)\harbinit.obj
$(OBJ_DIR)\arrays.obj \
$(OBJ_DIR)\break.obj \
$(OBJ_DIR)\classes.obj \
$(OBJ_DIR)\cmdarg.obj \
$(OBJ_DIR)\codebloc.obj \
$(OBJ_DIR)\debug.obj \
$(OBJ_DIR)\dynsym.obj \
$(OBJ_DIR)\extend.obj \
$(OBJ_DIR)\fm.obj \
$(OBJ_DIR)\hvm.obj \
$(OBJ_DIR)\initexit.obj \
$(OBJ_DIR)\initsymb.obj \
$(OBJ_DIR)\itemapi.obj \
$(OBJ_DIR)\main.obj \
$(OBJ_DIR)\memvars.obj \
$(OBJ_DIR)\pcount.obj \
$(OBJ_DIR)\proc.obj \
$(OBJ_DIR)\pvalue.obj \
\
$(OBJ_DIR)\symbols.obj \
\
$(OBJ_DIR)\harbinit.obj
#
# Our default target
#
all: $(HARBOUR_EXE) \
$(LIBLIST) \
$(PP_EXE) \
$(RUNNER_EXE) \
$(HBTEST_EXE) \
$(HBDOC_EXE) \
# $(RUNNER_DLL)
$(LIBLIST) \
$(PP_EXE) \
$(RUNNER_EXE) \
$(HBTEST_EXE) \
$(HBDOC_EXE) \
# $(RUNNER_DLL)
$(PP_EXE) : \
$(PP_DIR)\stdalone\hbpp.c \
$(COMMON_DIR)\hbfsapi.c \
$(COMMON_DIR)\hbstr.c
$(CC) -TP $(CFLAGS) $** -o $(PP_EXE) /link $(PP_LIB)
-del hbpp.obj
-del hbfsapi.obj
-del hbstr.obj
$(PP_DIR)\stdalone\hbpp.c \
$(COMMON_DIR)\hbfsapi.c \
$(COMMON_DIR)\hbstr.c
$(CC) -TP $(CFLAGS) $** -o $(PP_EXE) /link $(PP_LIB)
-del hbpp.obj
-del hbfsapi.obj
-del hbstr.obj
#
# Runner
#
$(RUNNER_EXE) : \
$(RUNNER_DIR)\stdalone\hbrun.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ -i$(RUNNER_DIR)\stdalone\ $(RUNNER_DIR)\stdalone\hbrun.prg
$(CC) -TP $(CFLAGS) $(OBJ_DIR)\hbrun.c -o $(BIN_DIR)\hbrun /link $(LIBS2)
-del hbrun.obj
$(RUNNER_DIR)\stdalone\hbrun.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ -i$(RUNNER_DIR)\stdalone\ $(RUNNER_DIR)\stdalone\hbrun.prg
$(CC) -TP $(CFLAGS) $(OBJ_DIR)\hbrun.c -o $(BIN_DIR)\hbrun /link $(LIBS2)
-del hbrun.obj
#
# To compile this you must have a JDK installed
#
#$(RUNNER_DLL) : $(RUNNER_DIR)\runjava.c
# $(CC) -TP $(CFLAGS) $(RUNNER_DIR)\runjava.c -o $(BIN_DIR)\runjava.dll /link-dll $(LIBS)
# $(CC) -TP $(CFLAGS) $(RUNNER_DIR)\runjava.c -o $(BIN_DIR)\runjava.dll /link-dll $(LIBS)
# -del runjava.obj
# -del $(BIN_DIR)\runjava.exp
# -del $(BIN_DIR)\runjava.lib
$(HBTEST_EXE) : \
$(HBTEST_DIR)\hbtest.prg \
$(HBTEST_DIR)\rt_array.prg \
$(HBTEST_DIR)\rt_date.prg \
$(HBTEST_DIR)\rt_file.prg \
$(HBTEST_DIR)\rt_hvm.prg \
$(HBTEST_DIR)\rt_math.prg \
$(HBTEST_DIR)\rt_misc.prg \
$(HBTEST_DIR)\rt_str.prg \
$(HBTEST_DIR)\rt_trans.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\hbtest.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_array.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_date.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_file.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_hvm.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_math.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_misc.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_str.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_trans.prg
$(CC) -TP $(CFLAGS) $(OBJ_DIR)\hbtest.c $(OBJ_DIR)\rt_array.c $(OBJ_DIR)\rt_date.c $(OBJ_DIR)\rt_file.c $(OBJ_DIR)\rt_hvm.c $(OBJ_DIR)\rt_math.c $(OBJ_DIR)\rt_misc.c $(OBJ_DIR)\rt_str.c $(OBJ_DIR)\rt_trans.c -o $(HBTEST_EXE) /link $(LIBS)
-del hbtest.obj
-del rt_array.obj
-del rt_date.obj
-del rt_file.obj
-del rt_hvm.obj
-del rt_math.obj
-del rt_misc.obj
-del rt_str.obj
-del rt_trans.obj
$(HBTEST_DIR)\hbtest.prg \
$(HBTEST_DIR)\rt_array.prg \
$(HBTEST_DIR)\rt_date.prg \
$(HBTEST_DIR)\rt_file.prg \
$(HBTEST_DIR)\rt_hvm.prg \
$(HBTEST_DIR)\rt_math.prg \
$(HBTEST_DIR)\rt_misc.prg \
$(HBTEST_DIR)\rt_str.prg \
$(HBTEST_DIR)\rt_trans.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\hbtest.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_array.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_date.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_file.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_hvm.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_math.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_misc.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_str.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBTEST_DIR)\rt_trans.prg
$(CC) -TP $(CFLAGS) $(OBJ_DIR)\hbtest.c $(OBJ_DIR)\rt_array.c $(OBJ_DIR)\rt_date.c $(OBJ_DIR)\rt_file.c $(OBJ_DIR)\rt_hvm.c $(OBJ_DIR)\rt_math.c $(OBJ_DIR)\rt_misc.c $(OBJ_DIR)\rt_str.c $(OBJ_DIR)\rt_trans.c -o $(HBTEST_EXE) /link $(LIBS)
-del hbtest.obj
-del rt_array.obj
-del rt_date.obj
-del rt_file.obj
-del rt_hvm.obj
-del rt_math.obj
-del rt_misc.obj
-del rt_str.obj
-del rt_trans.obj
$(HBDOC_EXE) : \
$(HBDOC_DIR)\hbdoc.prg \
$(HBDOC_DIR)\genos2.prg \
$(HBDOC_DIR)\gentrf.prg \
$(HBDOC_DIR)\genng.prg \
$(HBDOC_DIR)\genhtm.prg \
$(HBDOC_DIR)\genrtf.prg \
$(HBDOC_DIR)\genhpc.prg \
$(HBDOC_DIR)\genasc.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\hbdoc.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\genos2.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\gentrf.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\genng.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\genhtm.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\genrtf.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\genhpc.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\genasc.prg
$(CC) -TP $(CFLAGS) $(OBJ_DIR)\hbdoc.c $(OBJ_DIR)\genos2.c $(OBJ_DIR)\gentrf.c $(OBJ_DIR)\genng.c $(OBJ_DIR)\genhtm.c $(OBJ_DIR)\genrtf.c $(OBJ_DIR)\genhpc.c $(OBJ_DIR)\genasc.c -o $(HBDOC_EXE) /link $(LIBS2)
-del hbdoc.obj
-del genos2.obj
-del gentrf.obj
-del genng.obj
-del genhtm.obj
-del genrtf.obj
-del genhpc.obj
-del genasc.obj
$(HBDOC_DIR)\hbdoc.prg \
$(HBDOC_DIR)\genos2.prg \
$(HBDOC_DIR)\gentrf.prg \
$(HBDOC_DIR)\genng.prg \
$(HBDOC_DIR)\genhtm.prg \
$(HBDOC_DIR)\genrtf.prg \
$(HBDOC_DIR)\genhpc.prg \
$(HBDOC_DIR)\genasc.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\hbdoc.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\genos2.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\gentrf.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\genng.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\genhtm.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\genrtf.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\genhpc.prg
$(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\genasc.prg
$(CC) -TP $(CFLAGS) $(OBJ_DIR)\hbdoc.c $(OBJ_DIR)\genos2.c $(OBJ_DIR)\gentrf.c $(OBJ_DIR)\genng.c $(OBJ_DIR)\genhtm.c $(OBJ_DIR)\genrtf.c $(OBJ_DIR)\genhpc.c $(OBJ_DIR)\genasc.c -o $(HBDOC_EXE) /link $(LIBS2)
-del hbdoc.obj
-del genos2.obj
-del gentrf.obj
-del genng.obj
-del genhtm.obj
-del genrtf.obj
-del genhpc.obj
-del genasc.obj
$(HARBOUR_EXE) : \
$(COMPILER_DIR)\harbour.c \
$(OBJ_DIR)\harboury.c \
$(OBJ_DIR)\harbourl.c \
$(COMPILER_DIR)\hbusage.c \
$(COMPILER_DIR)\hbpcode.c \
$(COMPILER_DIR)\hbfunchk.c \
$(COMPILER_DIR)\cmdcheck.c \
$(COMPILER_DIR)\hbgenerr.c \
$(COMPILER_DIR)\genobj32.c \
$(COMPILER_DIR)\genc.c \
$(COMPILER_DIR)\genhrb.c \
$(COMPILER_DIR)\genrc.c \
$(COMPILER_DIR)\genjava.c \
$(COMPILER_DIR)\genpas.c \
$(COMPILER_DIR)\expropt.c \
$(COMMON_DIR)\reserved.c \
$(COMMON_DIR)\hbfsapi.c \
$(COMMON_DIR)\hbstr.c \
$(PP_DIR)\ppcore.c \
$(PP_DIR)\ppcomp.c \
$(PP_DIR)\pptable.c
command /c echo. > include\unistd.h
$(CC) $(CFLAGS) -w $** -o $(HARBOUR_EXE)
command /c del include\unistd.h
-del harbour.obj
-del harboury.obj
-del harbourl.obj
-del hbgenerr.obj
-del cmdcheck.obj
-del hbfunchk.obj
-del hbpcode.obj
-del hbusage.obj
-del reserved.obj
-del genobj32.obj
-del genc.obj
-del genhrb.obj
-del genrc.obj
-del genjava.obj
-del genpas.obj
-del expropt.obj
-del hbfsapi.obj
-del hbstr.obj
-del ppcore.obj
-del ppcomp.obj
-del pptable.obj
$(COMPILER_DIR)\harbour.c \
$(OBJ_DIR)\harboury.c \
$(OBJ_DIR)\harbourl.c \
$(COMPILER_DIR)\hbusage.c \
$(COMPILER_DIR)\hbpcode.c \
$(COMPILER_DIR)\hbfunchk.c \
$(COMPILER_DIR)\cmdcheck.c \
$(COMPILER_DIR)\hbgenerr.c \
$(COMPILER_DIR)\genobj32.c \
$(COMPILER_DIR)\genc.c \
$(COMPILER_DIR)\genhrb.c \
$(COMPILER_DIR)\genrc.c \
$(COMPILER_DIR)\genjava.c \
$(COMPILER_DIR)\genpas.c \
$(COMPILER_DIR)\expropt.c \
$(COMMON_DIR)\reserved.c \
$(COMMON_DIR)\hbfsapi.c \
$(COMMON_DIR)\hbstr.c \
$(PP_DIR)\ppcore.c \
$(PP_DIR)\ppcomp.c \
$(PP_DIR)\pptable.c
command /c echo. > include\unistd.h
$(CC) $(CFLAGS) -w $** -o $(HARBOUR_EXE)
command /c del include\unistd.h
-del harbour.obj
-del harboury.obj
-del harbourl.obj
-del hbgenerr.obj
-del cmdcheck.obj
-del hbfunchk.obj
-del hbpcode.obj
-del hbusage.obj
-del reserved.obj
-del genobj32.obj
-del genc.obj
-del genhrb.obj
-del genrc.obj
-del genjava.obj
-del genpas.obj
-del expropt.obj
-del hbfsapi.obj
-del hbstr.obj
-del ppcore.obj
-del ppcomp.obj
-del pptable.obj
#
# Library dependencies and build rules
@@ -638,28 +638,28 @@ $(VM_LIB) : $(VM_LIB_OBJS)
#
$(OBJ_DIR)\harboury.c : $(COMPILER_DIR)\harbour.y
bison -d -v $(COMPILER_DIR)\harbour.y -o$(OBJ_DIR)\harboury.c
bison -d -v $(COMPILER_DIR)\harbour.y -o$(OBJ_DIR)\harboury.c
$(OBJ_DIR)\harbourl.c : $(COMPILER_DIR)\harbour.l
flex -iB8 -o$(OBJ_DIR)\harbourl.c $(COMPILER_DIR)\harbour.l
flex -iB8 -o$(OBJ_DIR)\harbourl.c $(COMPILER_DIR)\harbour.l
#
# MACRO.LIB dependencies
#
$(OBJ_DIR)\macroy.c : $(MACRO_DIR)\macro.y
bison -d -v -p hb_comp -o$(OBJ_DIR)\macroy.c $(MACRO_DIR)\macro.y
bison -d -v -p hb_comp -o$(OBJ_DIR)\macroy.c $(MACRO_DIR)\macro.y
$(OBJ_DIR)\macrol.c : $(OBJ_DIR)\macroy.c $(MACRO_DIR)\macro.l
flex -iB8 -Phb_comp -o$(OBJ_DIR)\macrol.c $(MACRO_DIR)\macro.l
flex -iB8 -Phb_comp -o$(OBJ_DIR)\macrol.c $(MACRO_DIR)\macro.l
$(OBJ_DIR)\macroy.obj : $(OBJ_DIR)\macroy.c
$(CC) $(CLIBFLAGS) -w -DYY_NEVER_INTERACTIVE -Fo$@ $**
$(CC) $(CLIBFLAGS) -w -DYY_NEVER_INTERACTIVE -Fo$@ $**
$(OBJ_DIR)\macrol.obj : $(OBJ_DIR)\macrol.c
command /c echo. > include\unistd.h
$(CC) $(CLIBFLAGS) -w -DYY_NEVER_INTERACTIVE -Fo$@ $**
command /c del include\unistd.h
command /c echo. > include\unistd.h
$(CC) $(CLIBFLAGS) -w -DYY_NEVER_INTERACTIVE -Fo$@ $**
command /c del include\unistd.h
$(OBJ_DIR)\macro.obj : $(MACRO_DIR)\macro.c

View File

@@ -207,10 +207,13 @@ int main( int argc, char * argv[] )
{
BOOL bSkipGen;
if( hb_comp_bPPO )
printf( "Compiling '%s' and generating preprocessed output to '%s'...\n", szFileName, szPpoName );
else
printf( "Compiling '%s'...\n", szFileName );
if( ! hb_comp_bQuiet )
{
if( hb_comp_bPPO )
printf( "Compiling '%s' and generating preprocessed output to '%s'...\n", szFileName, szPpoName );
else
printf( "Compiling '%s'...\n", szFileName );
}
/* Start processing */
hb_compYACCMain( hb_comp_pFileName->szName );