From 4351c8f533622a3e651df24ea655a438383a05ae Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 3 Dec 2012 14:42:48 +0000 Subject: [PATCH] 2012-12-03 15:40 UTC+0100 Viktor Szakats (harbour syenar.net) - contrib/gtalleg/gtalleg.c + contrib/gtalleg/gtallegd.c + contrib/gtalleg/gtalleg.hbx * contrib/gtalleg/gtalleg.hbc * contrib/gtalleg/gtalleg.hbm * contrib/gtalleg/tests/test.prg + build as dynlib + run as script (it hangs on exit) --- harbour/ChangeLog.txt | 10 +++++++ harbour/contrib/gtalleg/gtalleg.hbc | 2 ++ harbour/contrib/gtalleg/gtalleg.hbm | 8 ++--- harbour/contrib/gtalleg/gtalleg.hbx | 30 +++++++++++++++++++ .../contrib/gtalleg/{gtalleg.c => gtallegd.c} | 0 harbour/contrib/gtalleg/tests/test.prg | 7 +++-- 6 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 harbour/contrib/gtalleg/gtalleg.hbx rename harbour/contrib/gtalleg/{gtalleg.c => gtallegd.c} (100%) diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index f94799a354..9ee12ad37a 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,16 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2012-12-03 15:40 UTC+0100 Viktor Szakats (harbour syenar.net) + - contrib/gtalleg/gtalleg.c + + contrib/gtalleg/gtallegd.c + + contrib/gtalleg/gtalleg.hbx + * contrib/gtalleg/gtalleg.hbc + * contrib/gtalleg/gtalleg.hbm + * contrib/gtalleg/tests/test.prg + + build as dynlib + + run as script (it hangs on exit) + 2012-12-03 15:26 UTC+0100 Viktor Szakats (harbour syenar.net) * contrib/hbformat/utils/hbformat.prg * contrib/hbnetio/utils/hbnetio/netiomgm.hb diff --git a/harbour/contrib/gtalleg/gtalleg.hbc b/harbour/contrib/gtalleg/gtalleg.hbc index 88b11d62f7..8892e9833c 100644 --- a/harbour/contrib/gtalleg/gtalleg.hbc +++ b/harbour/contrib/gtalleg/gtalleg.hbc @@ -4,6 +4,8 @@ description=GT for Allegro GUI backend +gt=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} + {!HB_STATIC_ALLEGRO}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF} {HB_STATIC_ALLEGRO}libs=${_HB_DYNPREF}${hb_name}s${_HB_DYNSUFF} diff --git a/harbour/contrib/gtalleg/gtalleg.hbm b/harbour/contrib/gtalleg/gtalleg.hbm index f7e8fba5b2..d708475708 100644 --- a/harbour/contrib/gtalleg/gtalleg.hbm +++ b/harbour/contrib/gtalleg/gtalleg.hbm @@ -10,9 +10,7 @@ -w3 -es2 --hbx= - --stop{hbdyn|pocc|pocc64|poccarm|xcc|dmc|watcom|mingwarm|msvcarm} +-stop{pocc|pocc64|poccarm|xcc|dmc|watcom|mingwarm|msvcarm} -depkeyhead=allegro:allegro.h -depcontrol=allegro:no{HB_BUILD_3RDEXT='no'} @@ -26,5 +24,7 @@ # For allegro headers -c=gnu90 -gtalleg.c +${hb_name}.hbx + +gtallegd.c ssf.c diff --git a/harbour/contrib/gtalleg/gtalleg.hbx b/harbour/contrib/gtalleg/gtalleg.hbx new file mode 100644 index 0000000000..a21f5bec5a --- /dev/null +++ b/harbour/contrib/gtalleg/gtalleg.hbx @@ -0,0 +1,30 @@ +/* -------------------------------------------------------------------- + * NOTE: You can add manual override which functions to include or + * exclude from automatically generated EXTERNAL/DYNAMIC list. + * Syntax: // HB_FUNC_INCLUDE + * // HB_FUNC_EXCLUDE + */ + +/* -------------------------------------------------------------------- + * WARNING: Automatically generated code below. DO NOT EDIT! + * Regenerate using hbmk2 '-hbx=' option. + */ + +#ifndef __HBEXTERN_CH__GTALLEG__ +#define __HBEXTERN_CH__GTALLEG__ + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__GTALLEG__ANNOUNCE ) + ANNOUNCE __HBEXTERN__GTALLEG__ +#endif + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__GTALLEG__REQUEST ) + #command DYNAMIC => EXTERNAL +#endif + +DYNAMIC HB_GT_ALLEG + +#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__GTALLEG__REQUEST ) + #uncommand DYNAMIC => EXTERNAL +#endif + +#endif diff --git a/harbour/contrib/gtalleg/gtalleg.c b/harbour/contrib/gtalleg/gtallegd.c similarity index 100% rename from harbour/contrib/gtalleg/gtalleg.c rename to harbour/contrib/gtalleg/gtallegd.c diff --git a/harbour/contrib/gtalleg/tests/test.prg b/harbour/contrib/gtalleg/tests/test.prg index 74bdd9033d..594a62661a 100644 --- a/harbour/contrib/gtalleg/tests/test.prg +++ b/harbour/contrib/gtalleg/tests/test.prg @@ -2,11 +2,14 @@ * $Id$ */ -REQUEST HB_GT_ALLEG_DEFAULT -ANNOUNCE HB_GTSYS +#require "gtalleg" PROCEDURE Main() +#if defined( __HBSCRIPT__HBSHELL ) + hbshell_gtSelect( "GTALLEG" ) +#endif + CLS Alert( "Hello world!" )