From 8be6e1e194a7bf7b76cfe9105d83ea2ec548527d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 8 Mar 2009 17:11:19 +0000 Subject: [PATCH] 2009-03-08 18:04 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * INSTALL + Added short information for Darwin/MacPorts and contribs. * contrib/hbmysql/Makefile * contrib/gtalleg/Makefile * contrib/rddsql/sddmy/Makefile * contrib/rddsql/sddpg/Makefile * contrib/hbpgsql/Makefile + Enabled on Darwin (for MacPorts). * include/hbdefs.h * contrib/hbfimage/fi_wrp.c * contrib/hbfimage/Makefile + Enabled on Darwin (for MacPorts). + Added ugly hack to make it compile on Darwin. * contrib/hbtpathy/Makefile + Enabled on Darwin. --- harbour/ChangeLog | 20 ++++++++++++++++++++ harbour/INSTALL | 6 ++++++ harbour/contrib/gtalleg/Makefile | 2 +- harbour/contrib/hbfimage/Makefile | 2 +- harbour/contrib/hbfimage/fi_wrp.c | 1 + harbour/contrib/hbmysql/Makefile | 2 +- harbour/contrib/hbpgsql/Makefile | 2 +- harbour/contrib/hbtpathy/Makefile | 6 ++++++ harbour/contrib/rddsql/sddmy/Makefile | 2 +- harbour/contrib/rddsql/sddpg/Makefile | 2 +- harbour/include/hbdefs.h | 6 ++++-- 11 files changed, 43 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4175a5dad2..bf185930ed 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,26 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-03-08 18:04 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * INSTALL + + Added short information for Darwin/MacPorts and contribs. + + * contrib/hbmysql/Makefile + * contrib/gtalleg/Makefile + * contrib/rddsql/sddmy/Makefile + * contrib/rddsql/sddpg/Makefile + * contrib/hbpgsql/Makefile + + Enabled on Darwin (for MacPorts). + + * include/hbdefs.h + * contrib/hbfimage/fi_wrp.c + * contrib/hbfimage/Makefile + + Enabled on Darwin (for MacPorts). + + Added ugly hack to make it compile on Darwin. + + * contrib/hbtpathy/Makefile + + Enabled on Darwin. + 2009-03-08 15:56 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg + Normalizing paths of cfg files. diff --git a/harbour/INSTALL b/harbour/INSTALL index 3fc04de326..c4a5b146f0 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -152,6 +152,12 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD - Don't put the dir inside double quotes. - Use absolute paths. + Darwin (OS X) + ------------- + 1.) Install MacPorts, follow their instructions: + http://www.macports.org/ + 2.) sudo port install allegro freeimage gd2 mysql5-devel postgresql83 + SUPPORTED C COMPILERS UNDER DIFFERENT PLATFORMS =============================================== diff --git a/harbour/contrib/gtalleg/Makefile b/harbour/contrib/gtalleg/Makefile index b21b750c02..d4dd7163e2 100644 --- a/harbour/contrib/gtalleg/Makefile +++ b/harbour/contrib/gtalleg/Makefile @@ -13,7 +13,7 @@ ifneq ($(HB_COMPILER),owatcom) ifeq ($(HB_INC_ALLEGRO),) ifeq ($(HB_XBUILD),) -HB_INC_ALLEGRO = /usr/include +HB_INC_ALLEGRO = /usr/include /opt/local/include endif endif diff --git a/harbour/contrib/hbfimage/Makefile b/harbour/contrib/hbfimage/Makefile index 1b00256c60..e4eb49d501 100644 --- a/harbour/contrib/hbfimage/Makefile +++ b/harbour/contrib/hbfimage/Makefile @@ -12,7 +12,7 @@ ifneq ($(HB_ARCHITECTURE),dos) ifeq ($(HB_INC_FREEIMAGE),) ifeq ($(HB_XBUILD),) -HB_INC_FREEIMAGE = /usr/include +HB_INC_FREEIMAGE = /usr/include /opt/local/include endif endif diff --git a/harbour/contrib/hbfimage/fi_wrp.c b/harbour/contrib/hbfimage/fi_wrp.c index 741df07535..a7957f6351 100644 --- a/harbour/contrib/hbfimage/fi_wrp.c +++ b/harbour/contrib/hbfimage/fi_wrp.c @@ -52,6 +52,7 @@ #define HB_DONT_DEFINE_BOOL #define HB_DONT_DEFINE_LONG +#define HB_DONT_DEFINE_BYTE #if defined(WINNT) || defined(_Windows) || defined(__NT__) || defined(_WIN32) || defined(__WINDOWS_386__) || defined(__WIN32__) || defined(__CYGWIN__) #if !defined(_WINDOWS_) && ( defined(__GNUC__) || defined(__POCC__) || defined(__XCC__) ) || defined(__WATCOMC__) diff --git a/harbour/contrib/hbmysql/Makefile b/harbour/contrib/hbmysql/Makefile index 452a09e027..50b0931c56 100644 --- a/harbour/contrib/hbmysql/Makefile +++ b/harbour/contrib/hbmysql/Makefile @@ -8,7 +8,7 @@ LIBNAME=hbmysql ifeq ($(HB_INC_MYSQL),) ifeq ($(HB_XBUILD),) -HB_INC_MYSQL = /usr/include/mysql +HB_INC_MYSQL = /usr/include/mysql /opt/local/include/mysql5/mysql endif endif diff --git a/harbour/contrib/hbpgsql/Makefile b/harbour/contrib/hbpgsql/Makefile index cc052ad894..186b076269 100644 --- a/harbour/contrib/hbpgsql/Makefile +++ b/harbour/contrib/hbpgsql/Makefile @@ -8,7 +8,7 @@ LIBNAME=hbpgsql ifeq ($(HB_INC_PGSQL),) ifeq ($(HB_XBUILD),) -HB_INC_PGSQL = /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include +HB_INC_PGSQL = /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include /opt/local/include/postgresql83 endif endif diff --git a/harbour/contrib/hbtpathy/Makefile b/harbour/contrib/hbtpathy/Makefile index c3bb8b87f6..ed05ae29cc 100644 --- a/harbour/contrib/hbtpathy/Makefile +++ b/harbour/contrib/hbtpathy/Makefile @@ -13,6 +13,12 @@ C_SOURCES=\ tplinux.c \ tpcommon.c \ +endif +ifeq ($(HB_ARCHITECTURE),darwin) +C_SOURCES=\ + tplinux.c \ + tpcommon.c \ + endif ifeq ($(HB_ARCHITECTURE),win) C_SOURCES=\ diff --git a/harbour/contrib/rddsql/sddmy/Makefile b/harbour/contrib/rddsql/sddmy/Makefile index 8b5d1b5826..39a469f769 100644 --- a/harbour/contrib/rddsql/sddmy/Makefile +++ b/harbour/contrib/rddsql/sddmy/Makefile @@ -8,7 +8,7 @@ LIBNAME=sddmy ifeq ($(HB_INC_MYSQL),) ifeq ($(HB_XBUILD),) -HB_INC_MYSQL = /usr/include/mysql +HB_INC_MYSQL = /usr/include/mysql /opt/local/include/mysql5/mysql endif endif diff --git a/harbour/contrib/rddsql/sddpg/Makefile b/harbour/contrib/rddsql/sddpg/Makefile index f62c6c1d42..c7e9beea2a 100644 --- a/harbour/contrib/rddsql/sddpg/Makefile +++ b/harbour/contrib/rddsql/sddpg/Makefile @@ -8,7 +8,7 @@ LIBNAME=sddpg ifeq ($(HB_INC_PGSQL),) ifeq ($(HB_XBUILD),) -HB_INC_PGSQL = /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include +HB_INC_PGSQL = /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include /opt/local/include/postgresql83 endif endif diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index 849aa0b8ed..1bc40ede26 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -206,8 +206,10 @@ #undef UCHAR /* 1 byte unsigned */ typedef unsigned char UCHAR; - #undef BYTE /* 1 byte unsigned */ - typedef unsigned char BYTE; + #if ! defined( HB_DONT_DEFINE_BYTE ) + #undef BYTE /* 1 byte unsigned */ + typedef unsigned char BYTE; + #endif #undef SHORT /* 2 bytes signed */ typedef short int SHORT;