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

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

Browse Source 
* 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.
This commit is contained in:
Viktor Szakats
2009-09-10 15:14:46 +00:00
parent 8a6466e7fd
commit ddb6b397d5
11 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -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

6
harbour/config/detect.mk
View File

@@ -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

3
harbour/config/detfun.mk
View File

@@ -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 :=

3
harbour/contrib/hbhpdf/Makefile
View File

@@ -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

3
harbour/contrib/hbmzip/Makefile
View File

@@ -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

14
harbour/contrib/hbqt/QApplication.cpp
View File

@@ -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 );
}

3
harbour/contrib/hbsqlit3/Makefile
View File

@@ -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

3
harbour/contrib/xhb/Makefile
View File

@@ -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

6
harbour/external/libhpdf/Makefile vendored
View File

@@ -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

3
harbour/external/libpng/Makefile vendored
View File

@@ -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

6
harbour/source/rtl/Makefile
View File

@@ -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