From 400778045b2937836f2f453130211eddc6ebe978 Mon Sep 17 00:00:00 2001 From: Tamas Tevesz Date: Sat, 2 Mar 2013 09:57:06 +0000 Subject: [PATCH] 2013-03-02 09:55 UTC+0100 Tamas TEVESZ (ice extreme.hu) * src/rtl/gtcrs/gtcrs.h * utils/hbmk2/hbmk2.prg * config/detect.mk * config/minix/libs.mk * Add curses to Minix --- harbour/ChangeLog.txt | 7 +++++++ harbour/config/detect.mk | 2 +- harbour/config/minix/libs.mk | 2 +- harbour/src/rtl/gtcrs/gtcrs.h | 4 +++- harbour/utils/hbmk2/hbmk2.prg | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index 1b67bacb6c..fe6d1c5eb6 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,13 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-03-02 09:55 UTC+0100 Tamas TEVESZ (ice extreme.hu) + * src/rtl/gtcrs/gtcrs.h + * utils/hbmk2/hbmk2.prg + * config/detect.mk + * config/minix/libs.mk + * Add curses to Minix + 2013-03-02 02:20 UTC+0100 Viktor Szakats (vszakats syenar.net) + contrib/sddsqlt3/tests/test.prg - contrib/sddsqlt3/tests/test1.prg diff --git a/harbour/config/detect.mk b/harbour/config/detect.mk index 0257540e79..b4b200f09e 100644 --- a/harbour/config/detect.mk +++ b/harbour/config/detect.mk @@ -101,7 +101,7 @@ include $(TOP)$(ROOT)config/detfun.mk _DET_DSP_NAME := curses _DET_VAR_INC_ := HB_INC_CURSES _DET_VAR_HAS_ := HB_HAS_CURSES -_DET_FLT_PLAT := !os2 !minix +_DET_FLT_PLAT := !os2 _DET_FLT_COMP := _DET_INC_DEFP := /usr/include /usr/include/ncurses /usr/local/include /sw/include /opt/local/include /boot/develop/headers/3rdparty _DET_INC_HEAD := /curses.h diff --git a/harbour/config/minix/libs.mk b/harbour/config/minix/libs.mk index 866f71135f..c0d9072e59 100644 --- a/harbour/config/minix/libs.mk +++ b/harbour/config/minix/libs.mk @@ -6,7 +6,7 @@ SYSLIBPATHS := /usr/lib /usr/pkg/lib ifneq ($(HB_LINKING_RTL),) ifeq ($(HB_LIBNAME_CURSES),) - HB_LIBNAME_CURSES := ncurses + HB_LIBNAME_CURSES := curses endif ifneq ($(HB_HAS_CURSES),) SYSLIBS += $(HB_LIBNAME_CURSES) diff --git a/harbour/src/rtl/gtcrs/gtcrs.h b/harbour/src/rtl/gtcrs/gtcrs.h index e65c3ab264..65bfa8ae8c 100644 --- a/harbour/src/rtl/gtcrs/gtcrs.h +++ b/harbour/src/rtl/gtcrs/gtcrs.h @@ -67,7 +67,9 @@ # define _XOPEN_SOURCE_EXTENDED #endif #include -#if defined( HB_OS_SUNOS ) || defined( __PDCURSES__ ) +#if defined( HB_OS_SUNOS ) || \ + defined( __PDCURSES__ ) || \ + defined( HB_OS_MINIX ) # include #endif #if defined( HB_HAS_GPM ) diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index dce77f2bbc..9b0b2ae8cf 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -4176,7 +4176,7 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit IF IsGTRequested( hbmk, "gtcrs" ) /* TOFIX: Sometimes 'ncur194' is needed. */ - AAdd( l_aLIBSYS, iif( HBMK_ISPLAT( "sunos|bsd" ), "curses", "ncurses" ) ) + AAdd( l_aLIBSYS, iif( HBMK_ISPLAT( "sunos|bsd|minix" ), "curses", "ncurses" ) ) ENDIF IF IsGTRequested( hbmk, "gtsln" ) IF hbmk[ _HBMK_cPLAT ] == "bsd" .AND. ;