the following (and attached, too) makes it possible to just "make",
and get most of the stuff (compiled, at least). after this, my regular
build tests still build.
i also need some help. it seems that there's only a static library for
ncurses, and no matter how i bend things, it just won't get linked
into gtcrs (libncurses.a is ~400k, libgtcrs.a stays at ~65k, and
curses doesn't seem to work). any idea how to twist it so that it gets
linked in?
viktor, could you please, when you find some time, whip up some
support for this combination in hbmk2?
also a second look at the changes in contrib/hbtpathy/tpunix.c would
be great.
thanks,
Index: external/libpng/Makefile
===================================================================
--- external/libpng/Makefile (revision 12491)
+++ external/libpng/Makefile (working copy)
@@ -42,7 +42,7 @@
_DET_VAR_HAS_ := HB_HAS_PNG
_DET_FLT_PLAT :=
_DET_FLT_COMP :=
- _DET_INC_DEFP := /usr/include
+ _DET_INC_DEFP := /usr/include /boot/develop/headers/3rdparty
_DET_INC_LOCL := $(TOP)$(ROOT)external/libpng
_DET_INC_HEAD := /png.h
include $(TOP)$(ROOT)config/detfun.mk
Index: contrib/xhb/hbserv.c
===================================================================
--- contrib/xhb/hbserv.c (revision 12491)
+++ contrib/xhb/hbserv.c (working copy)
@@ -68,7 +68,9 @@
!defined( HB_OS_DARWIN_5 ) && \
! ( defined( HB_OS_WIN_CE ) && defined( __POCC__ ) ) && \
!defined( HB_OS_WIN_64 ) && \
- ( !defined( HB_OS_OS2 ) || defined( HB_OS_OS2_GCC ) )
+ ( !defined( HB_OS_OS2 ) || defined( HB_OS_OS2_GCC ) ) && \
+ !defined( HB_OS_HAIKU )
+/* TODO: Haiku will supposedly do this later on, read
/boot/develop/headers/posix/signal.h */
#if defined( HB_OS_UNIX ) || defined( HB_OS_OS2_GCC )
#include <sys/types.h>
Index: contrib/hbtpathy/tpunix.c
===================================================================
--- contrib/hbtpathy/tpunix.c (revision 12491)
+++ contrib/hbtpathy/tpunix.c (working copy)
@@ -125,8 +125,10 @@
/* Enable the receiver and set local mode... */
options.c_cflag |= ( CLOCAL | CREAD );
+#if defined( cfmakeraw )
/* Raw input from device */
cfmakeraw( &options );
+#endif
/* Reset data bits ( cfmakeraw() puts it to CS8 ) */
options.c_cflag &= ~CSIZE;
@@ -219,41 +221,49 @@
HB_FUNC( __TP_ISDCD )
{
+#if defined( TIOCMGET )
int status;
if ( ioctl( hb_parnl( 1 ), TIOCMGET, &status ) == 0 )
hb_retl( ( status & TIOCM_CD ) == TIOCM_CD );
else
+#endif
hb_retl( FALSE );
}
HB_FUNC( __TP_ISRI )
{
+#if defined( TIOCMGET )
int status;
if ( ioctl( hb_parnl( 1 ), TIOCMGET, &status ) == 0 )
hb_retl( ( status & TIOCM_RI ) == TIOCM_RI );
else
+#endif
hb_retl( FALSE );
}
HB_FUNC( __TP_ISDSR )
{
+#if defined( TIOCMGET )
int status;
if ( ioctl( hb_parnl( 1 ), TIOCMGET, &status ) == 0 )
hb_retl( ( status & TIOCM_DSR ) == TIOCM_DSR );
else
+#endif
hb_retl( FALSE );
}
HB_FUNC( __TP_ISCTS )
{
+#if defined( TIOCMGET )
int status;
if ( ioctl( hb_parnl( 1 ), TIOCMGET, &status ) == 0 )
hb_retl( ( status & TIOCM_CTS ) == TIOCM_CTS );
else
+#endif
hb_retl( FALSE );
}
Index: contrib/hbsqlit3/Makefile
===================================================================
--- contrib/hbsqlit3/Makefile (revision 12491)
+++ contrib/hbsqlit3/Makefile (working copy)
@@ -19,7 +19,7 @@
_DET_VAR_HAS_ := HB_HAS_SQLITE3
_DET_FLT_PLAT :=
_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include
+_DET_INC_DEFP := /usr/include /boot/common/include
_DET_INC_LOCL := $(TOP)$(ROOT)external/sqlite3
_DET_INC_HEAD := /sqlite3.h
include $(TOP)$(ROOT)config/detfun.mk
Index: config/detect.mk
===================================================================
--- config/detect.mk (revision 12491)
+++ config/detect.mk (working copy)
@@ -73,7 +73,7 @@
_DET_VAR_HAS_ := HB_HAS_OPENSSL
_DET_FLT_PLAT :=
_DET_FLT_COMP := !watcom
-_DET_INC_DEFP := /usr/include /usr/local/ssl/include
+_DET_INC_DEFP := /usr/include /usr/local/ssl/include /boot/common/include
_DET_INC_HEAD := /openssl/ssl.h
include $(TOP)$(ROOT)config/detfun.mk
--
[-]
mkdir /nonexistentIndex: external/libpng/Makefile
===================================================================
--- external/libpng/Makefile (revision 12491)
+++ external/libpng/Makefile (working copy)
@@ -42,7 +42,7 @@
_DET_VAR_HAS_ := HB_HAS_PNG
_DET_FLT_PLAT :=
_DET_FLT_COMP :=
- _DET_INC_DEFP := /usr/include
+ _DET_INC_DEFP := /usr/include /boot/develop/headers/3rdparty
_DET_INC_LOCL := $(TOP)$(ROOT)external/libpng
_DET_INC_HEAD := /png.h
include $(TOP)$(ROOT)config/detfun.mk
Index: contrib/xhb/hbserv.c
===================================================================
--- contrib/xhb/hbserv.c (revision 12491)
+++ contrib/xhb/hbserv.c (working copy)
@@ -68,7 +68,9 @@
!defined( HB_OS_DARWIN_5 ) && \
! ( defined( HB_OS_WIN_CE ) && defined( __POCC__ ) ) && \
!defined( HB_OS_WIN_64 ) && \
- ( !defined( HB_OS_OS2 ) || defined( HB_OS_OS2_GCC ) )
+ ( !defined( HB_OS_OS2 ) || defined( HB_OS_OS2_GCC ) ) && \
+ !defined( HB_OS_HAIKU )
+/* TODO: Haiku will supposedly do this later on, read
/boot/develop/headers/posix/signal.h */
#if defined( HB_OS_UNIX ) || defined( HB_OS_OS2_GCC )
#include <sys/types.h>
Index: contrib/hbtpathy/tpunix.c
===================================================================
--- contrib/hbtpathy/tpunix.c (revision 12491)
+++ contrib/hbtpathy/tpunix.c (working copy)
@@ -125,8 +125,10 @@
/* Enable the receiver and set local mode... */
options.c_cflag |= ( CLOCAL | CREAD );
+#if defined( cfmakeraw )
/* Raw input from device */
cfmakeraw( &options );
+#endif
/* Reset data bits ( cfmakeraw() puts it to CS8 ) */
options.c_cflag &= ~CSIZE;
@@ -219,41 +221,49 @@
HB_FUNC( __TP_ISDCD )
{
+#if defined( TIOCMGET )
int status;
if ( ioctl( hb_parnl( 1 ), TIOCMGET, &status ) == 0 )
hb_retl( ( status & TIOCM_CD ) == TIOCM_CD );
else
+#endif
hb_retl( FALSE );
}
HB_FUNC( __TP_ISRI )
{
+#if defined( TIOCMGET )
int status;
if ( ioctl( hb_parnl( 1 ), TIOCMGET, &status ) == 0 )
hb_retl( ( status & TIOCM_RI ) == TIOCM_RI );
else
+#endif
hb_retl( FALSE );
}
HB_FUNC( __TP_ISDSR )
{
+#if defined( TIOCMGET )
int status;
if ( ioctl( hb_parnl( 1 ), TIOCMGET, &status ) == 0 )
hb_retl( ( status & TIOCM_DSR ) == TIOCM_DSR );
else
+#endif
hb_retl( FALSE );
}
HB_FUNC( __TP_ISCTS )
{
+#if defined( TIOCMGET )
int status;
if ( ioctl( hb_parnl( 1 ), TIOCMGET, &status ) == 0 )
hb_retl( ( status & TIOCM_CTS ) == TIOCM_CTS );
else
+#endif
hb_retl( FALSE );
}
Index: contrib/hbsqlit3/Makefile
===================================================================
--- contrib/hbsqlit3/Makefile (revision 12491)
+++ contrib/hbsqlit3/Makefile (working copy)
@@ -19,7 +19,7 @@
_DET_VAR_HAS_ := HB_HAS_SQLITE3
_DET_FLT_PLAT :=
_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include
+_DET_INC_DEFP := /usr/include /boot/common/include
_DET_INC_LOCL := $(TOP)$(ROOT)external/sqlite3
_DET_INC_HEAD := /sqlite3.h
include $(TOP)$(ROOT)config/detfun.mk
Index: config/detect.mk
===================================================================
--- config/detect.mk (revision 12491)
+++ config/detect.mk (working copy)
@@ -73,7 +73,7 @@
_DET_VAR_HAS_ := HB_HAS_OPENSSL
_DET_FLT_PLAT :=
_DET_FLT_COMP := !watcom
-_DET_INC_DEFP := /usr/include /usr/local/ssl/include
+_DET_INC_DEFP := /usr/include /usr/local/ssl/include /boot/common/include
_DET_INC_HEAD := /openssl/ssl.h
include $(TOP)$(ROOT)config/detfun.mk
_______________________________________________
Harbour mailing list
[email protected]
http://lists.harbour-project.org/mailman/listinfo/harbour
