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

2009-09-17 14:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* bin/hb-func.sh
  * source/rtl/gtcrs/gtcrs.c
  * source/rtl/gtcrs/gtcrs.h
  * config/detect.mk
    - Deleted HB_NCURSES_194 references.
This commit is contained in:
Viktor Szakats
2009-09-17 12:10:59 +00:00
parent d3ba9019b8
commit 9f34caca52
5 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -17,6 +17,13 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-09-17 14:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* bin/hb-func.sh
* source/rtl/gtcrs/gtcrs.c
* source/rtl/gtcrs/gtcrs.h
* config/detect.mk
- Deleted HB_NCURSES_194 references.
2009-09-17 13:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/rtl/gtcrs/Makefile
* source/rtl/gttrm/Makefile
@@ -32,7 +39,7 @@
It should be replaced with HB_USER_CFLAGS=-DHB_NCURSES_194
; TODO: Change logic in bin/hb-func.sh to lookup user flags for -DHB_NCURSES_194,
instead of processing dedicated HB_NCURSES_194 variable. I'm unsure
which variable to check here for user flags.
which variable to check here for user flags. [SOLVED]
2009-09-17 13:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* bin/hb-func.sh

2
harbour/bin/hb-func.sh
View File

@@ -234,8 +234,6 @@ mk_hbtools()
fi
if [ -n "${HB_CURSES_VER}" ]; then
HB_LIBNAME_CURSES="${HB_CURSES_VER}"
elif [ "${HB_NCURSES_194}" = "yes" ]; then
HB_LIBNAME_CURSES="ncur194"
elif [ -z "${HB_LIBNAME_CURSES}" ]; then
HB_LIBNAME_CURSES="ncurses"
fi

7
harbour/config/detect.mk
View File

@@ -118,14 +118,9 @@ _DET_VAR_INC_ := HB_INC_CURSES
_DET_VAR_HAS_ := HB_HAS_CURSES
_DET_FLT_PLAT := !os2
_DET_FLT_COMP :=
_DET_INC_DEFP := /boot/develop/headers/3rdparty
_DET_INC_DEFP := /usr/include /usr/local/include /sw/include /opt/local/include /boot/develop/headers/3rdparty
_DET_INC_HEAD := /curses.h
ifneq ($(filter -DHB_NCURSES_194,$(HB_USER_CFLAGS)),)
_DET_INC_DEFP += /usr/include/ncur194
else
_DET_INC_DEFP += /usr/include /usr/local/include /sw/include /opt/local/include
endif
ifeq ($(HB_COMPILER),djgpp)
_DET_INC_DEFP += $(foreach d, $(subst $(PTHSEP), ,$(PATH)), $(d)/../include)
endif

2
harbour/source/rtl/gtcrs/gtcrs.c
View File

@@ -3058,7 +3058,7 @@ HB_CALL_ON_STARTUP_END( _hb_startup_gt_Init_ )
/* *********************************************************************** */
#if defined( HB_GT_CRS_BCEHACK ) && defined( NCURSES_VERSION ) && !defined( HB_NCURSES_194 )
#if defined( HB_GT_CRS_BCEHACK ) && defined( NCURSES_VERSION )
#include <term.h>
static void curs_wrkaround( void )
{

21
harbour/source/rtl/gtcrs/gtcrs.h
View File

@@ -62,22 +62,15 @@
#include "hbapierr.h"
#ifndef HB_CDP_SUPPORT_OFF
#include "hbapicdp.h"
# include "hbapicdp.h"
#endif
#ifdef HB_NCURSES_194
# include <ncur194/curses.h>
extern int tigetflag(char *);
extern int tigetnum(char *);
extern char *tigetstr(char *);
#else
# if defined( HB_OS_HPUX )
# define _XOPEN_SOURCE_EXTENDED
# endif
# include <curses.h>
# if defined( HB_OS_SUNOS ) || defined( __PDCURSES__ )
# include <term.h>
# endif
#if defined( HB_OS_HPUX )
# define _XOPEN_SOURCE_EXTENDED
#endif
#include <curses.h>
#if defined( HB_OS_SUNOS ) || defined( __PDCURSES__ )
# include <term.h>
#endif
#if defined( HB_HAS_GPM )
# include <gpm.h>