From 6b4cbb920878539bdcf3479f859112561b3edd52 Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Tue, 11 May 1999 13:08:15 +0000 Subject: [PATCH] new type added --- harbour/include/types.h | 3 +++ harbour/makefile.b32 | 10 +++++----- harbour/tests/working/bld32obj.bat | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/harbour/include/types.h b/harbour/include/types.h index 17547fc431..6402c0d79c 100644 --- a/harbour/include/types.h +++ b/harbour/include/types.h @@ -14,6 +14,9 @@ typedef unsigned short int WORD; #undef SHORT /* 2 bytes signed */ typedef short int SHORT; +#undef USHORT /* 2 bytes unsigned */ +typedef unsigned short int USHORT; + #undef LONG /* 4 bytes signed */ typedef long LONG; typedef unsigned long ULONG; diff --git a/harbour/makefile.b32 b/harbour/makefile.b32 index 7c7e01dc62..6c8ba4efc7 100644 --- a/harbour/makefile.b32 +++ b/harbour/makefile.b32 @@ -14,10 +14,9 @@ PROJECT: harbour.lib libs\b32\terminal.lib libs\win32\terminal.lib harbour.exe harbour.lib : arrays.obj asort.obj classes.obj codebloc.obj dates.obj datesx.obj \ debug.obj dynsym.obj environ.obj error.obj \ - errorapi.obj errorsys.obj extend.obj files.obj itemapi.obj math.obj \ - mathx.obj objfunc.obj set.obj symbols.obj stringp.obj \ - strings.obj stringsx.obj strcmp.obj \ - tclass.obj transfrm.obj + errorapi.obj errorsys.obj extend.obj files.obj gtapi.obj itemapi.obj \ + math.obj mathx.obj set.obj symbols.obj strings.obj stringp.obj \ + stringsx.obj strcmp.obj tclass.obj transfrm.obj libs\b32\terminal.lib : console.obj @@ -45,6 +44,7 @@ errorapi.obj : errorapi.c extend.h types.h errorsys.obj : errorsys.c extend.h types.h extend.obj : extend.c extend.h types.h files.obj : extend.c extend.h types.h +gtapi.obj : extend.c extend.h types.h itemapi.obj : itemapi.c extend.h types.h math.obj : math.c extend.h types.h mathx.obj : mathx.c extend.h types.h @@ -65,7 +65,7 @@ stringp.c : stringp.prg harbour.exe tclass.c : tclass.prg harbour.exe .asm.obj: - tasm $<, $@ + tasm32 $<, $@ tlib .\libs\b32\harbour.lib -+$@,, .prg.c: diff --git a/harbour/tests/working/bld32obj.bat b/harbour/tests/working/bld32obj.bat index b9b4a5ac7c..7fcfe504e6 100644 --- a/harbour/tests/working/bld32obj.bat +++ b/harbour/tests/working/bld32obj.bat @@ -1,3 +1,3 @@ ..\..\bin\harbour %1 /fobj32 /n -tlink32 -v -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..\..\libs\b32;c:\bc5\lib c:\bc5\lib\c0x32.obj %1.obj hvm.obj,%1.exe,, harbour.lib terminal.lib import32.lib cw32mt.lib