fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

19991004-12:52 GMT+1

Browse Source
This commit is contained in:
Viktor Szakats
1999-10-04 13:00:20 +00:00
parent f8682c20ec
commit b53f9eb4ad
23 changed files with 87 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -1,3 +1,17 @@
19991004-12:52 GMT+1 Victor Szel <info@szelvesz.hu>
* tests/working/*.bat
*.b??
makefile.vc
libs/*
lib/*
* libs directory name changed to lib, the win16 and win32
subdirs have been removed.
* win32 dir is no longer needed, since now the windows terminal.lib
is named termwin.lib.
! HARBOUR_USE_GTAPI defines changed to HARBOUR_USE_WIN_GTAPI
; !!! PLEASE TEST THESE WITH BORLAND AND MSVC !!! (or wait a bit more
since more changes are coming)
19991004-01:20 GMT+1 Victor Szel <info@szelvesz.hu>
- make_b31.bat
makefile.b31

6
harbour/gt.b32
View File

@@ -9,10 +9,10 @@
.path.exe = bin
.path.prg = source\tools
.path.h = include
.path.lib = libs\b32
.path.lib = lib\b32
.path.obj = obj
libs\b32\hbgt.lib : \
lib\b32\hbgt.lib : \
ascpos.obj atdiff.obj chareven.obj charodd.obj chrcount.obj \
chrtotal.obj charmix.obj asciisum.obj chrfirst.obj io.obj numtxthu.obj numtxten.obj nconvert.obj \
strasint.obj strcount.obj strcspn.obj strdiff.obj strexpan.obj \
@@ -49,4 +49,4 @@ numtxten.c : numtxten.prg harbour.exe
.c.obj:
bcc32 -c -O2 -I.\include -o$@ $<
tlib .\libs\b32\hbgt.lib -+$@,,
tlib .\lib\b32\hbgt.lib -+$@,,

2
harbour/hbpp.b16
View File

@@ -7,5 +7,5 @@
PROJECT: hbpp.exe
hbpp.exe : source\hbpp\stdalone\hbpp.c
bcc -ml -Iinclude source\hbpp\stdalone\hbpp.c source\hbpp\hbpp.lib libs\b16\hbpp.lib
bcc -ml -Iinclude source\hbpp\stdalone\hbpp.c source\hbpp\hbpp.lib lib\b16\hbpp.lib
del source\hbpp\stdalone\hbpp.obj

2
harbour/hbpp.b32
View File

@@ -7,5 +7,5 @@
PROJECT: hbpp.exe
hbpp.exe : source\hbpp\stdalone\hbpp.c
bcc32 -O2 -ebin\hbpp.exe -Iinclude source\hbpp\stdalone\hbpp.c libs\b32\hbpp.lib
bcc32 -O2 -ebin\hbpp.exe -Iinclude source\hbpp\stdalone\hbpp.c lib\b32\hbpp.lib
del source\hbpp\stdalone\hbpp.obj

6
harbour/hbpplib.b32
View File

@@ -7,10 +7,10 @@
.path.c = source\hbpp
.path.h = include
.path.lib = libs\b32
.path.lib = lib\b32
.path.obj = obj
libs\b32\hbpp.lib : hbppint.obj hbpp.obj table.obj hbpplib.obj
lib\b32\hbpp.lib : hbppint.obj hbpp.obj table.obj hbpplib.obj
hbppint.obj : hbppint.c
hbpp.obj : hbpp.c
@@ -19,4 +19,4 @@ hbpplib.obj : hbpplib.c
.c.obj :
bcc32 -c -O2 -I.\include;.\source\hbpp -o$@ $<
tlib .\libs\b32\hbpp.lib -+$@,,
tlib .\lib\b32\hbpp.lib -+$@,,

0
harbour/libs/b16/empty → harbour/lib/b16/empty
View File

0
harbour/libs/b32/empty → harbour/lib/b32/empty
View File

0
harbour/libs/vc/empty → harbour/lib/vc/empty
View File

1
harbour/libs/win16/empty
View File

@@ -1 +0,0 @@
empty

1
harbour/libs/win32/empty
View File

@@ -1 +0,0 @@
empty

16
harbour/makefile.b16
View File

@@ -9,11 +9,11 @@
.path.l = source\compiler
.path.y = source\compiler
.path.exe = bin
.path.lib = libs\b16
.path.lib = lib\b16
.path.obj = obj
.path.prg = source\rtl;source\tools
PROJECT: harbour.lib libs\b16\terminal.lib libs\win16\terminal.lib harbour.exe
PROJECT: harbour.lib lib\b16\terminal.lib harbour.exe
harbour.lib : arrays.obj asort.obj classes.obj codebloc.obj dates.obj \
dates2.obj datesx.obj cmdarg.obj \
@@ -23,15 +23,11 @@ harbour.lib : arrays.obj asort.obj classes.obj codebloc.obj dates.obj \
mathx.obj mtran.obj objfunc.obj set.obj setcolor.obj stringp.obj \
strings.obj stringsx.obj tclass.obj transfrm.obj
libs\b16\terminal.lib : console.obj
libs\win16\terminal.lib : console.obj
lib\b16\terminal.lib : console.obj
console.obj : console.c extend.h hbdefs.h
bcc -c -O2 -I.\include -o$@ source\rtl\console.c
tlib .\libs\b16\terminal.lib -+$@,,
bcc -c -O2 -D_DHARBOUR_USE_GTAPI -I.\include -o$@ source\rtl\console.c
tlib .\libs\win16\terminal.lib -+$@,,
tlib .\lib\b16\terminal.lib -+$@,,
arrays.obj : arrays.c extend.h hbdefs.h
asort.obj : asort.c extend.h hbdefs.h
@@ -83,9 +79,9 @@ tclass.c : tclass.prg harbour.exe
bin\harbour $< /n /osource\rtl
.c.obj:
bcc -c -ml -O2 -I.\include -o$@ -DHARBOUR_USE_GTAPI $<
bcc -c -ml -O2 -I.\include -o$@ -DHARBOUR_USE_DOS_GTAPI $<
tlib .\libs\b16\harbour.lib -+$@,,
tlib .\lib\b16\harbour.lib -+$@,,
harbour.exe : harboury.c harbourl.c harbour.obj
echo -ml -O2 > bld.31

8
harbour/makefile.b32
View File

@@ -10,11 +10,11 @@
.path.l = source\compiler
.path.y = source\compiler
.path.exe = bin
.path.lib = libs\b32
.path.lib = lib\b32
.path.obj = obj;source\compiler
.path.prg = source\rtl;source\tools;source\debug
PROJECT: harbour.exe harbour.lib libs\b32\terminal.lib libs\win32\terminal.lib
PROJECT: harbour.exe harbour.lib lib\b32\terminal.lib lib\b32\termwin.lib
harbour.lib : achoice.obj adir.obj alert.obj arrays.obj asort.obj \
browdb.obj \
@@ -120,8 +120,8 @@ memvarbl.c : memvarbl.prg harbour.exe
bin\harbour $< /n /osource\rtl\ /iinclude
.c.obj:
bcc32 -c -O2 -I.\include -o$@ -DHARBOUR_USE_GTAPI $<
tlib .\libs\b32\harbour.lib -+$@,,
bcc32 -c -O2 -I.\include -o$@ -DHARBOUR_USE_WIN_GTAPI $<
tlib .\lib\b32\harbour.lib -+$@,,
harbour.exe : harboury.c harbourl.c genc.obj genhrb.obj genjava.obj genrc.obj genpas.obj genobj32.obj harbour.obj compiler.h hbppint.c hbpp.c table.c
echo -O2 > bld.32

10
harbour/makefile.b40
View File

@@ -10,11 +10,11 @@
.path.l = source\compiler
.path.y = source\compiler
.path.exe = bin
.path.lib = libs\b32
.path.lib = lib\b32
.path.obj = obj;source\compiler
.path.prg = source\rtl;source\tools
PROJECT: harbour.exe harbour.lib libs\b32\terminal.lib libs\win32\terminal.lib
PROJECT: harbour.exe harbour.lib lib\b32\terminal.lib lib\b32\termwin.lib
harbour.lib : arrays.obj asort.obj classes.obj codebloc.obj alert.obj \
dates.obj dates2.obj datesx.obj debug.obj descend.obj devoutp.obj \
@@ -84,14 +84,14 @@ alert.c : alert.prg harbour.exe
.asm.obj:
tasm32 $<, $@
tlib .\libs\b32\harbour.lib -+$@,,
tlib .\lib\b32\harbour.lib -+$@,,
.prg.c:
bin\harbour $< /n /osource\rtl /iinclude
.c.obj:
bcc32 -c -I.\include -o$@ -DHARBOUR_USE_GTAPI $<
tlib .\libs\b32\harbour.lib -+$@,,
bcc32 -c -I.\include -o$@ -DHARBOUR_USE_WIN_GTAPI $<
tlib .\lib\b32\harbour.lib -+$@,,
harbour.exe : harboury.c harbourl.c genc.obj genhrb.obj genjava.obj genrc.obj genpas.obj genobj32.obj harbour.obj compiler.h hbppint.c hbpp.c table.c
echo -ebin\harbour.exe >> bld.32

2
harbour/makefile.vc
View File

@@ -26,7 +26,7 @@ DEBUG_DIR=source\debug
VM_DIR=source\vm
INCLUDE_DIR=include
BIN_DIR=bin
LIB_DIR=libs\vc
LIB_DIR=lib\vc
OBJ_DIR=obj
RUNNER_DIR=source\runner
#MACOMP_DIR=source\macro

8
harbour/rdd.b32
View File

@@ -7,12 +7,12 @@
.path.c = source\rdd;source\rdd\dbfntx
.path.h = source\rdd;include
.path.lib = libs\b32
.path.lib = lib\b32
.path.obj = obj
.path.prg = source\rdd;source\rdd\dbfntx
libs\b32\rdd.lib : rddsys.obj dbcmd.obj dbfntx1.obj dbfntx0.obj dbf0.obj dbf1.obj \
delim0.obj delim1.obj sdf0.obj sdf1.obj
lib\b32\rdd.lib : rddsys.obj dbcmd.obj dbfntx1.obj dbfntx0.obj dbf0.obj dbf1.obj \
delim0.obj delim1.obj sdf0.obj sdf1.obj
dbf0.c : dbf0.prg
dbfntx0.c : dbfntx0.prg
@@ -33,7 +33,7 @@ delim1.obj : delim1.c
.c.obj :
bcc32 -c -O2 -I.\include;.\source\hbpp -o$@ -v $<
tlib .\libs\b32\rdd.lib -+$@,,
tlib .\lib\b32\rdd.lib -+$@,,
.prg.c:
bin\harbour $< /n /osource\rdd\ /iinclude

18
harbour/runner.b32
View File

@@ -7,7 +7,7 @@
.path.c = source\runner
.path.h = include
.path.exe = bin
.path.lib = libs\b32
.path.lib = lib\b32
.path.obj = obj;source\runner;source\runner\stdalone
.path.prg = source\runner\stdalone
@@ -24,8 +24,8 @@ external.c : external.prg
bin\harbour $< /n /osource\runner\stdalone\ /iinclude /p
.c.obj:
bcc32 -c -O2 -I.\include -v -o$@ -DHARBOUR_USE_GTAPI $<
tlib .\libs\b32\runner.lib -+$@,,
bcc32 -c -O2 -I.\include -v -o$@ -DHARBOUR_USE_WIN_GTAPI $<
tlib .\lib\b32\runner.lib -+$@,,
runner.exe : runner.c external.c runlib.c
echo -v -O2 > bld.32
@@ -33,11 +33,11 @@ runner.exe : runner.c external.c runlib.c
echo -Iinclude >> bld.32
echo source\runner\stdalone\runner.c >> bld.32
echo source\runner\stdalone\external.c >> bld.32
echo libs\b32\harbour.lib >> bld.32
echo libs\b32\terminal.lib >> bld.32
echo libs\b32\hbgt.lib >> bld.32
echo libs\b32\hbpp.lib >> bld.32
echo libs\b32\rdd.lib >> bld.32
echo libs\b32\runner.lib >> bld.32
echo lib\b32\harbour.lib >> bld.32
echo lib\b32\terminal.lib >> bld.32
echo lib\b32\hbgt.lib >> bld.32
echo lib\b32\hbpp.lib >> bld.32
echo lib\b32\rdd.lib >> bld.32
echo lib\b32\runner.lib >> bld.32
bcc32 @bld.32
del bld.32

14
harbour/terminal.b32
View File

@@ -7,20 +7,18 @@
.path.c = source\rtl;source\rtl\gt
.path.h = include
.path.lib = libs\win32
.path.lib = lib\b32
.path.obj = obj
libs\b32\terminal.lib : console.obj gtapi.obj gtwin.obj
libs\win32\terminal.lib : console.obj gtapi.obj gtwin.obj
lib\b32\terminal.lib : console.obj gtapi.obj gtwin.obj
lib\b32\termwin.lib : console.obj gtapi.obj gtwin.obj
console.obj : console.c extend.h hbdefs.h
gtapi.obj : gtapi.c extend.h hbdefs.h
gtwin.obj : gtwin.c extend.h hbdefs.h
.c.obj:
bcc32 -wmsg -c -O2 -DHARBOUR_USE_GTAPI -I.\include -v -o$@ $<
tlib .\libs\b32\terminal.lib -+$@,,
del obj\console.obj
bcc32 -wmsg -c -O2 -DHARBOUR_USE_WIN_GTAPI -I.\include -v -o$@ $<
tlib .\lib\b32\terminal.lib -+$@,,
bcc32 -wmsg -c -O2 -I.\include -v -o$@ $<
tlib .\libs\win32\terminal.lib -+$@,,
tlib .\lib\b32\termwin.lib -+$@,,

16
harbour/tests/working/bld32exe.bat
View File

@@ -1,24 +1,24 @@
@echo off
rem
rem
rem $Id$
rem
rem
IF A%1 == A GOTO :SINTAX
IF A%2 == A GOTO :NOOUTPUT
echo -O2 -e%2.exe -I..\..\include %1.c > b32.bc
echo ..\..\libs\b32\harbour.lib ..\..\libs\b32\terminal.lib >> b32.bc
echo ..\..\libs\b32\hbgt.lib ..\..\libs\b32\hbpp.lib >> b32.bc
echo ..\..\libs\b32\rdd.lib >> b32.bc
echo ..\..\lib\b32\harbour.lib ..\..\lib\b32\terminal.lib >> b32.bc
echo ..\..\lib\b32\hbgt.lib ..\..\lib\b32\hbpp.lib >> b32.bc
echo ..\..\lib\b32\rdd.lib >> b32.bc
bcc32 -v @b32.bc
del b32.bc
GOTO :END
:NOOUTPUT
echo -O2 -e%1.exe -I..\..\include %1.c > b32.bc
echo ..\..\libs\b32\harbour.lib ..\..\libs\b32\terminal.lib >> b32.bc
echo ..\..\libs\b32\hbgt.lib ..\..\libs\b32\hbpp.lib >> b32.bc
echo ..\..\libs\b32\rdd.lib >> b32.bc
echo ..\..\lib\b32\harbour.lib ..\..\lib\b32\terminal.lib >> b32.bc
echo ..\..\lib\b32\hbgt.lib ..\..\lib\b32\hbpp.lib >> b32.bc
echo ..\..\lib\b32\rdd.lib >> b32.bc
bcc32 -v @b32.bc
del b32.bc
GOTO :END

6
harbour/tests/working/bld32obj.bat
View File

@@ -1,8 +1,8 @@
@echo off
rem
rem
rem $Id$
rem
rem
..\..\bin\harbour %1 /fobj32 /n /i..\..\include
tlink32 -L..\..\libs\b32;c:\bc5\lib c:\bc5\lib\c0x32.obj %1.obj hvm.obj,%1.exe,, harbour.lib terminal.lib import32.lib cw32mt.lib
tlink32 -L..\..\lib\b32;c:\bc5\lib c:\bc5\lib\c0x32.obj %1.obj hvm.obj,%1.exe,, harbour.lib terminal.lib import32.lib cw32mt.lib

16
harbour/tests/working/bld32w.bat
View File

@@ -1,24 +1,24 @@
@echo off
rem
rem
rem $Id$
rem
rem
IF A%1 == A GOTO :SINTAX
IF A%2 == A GOTO :NOOUTPUT
echo -O2 -e%2.exe -DWINDOWS -tW -I..\..\include > b32.bc
echo ..\..\source\vm\hvm.c %1.c ..\..\libs\b32\harbour.lib ..\..\libs\win32\terminal.lib >> b32.bc
echo ..\..\libs\b32\hbgt.lib ..\..\libs\b32\hbpp.lib >> b32.bc
echo ..\..\libs\b32\rdd.lib >> b32.bc
echo ..\..\source\vm\hvm.c %1.c ..\..\lib\b32\harbour.lib ..\..\lib\b32\termwin.lib >> b32.bc
echo ..\..\lib\b32\hbgt.lib ..\..\lib\b32\hbpp.lib >> b32.bc
echo ..\..\lib\b32\rdd.lib >> b32.bc
bcc32 @b32.bc
del b32.bc
GOTO :END
:NOOUTPUT
echo -O2 -e%1.exe -DWINDOWS -tW -I..\..\include > b32.bc
echo ..\..\source\vm\hvm.c %1.c ..\..\libs\b32\harbour.lib ..\..\libs\win32\terminal.lib >> b32.bc
echo ..\..\libs\b32\hbgt.lib ..\..\libs\b32\hbpp.lib >> b32.bc
echo ..\..\libs\b32\rdd.lib >> b32.bc
echo ..\..\source\vm\hvm.c %1.c ..\..\lib\b32\harbour.lib ..\..\lib\b32\termwin.lib >> b32.bc
echo ..\..\lib\b32\hbgt.lib ..\..\lib\b32\hbpp.lib >> b32.bc
echo ..\..\lib\b32\rdd.lib >> b32.bc
bcc32 @b32.bc
del b32.bc
GOTO :END

8
harbour/tests/working/bldpexe.bat
View File

@@ -1,20 +1,20 @@
@echo off
rem
rem
rem $Id$
rem
rem
IF A%1 == A GOTO :SINTAX
IF A%2 == A GOTO :NOOUTPUT
echo -P -mh -O2 -Fm -e%2.exe -I..\..\include ..\..\source\vm\hvm.c %1.c > b16.bc
echo ..\..\libs\b16\harbour.lib ..\..\libs\b16\hbtools.lib ..\..\libs\b16\terminal.lib >> b16.bc
echo ..\..\lib\b16\harbour.lib ..\..\lib\b16\hbtools.lib ..\..\lib\b16\terminal.lib >> b16.bc
bcc @b16.bc
del b16.bc
GOTO :END
:NOOUTPUT
echo -P -mh -O2 -Fm -e%1.exe -I..\..\include ..\..\source\vm\hvm.c %1.c > b16.bc
echo ..\..\libs\b16\harbour.lib ..\..\libs\b16\hbtools.lib ..\..\libs\b16\terminal.lib >> b16.bc
echo ..\..\lib\b16\harbour.lib ..\..\lib\b16\hbtools.lib ..\..\lib\b16\terminal.lib >> b16.bc
bcc @b16.bc
del b16.bc
GOTO :END

8
harbour/tests/working/buildexe.bat
View File

@@ -1,20 +1,20 @@
@echo off
rem
rem
rem $Id$
rem
rem
IF A%1 == A GOTO :SINTAX
IF A%2 == A GOTO :NOOUTPUT
echo -mh -O2 -Fm -e%2.exe -I..\..\include ..\..\source\vm\hvm.c %1.c > b16.bc
echo ..\..\libs\b16\harbour.lib ..\..\libs\b16\hbtools.lib ..\..\libs\b16\terminal.lib >> b16.bc
echo ..\..\lib\b16\harbour.lib ..\..\lib\b16\hbtools.lib ..\..\lib\b16\terminal.lib >> b16.bc
bcc @b16.bc
del b16.bc
GOTO :END
:NOOUTPUT
echo -mh -O2 -Fm -e%1.exe -I..\..\include ..\..\source\vm\hvm.c %1.c > b16.bc
echo ..\..\libs\b16\harbour.lib ..\..\libs\b16\hbtools.lib ..\..\libs\b16\terminal.lib >> b16.bc
echo ..\..\lib\b16\harbour.lib ..\..\lib\b16\hbtools.lib ..\..\lib\b16\terminal.lib >> b16.bc
bcc @b16.bc
del b16.bc
GOTO :END

6
harbour/tests/working/buildvc.bat
View File

@@ -1,7 +1,7 @@
@echo off
rem
rem
rem $Id$
rem
rem
..\..\bin\harbour %1 /n /i..\..\include
cl -Fd..\..\bin\harbour -w -Zi -TP -GZ -GA -DDEBUG -DHARBOUR_USE_WIN_GTAPI -I..\..\include %1.c /link /subsystem:CONSOLE ..\..\libs\vc\harbour.lib ..\..\libs\vc\terminal.lib ..\..\libs\vc\hbtools.lib ..\..\libs\vc\dbfntx.lib ..\..\libs\vc\debug.lib
cl -Fd..\..\bin\harbour -w -Zi -TP -GZ -GA -DDEBUG -DHARBOUR_USE_WIN_GTAPI -I..\..\include %1.c /link /subsystem:CONSOLE ..\..\lib\vc\harbour.lib ..\..\lib\vc\terminal.lib ..\..\lib\vc\hbtools.lib ..\..\lib\vc\dbfntx.lib ..\..\lib\vc\debug.lib