From 888ba4ff6728e35a382ff0308c80443d4ee62d13 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 22 Aug 2008 12:57:04 +0000 Subject: [PATCH] 2008-08-22 14:56 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/rtl/gtalleg/ssf.h ! Fixed to compile with BCC. * source/rtl/gtalleg/Makefile ! Missing SVN header. % Removed obsolete HB_MULTI_GT #define. * source/rtl/gtalleg/gtalleg.c * utils/hbmake/hbmake.prg ! Typos. --- harbour/ChangeLog | 12 ++++++++++++ harbour/source/rtl/gtalleg/Makefile | 10 +++++----- harbour/source/rtl/gtalleg/gtalleg.c | 4 ++-- harbour/source/rtl/gtalleg/ssf.h | 5 +++++ harbour/utils/hbmake/hbmake.prg | 2 +- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a1e159e7df..eb076dc9a2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,18 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-08-22 14:56 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * source/rtl/gtalleg/ssf.h + ! Fixed to compile with BCC. + + * source/rtl/gtalleg/Makefile + ! Missing SVN header. + % Removed obsolete HB_MULTI_GT #define. + + * source/rtl/gtalleg/gtalleg.c + * utils/hbmake/hbmake.prg + ! Typos. + 2008-08-22 11:30 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/rtl/gtalleg/gtalleg.c * GFX_* -> HB_GFX_* diff --git a/harbour/source/rtl/gtalleg/Makefile b/harbour/source/rtl/gtalleg/Makefile index 16f0abf7db..6eb4e23728 100644 --- a/harbour/source/rtl/gtalleg/Makefile +++ b/harbour/source/rtl/gtalleg/Makefile @@ -1,13 +1,13 @@ +# +# $Id$ +# ROOT = ../../../ C_SOURCES=\ - gtalleg.c ssf.c + gtalleg.c \ + ssf.c \ LIBNAME=gtalleg include $(TOP)$(ROOT)config/lib.cf - -ifeq ($(HB_MULTI_GT),yes) -CFLAGS += -DHB_MULTI_GT -endif diff --git a/harbour/source/rtl/gtalleg/gtalleg.c b/harbour/source/rtl/gtalleg/gtalleg.c index ce0a3ed9e9..ff3c0419e0 100644 --- a/harbour/source/rtl/gtalleg/gtalleg.c +++ b/harbour/source/rtl/gtalleg/gtalleg.c @@ -4,7 +4,7 @@ /* * xHarbour Project source code: -* Allegro based virtual gt with graphic extensions. +* Allegro based virtual GT with graphic extensions. * * Copyright 2004 Mauricio Abre * www - http://www.xharbour.org @@ -1229,7 +1229,7 @@ HB_CALL_ON_STARTUP_END( _hb_startup_gt_Init_ ) /* * this is necessary if you want to link with .so allegro libs -* or when link staticalt and your linker will force to link main() +* or when link statically and your linker will force to link main() * from allegro library not the harbour one */ int _mangled_main( int argc, char * argv[] ) diff --git a/harbour/source/rtl/gtalleg/ssf.h b/harbour/source/rtl/gtalleg/ssf.h index c193a5532a..ab8fecd960 100644 --- a/harbour/source/rtl/gtalleg/ssf.h +++ b/harbour/source/rtl/gtalleg/ssf.h @@ -62,6 +62,11 @@ #ifndef _SSF_H_ #define _SSF_H_ +#if defined(__BORLANDC__) + #define ALLEGRO_NO_ASM + #define ALLEGRO_BCC32 +#endif + #include /* Hack to use old Allegro branches */ diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg index 67f68a9760..d31e7880ee 100644 --- a/harbour/utils/hbmake/hbmake.prg +++ b/harbour/utils/hbmake/hbmake.prg @@ -52,7 +52,7 @@ /* * Modified By Sandro Freire sandrorrfreire at yahoo.com.br - * added suport to OS Unix + * added support for Unix OS */ #include "fileio.ch"