From ddb6b397d500f37773e5ced331f7c11d23d18b4a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 10 Sep 2009 15:14:46 +0000 Subject: [PATCH] 2009-09-10 17:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * external/libhpdf/Makefile * external/libpng/Makefile * contrib/xhb/Makefile * contrib/hbmzip/Makefile * contrib/hbsqlit3/Makefile * contrib/hbqt/QApplication.cpp * contrib/hbhpdf/Makefile * source/rtl/Makefile * config/detfun.mk * config/detect.mk + Added separate variable to pass embedded locations to autodetection, so that these aren't suppressed by HB_XBUILD (now HB_BUILD_EXTDEF). I hope it will work, I still have to try it on Linux. --- harbour/ChangeLog | 15 +++++++++++++++ harbour/config/detect.mk | 6 ++++-- harbour/config/detfun.mk | 3 +++ harbour/contrib/hbhpdf/Makefile | 3 ++- harbour/contrib/hbmzip/Makefile | 3 ++- harbour/contrib/hbqt/QApplication.cpp | 14 +++++++------- harbour/contrib/hbsqlit3/Makefile | 3 ++- harbour/contrib/xhb/Makefile | 3 ++- harbour/external/libhpdf/Makefile | 6 ++++-- harbour/external/libpng/Makefile | 3 ++- harbour/source/rtl/Makefile | 6 ++++-- 11 files changed, 47 insertions(+), 18 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a461b1d332..1dd17541f8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,21 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-10 17:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * external/libhpdf/Makefile + * external/libpng/Makefile + * contrib/xhb/Makefile + * contrib/hbmzip/Makefile + * contrib/hbsqlit3/Makefile + * contrib/hbqt/QApplication.cpp + * contrib/hbhpdf/Makefile + * source/rtl/Makefile + * config/detfun.mk + * config/detect.mk + + Added separate variable to pass embedded locations to autodetection, + so that these aren't suppressed by HB_XBUILD (now HB_BUILD_EXTDEF). + I hope it will work, I still have to try it on Linux. + 2009-09-10 15:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * Makefile - source/hbpcre diff --git a/harbour/config/detect.mk b/harbour/config/detect.mk index ea9b773d35..75ae1cbdcb 100644 --- a/harbour/config/detect.mk +++ b/harbour/config/detect.mk @@ -46,8 +46,9 @@ _DET_VAR_HAS_ := HB_HAS_ZLIB _DET_FLT_PLAT := _DET_FLT_COMP := _DET_INC_DEFP := /usr/include +_DET_INC_LOCL := ifneq ($(filter $(HB_PLATFORM),win wce os2 dos),) - _DET_INC_DEFP += $(TOP)$(ROOT)external/zlib + _DET_INC_LOCL += $(TOP)$(ROOT)external/zlib endif _DET_INC_HEAD := /zlib.h @@ -66,8 +67,9 @@ _DET_VAR_HAS_ := HB_HAS_PCRE _DET_FLT_PLAT := _DET_FLT_COMP := _DET_INC_DEFP := /usr/include /opt/local/include +_DET_INC_LOCL := ifneq ($(filter $(HB_PLATFORM),win wce os2 dos),) - _DET_INC_DEFP += $(TOP)$(ROOT)external/pcre + _DET_INC_LOCL += $(TOP)$(ROOT)external/pcre endif _DET_INC_HEAD := /pcre.h diff --git a/harbour/config/detfun.mk b/harbour/config/detfun.mk index 21017ba9c6..70add47469 100644 --- a/harbour/config/detfun.mk +++ b/harbour/config/detfun.mk @@ -18,6 +18,7 @@ # _DET_FLT_PLAT - positive and negative platform filters. Prefix negative ones with '!' char. # _DET_FLT_COMP - positive and negative compiler filters. Prefix negative ones with '!' char. # _DET_INC_DEFP - default location to look at. Not effective in 'HB_BUILD_EXTDEF=no' mode. +# _DET_INC_LOCL - embedded location to look at. # _DET_INC_HEAD - header filename to look for. Unless looking for a directory, prefix with forward slash. # - variable name specified by _DET_VAR_INC_ (typically "HB_INC_*") should contains: # (empty) or yes - will enable external component if found on default locations. @@ -70,6 +71,7 @@ ifeq ($($(_DET_VAR_HAS_)),) ifneq ($(HB_BUILD_EXTDEF),no) $(_DET_VAR_HAS_) := $(_DET_INC_DEFP) endif + $(_DET_VAR_HAS_) += $(_DET_INC_LOCL) endif ifneq ($($(_DET_VAR_HAS_)),) ifneq ($($(_DET_VAR_HAS_)),.) @@ -118,4 +120,5 @@ _DET_VAR_HAS_ := _DET_FLT_PLAT := _DET_FLT_COMP := _DET_INC_DEFP := +_DET_INC_LOCL := _DET_INC_HEAD := diff --git a/harbour/contrib/hbhpdf/Makefile b/harbour/contrib/hbhpdf/Makefile index 50f6428a78..ddcf853652 100644 --- a/harbour/contrib/hbhpdf/Makefile +++ b/harbour/contrib/hbhpdf/Makefile @@ -20,8 +20,9 @@ _DET_VAR_HAS_ := HB_HAS_LIBHARU _DET_FLT_PLAT := _DET_FLT_COMP := _DET_INC_DEFP := +_DET_INC_LOCL := ifneq ($(HB_HOST_PLAT),dos) - _DET_INC_DEFP += /usr/include /usr/local/include $(TOP)$(ROOT)external/libhpdf + _DET_INC_LOCL += /usr/include /usr/local/include $(TOP)$(ROOT)external/libhpdf endif _DET_INC_HEAD := /hpdf.h include $(TOP)$(ROOT)config/detfun.mk diff --git a/harbour/contrib/hbmzip/Makefile b/harbour/contrib/hbmzip/Makefile index d258bdea71..d6d4dd7f32 100644 --- a/harbour/contrib/hbmzip/Makefile +++ b/harbour/contrib/hbmzip/Makefile @@ -26,8 +26,9 @@ _DET_VAR_HAS_ := HB_HAS_ZLIB _DET_FLT_PLAT := _DET_FLT_COMP := _DET_INC_DEFP := /usr/include +_DET_INC_LOCL := ifneq ($(filter $(HB_PLATFORM),win wce os2 dos),) - _DET_INC_DEFP += $(TOP)$(ROOT)external/zlib + _DET_INC_LOCL += $(TOP)$(ROOT)external/zlib endif _DET_INC_HEAD := /zlib.h diff --git a/harbour/contrib/hbqt/QApplication.cpp b/harbour/contrib/hbqt/QApplication.cpp index 47923a48ed..b34956e296 100644 --- a/harbour/contrib/hbqt/QApplication.cpp +++ b/harbour/contrib/hbqt/QApplication.cpp @@ -89,6 +89,9 @@ void release_codeblocks(); static QApplication * app = NULL; static bool hbqtinit = false; +static int s_argc; +static char ** s_argv; + /* * QApplication ( int & argc, char ** argv ) * QApplication ( int & argc, char ** argv, bool GUIenabled ) @@ -129,15 +132,12 @@ static void hbqt_Exit( void * cargo ) static void hbqt_Init( void * cargo ) { - int argc; - char ** argv; - HB_SYMBOL_UNUSED( cargo ); - argc = hb_cmdargARGC(); - argv = hb_cmdargARGV(); + s_argc = hb_cmdargARGC(); + s_argv = hb_cmdargARGV(); - app = new QApplication( argc, argv ); + app = new QApplication( s_argc, s_argv ); if( app ) hbqtinit = true; @@ -145,7 +145,7 @@ static void hbqt_Init( void * cargo ) if( ! hbqtinit ) hb_errInternal( 11001, "hbqt_Init(): QT Initilization Error.", NULL, NULL ); - hb_cmdargInit( argc, argv ); + hb_cmdargInit( s_argc, s_argv ); hb_vmAtExit( hbqt_Exit, NULL ); } diff --git a/harbour/contrib/hbsqlit3/Makefile b/harbour/contrib/hbsqlit3/Makefile index 9aca32821d..13ad211bb2 100644 --- a/harbour/contrib/hbsqlit3/Makefile +++ b/harbour/contrib/hbsqlit3/Makefile @@ -20,8 +20,9 @@ _DET_VAR_HAS_ := HB_HAS_SQLITE3 _DET_FLT_PLAT := _DET_FLT_COMP := _DET_INC_DEFP := /usr/include +_DET_INC_LOCL := ifneq ($(filter $(HB_PLATFORM),win wce os2 dos),) - _DET_INC_DEFP += $(TOP)$(ROOT)external/sqlite3 + _DET_INC_LOCL += $(TOP)$(ROOT)external/sqlite3 endif _DET_INC_HEAD := /sqlite3.h include $(TOP)$(ROOT)config/detfun.mk diff --git a/harbour/contrib/xhb/Makefile b/harbour/contrib/xhb/Makefile index 1e659a8c6f..a0895d64be 100644 --- a/harbour/contrib/xhb/Makefile +++ b/harbour/contrib/xhb/Makefile @@ -92,8 +92,9 @@ _DET_VAR_HAS_ := HB_HAS_ZLIB _DET_FLT_PLAT := _DET_FLT_COMP := _DET_INC_DEFP := /usr/include +_DET_INC_LOCL := ifneq ($(filter $(HB_PLATFORM),win wce os2 dos),) - _DET_INC_DEFP += $(TOP)$(ROOT)external/zlib + _DET_INC_LOCL += $(TOP)$(ROOT)external/zlib endif _DET_INC_HEAD := /zlib.h diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile index a9d11c8e59..279d96aaa5 100644 --- a/harbour/external/libhpdf/Makefile +++ b/harbour/external/libhpdf/Makefile @@ -90,8 +90,9 @@ ifneq ($(HB_INC_LIBHARU),no) _DET_FLT_PLAT := _DET_FLT_COMP := _DET_INC_DEFP := /usr/include + _DET_INC_LOCL := ifneq ($(filter $(HB_PLATFORM),win wce os2 dos darwin),) - _DET_INC_DEFP += $(TOP)$(ROOT)external/libpng + _DET_INC_LOCL += $(TOP)$(ROOT)external/libpng endif _DET_INC_HEAD := /png.h include $(TOP)$(ROOT)config/detfun.mk @@ -107,8 +108,9 @@ ifneq ($(HB_INC_LIBHARU),no) _DET_FLT_PLAT := _DET_FLT_COMP := _DET_INC_DEFP := /usr/include + _DET_INC_LOCL := ifneq ($(filter $(HB_PLATFORM),win wce os2 dos),) - _DET_INC_DEFP += $(TOP)$(ROOT)external/zlib + _DET_INC_LOCL += $(TOP)$(ROOT)external/zlib endif _DET_INC_HEAD := /zlib.h diff --git a/harbour/external/libpng/Makefile b/harbour/external/libpng/Makefile index d2fb45112a..124fb40b8b 100644 --- a/harbour/external/libpng/Makefile +++ b/harbour/external/libpng/Makefile @@ -61,8 +61,9 @@ ifeq ($(HB_WITH_LIBPNG),yes) _DET_FLT_PLAT := _DET_FLT_COMP := _DET_INC_DEFP := /usr/include + _DET_INC_LOCL := ifneq ($(filter $(HB_PLATFORM),win wce os2 dos),) - _DET_INC_DEFP += $(TOP)$(ROOT)external/zlib + _DET_INC_LOCL += $(TOP)$(ROOT)external/zlib endif _DET_INC_HEAD := /zlib.h diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile index f2097d07df..ec2aec499c 100644 --- a/harbour/source/rtl/Makefile +++ b/harbour/source/rtl/Makefile @@ -289,8 +289,9 @@ _DET_VAR_HAS_ := HB_HAS_ZLIB _DET_FLT_PLAT := _DET_FLT_COMP := _DET_INC_DEFP := /usr/include +_DET_INC_LOCL := ifneq ($(filter $(HB_PLATFORM),win wce os2 dos),) - _DET_INC_DEFP += $(TOP)$(ROOT)external/zlib + _DET_INC_LOCL += $(TOP)$(ROOT)external/zlib endif _DET_INC_HEAD := /zlib.h @@ -309,8 +310,9 @@ ifneq ($(HB_HAS_ZLIB),) _DET_FLT_PLAT := _DET_FLT_COMP := _DET_INC_DEFP := /usr/include /opt/local/include + _DET_INC_LOCL := ifneq ($(filter $(HB_PLATFORM),win wce os2 dos),) - _DET_INC_DEFP += $(TOP)$(ROOT)external/pcre + _DET_INC_LOCL += $(TOP)$(ROOT)external/pcre endif _DET_INC_HEAD := /pcre.h