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

2009-09-11 03:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* INSTALL
    + Added Ubuntu pcre and zlib pkg information.
    + Documented HB_INC_ZLIB and HB_INC_PCRE settings.
    + Documented 'local' setting of HB_INC_* values.

  * external/libhpdf/Makefile
  * external/libpng/Makefile
  * source/rtl/Makefile
  * contrib/xhb/Makefile
  * contrib/hbmzip/Makefile
  * contrib/hbsqlit3/Makefile
  * contrib/hbhpdf/Makefile
  * config/detfun.mk
  * config/detect.mk
    % Avoid redetection for local packages.
    + Integrated logic to find out whether we're using the local
      copy of any given package. This is now returned in a
      variable called HB_HAS_*_LOCAL, if this value is non-empty
      we're using the local version.
    + Added HB_INC_* option 'local', which will force using the
      locally hosted version of given package.
    + HB_HAS_* variable will now contain only the first dir where
      header was detected.
    + Locally hosted headers will always be detected now, if they
      weren't found at any default system locations.
    + Added 'nolocal' HB_INC_* option which disables above behaviour.
    ; TODO: Delete _DET_LOC_PLAT variable if current system turns
            out to work well.
    ; NOTE: I've yet to test all this on *nix.

  * config/global.mk
    + Added HB_HOST_PLAT_UNIX variable.

  * contrib/hbhpdf/Makefile
    ! Fixed mistake in prev commit.

  * contrib/gtwvg/Makefile
  * source/rtl/gttrm/Makefile
  * external/sqlite3/Makefile
  * external/libhpdf/Makefile
  * external/libpng/Makefile
    % Optimization in make logic in GTWVG Makefile.
    - HB_WITH_* vars changed to not aid user override.
    + Displaying more meaningful reason if skipped.
    + compiler/platform availability checks laxed to reflect real buildability
      (will most probably need refinements), so that it becomes possible to
      use these even on *nix platforms, in case the system hosted copy is not
      good for us or not available.
    + Now these will be built if autodetections reveals that local version
      is to be used.
    * Renamed HB_WITH_* vars to HB_SUPPORTED to not collide with HB_WITH_*
      concept which is due to replace HB_INC_*.
    ; IOW: Now it should be possible to enable these locally hosted components
           on any systems/scenarios where compilation of the given component
           is supported. This happens automatically according to HB_INC_*
           variables.
This commit is contained in:
Viktor Szakats
2009-09-11 01:37:44 +00:00
parent 34e6ddd4c8
commit 84b016778c
17 changed files with 250 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
harbour/ChangeLog
View File

@@ -17,6 +17,64 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-09-11 03:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
+ Added Ubuntu pcre and zlib pkg information.
+ Documented HB_INC_ZLIB and HB_INC_PCRE settings.
+ Documented 'local' setting of HB_INC_* values.
* external/libhpdf/Makefile
* external/libpng/Makefile
* source/rtl/Makefile
* contrib/xhb/Makefile
* contrib/hbmzip/Makefile
* contrib/hbsqlit3/Makefile
* contrib/hbhpdf/Makefile
* config/detfun.mk
* config/detect.mk
% Avoid redetection for local packages.
+ Integrated logic to find out whether we're using the local
copy of any given package. This is now returned in a
variable called HB_HAS_*_LOCAL, if this value is non-empty
we're using the local version.
+ Added HB_INC_* option 'local', which will force using the
locally hosted version of given package.
+ HB_HAS_* variable will now contain only the first dir where
header was detected.
+ Locally hosted headers will always be detected now, if they
weren't found at any default system locations.
+ Added 'nolocal' HB_INC_* option which disables above behaviour.
; TODO: Delete _DET_LOC_PLAT variable if current system turns
out to work well.
; NOTE: I've yet to test all this on *nix.
* config/global.mk
+ Added HB_HOST_PLAT_UNIX variable.
* contrib/hbhpdf/Makefile
! Fixed mistake in prev commit.
* contrib/gtwvg/Makefile
* source/rtl/gttrm/Makefile
* external/sqlite3/Makefile
* external/libhpdf/Makefile
* external/libpng/Makefile
% Optimization in make logic in GTWVG Makefile.
- HB_WITH_* vars changed to not aid user override.
+ Displaying more meaningful reason if skipped.
+ compiler/platform availability checks laxed to reflect real buildability
(will most probably need refinements), so that it becomes possible to
use these even on *nix platforms, in case the system hosted copy is not
good for us or not available.
+ Now these will be built if autodetections reveals that local version
is to be used.
* Renamed HB_WITH_* vars to HB_SUPPORTED to not collide with HB_WITH_*
concept which is due to replace HB_INC_*.
; IOW: Now it should be possible to enable these locally hosted components
on any systems/scenarios where compilation of the given component
is supported. This happens automatically according to HB_INC_*
variables.
2009-09-10 21:36 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
+ Added new section "HOW TO CONTRIBUTE". Very short, ideas are

10
harbour/INSTALL
View File

@@ -220,17 +220,21 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD
HB_INC_MYSQL=C:\mysql\include
HB_INC_ODBC= (may only be needed on non-Windows systems)
HB_INC_OPENSSL=C:\openssl\inc32 OR C:\openssl\include
HB_INC_PCRE=C:\pcre (defaults to locally hosted version on win/dos/os2)
HB_INC_PNG= (defaults to locally hosted version on non-*nix and Darwin systems)
HB_INC_PGSQL=C:\pgsql\include
HB_INC_QT=C:\Qt\include
HB_INC_SLANG= (on *nix systems)
HB_INC_SQLITE3=C:\sqlite3 (defaults to locally hosted version on win/dos/os2)
HB_INC_X11= (on *nix systems)
HB_INC_ZLIB=C:\zlib (defaults to locally hosted version on win/dos/os2)
HB_INC_WATT= (on MS-DOS systems)
To explicitly disable any given components, use the value 'no' (without
quotes). This may be useful to avoid autodetection of installed packages
on *nix systems.
on *nix systems. You may also use the value 'local' to force using the
locally hosted copy of these packages, where applicable. 'nolocal' will
explicitly disable using locally hosted copies.
NOTES: - You need to use native path format to your shell/OS.
- Spaces in directory names aren't currently supported.
@@ -243,7 +247,7 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD
Some contribs support build mode in which they can be linked
*statically* with 3rd party components:
HB_QT_STATIC=yes (only for Windows/Windows CE targets)
HB_QT_STATIC=yes
Darwin (Mac OS X)
-----------------
@@ -265,6 +269,8 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD
----------------------
(tested with Ubuntu 7.04, 8.04, 9.04)
for zlib support: sudo apt-get install zlib1g-dev
for pcre regex support: sudo apt-get install libpcre3-dev
for gtcrs terminal lib: sudo apt-get install libncurses-dev
for gtsln terminal lib: sudo apt-get install libslang2-dev
for gtxwc terminal lib: sudo apt-get install libx11-dev

40
harbour/config/detect.mk
View File

@@ -18,14 +18,16 @@ export DETECT_MK_ := yes
_DET_OPT_VERB := very
# Reset everything to default
export HB_HAS_ZLIB :=
export HB_HAS_PCRE :=
export HB_HAS_OPENSSL :=
export HB_HAS_GPM :=
export HB_HAS_SLANG :=
export HB_HAS_CURSES :=
export HB_HAS_X11 :=
export HB_HAS_WATT :=
export HB_HAS_ZLIB :=
export HB_HAS_ZLIB_LOCAL :=
export HB_HAS_PCRE :=
export HB_HAS_PCRE_LOCAL :=
export HB_HAS_OPENSSL :=
export HB_HAS_GPM :=
export HB_HAS_SLANG :=
export HB_HAS_CURSES :=
export HB_HAS_X11 :=
export HB_HAS_WATT :=
# Exclude Harbour-wide features prohibiting commercial use
@@ -46,19 +48,12 @@ _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_LOCL += $(TOP)$(ROOT)external/zlib
endif
_DET_INC_LOCL := $(realpath $(TOP)$(ROOT)external/zlib)
_DET_LOC_PLAT := win wce os2 dos
_DET_INC_HEAD := /zlib.h
include $(TOP)$(ROOT)config/detfun.mk
export HB_HAS_ZLIB_LOCAL := no
ifneq ($(findstring /external/,$(HB_HAS_ZLIB)),)
HB_HAS_ZLIB_LOCAL := yes
endif
# Detect pcre
_DET_DSP_NAME := pcre
@@ -67,19 +62,12 @@ _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_LOCL += $(TOP)$(ROOT)external/pcre
endif
_DET_INC_LOCL := $(realpath $(TOP)$(ROOT)external/pcre)
_DET_LOC_PLAT := win wce os2 dos
_DET_INC_HEAD := /pcre.h
include $(TOP)$(ROOT)config/detfun.mk
export HB_HAS_PCRE_LOCAL := no
ifneq ($(findstring /external/,$(HB_HAS_PCRE)),)
HB_HAS_PCRE_LOCAL := yes
endif
# Detect OpenSSL
_DET_DSP_NAME := openssl

31
harbour/config/detfun.mk
View File

@@ -19,12 +19,16 @@
# _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_LOC_PLAT - positive and negative platform filters where embedded location is utilized.
# _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.
# no - will disable external component.
# force - will forcibly enable external component, bypass location checks,
# HB_HAS_* will have the content '.' (as local dir).
# force - will forcibly enable external component, bypassing location checks,
# HB_HAS_* will have the content '.' (as local dir). In this case user
# is responsible to pass -I C compiler option manually.
# local - will choose locally hosted version of external component.
# nolocal - will disable using locally hosted version of external component.
# <dirlist> - will specify locations to check for the external component.
# ON RETURN:
# - above variables cleared.
@@ -33,6 +37,8 @@
# have any these values:
# (empty) - we can't use this component
# <dirlist> - component headers were found at these locations (typically one)
# - variable name specified in _DET_VAR_HAS_ + "_LOCAL" (typically "HB_HAS_*_LOCAL") will
# be non-empty if we're using the locally hosted version of the package.
# show verbose information (empty|yes|very)
ifneq ($(_DET_OPT_VERB),)
@@ -72,15 +78,31 @@ ifeq ($($(_DET_VAR_HAS_)),)
$(_DET_VAR_HAS_) := $(_DET_INC_DEFP)
endif
$(_DET_VAR_HAS_) += $(_DET_INC_LOCL)
else
ifeq ($($(_DET_VAR_HAS_)),nolocal)
ifneq ($(HB_BUILD_EXTDEF),no)
$(_DET_VAR_HAS_) := $(_DET_INC_DEFP)
endif
endif
endif
ifeq ($($(_DET_VAR_INC_)),local)
$(_DET_VAR_HAS_) := $(_DET_INC_LOCL)
endif
ifneq ($($(_DET_VAR_HAS_)),)
ifneq ($($(_DET_VAR_HAS_)),.)
$(_DET_VAR_HAS_) := $(strip $(foreach d,$($(_DET_VAR_HAS_)),$(if $(wildcard $(d)$(_DET_INC_HEAD)),$(d),)))
$(_DET_VAR_HAS_) := $(strip $(firstword $(foreach d,$($(_DET_VAR_HAS_)),$(if $(wildcard $(d)$(_DET_INC_HEAD)),$(d),))))
ifeq ($($(_DET_VAR_HAS_)),)
_DET_RES_TEXT := '$(_DET_DSP_NAME)' not found
$(call do_info,$(_DET_RES_TEXT))
else
_DET_RES_TEXT := '$(_DET_DSP_NAME)' found in $($(_DET_VAR_HAS_))
# detect if the component was found in locally hosted dir
$(_DET_VAR_HAS_)_LOCAL :=
ifneq ($(_DET_INC_LOCL),)
ifneq ($(filter $(_DET_INC_LOCL),$($(_DET_VAR_HAS_))),)
$(_DET_VAR_HAS_)_LOCAL := (local)
endif
endif
_DET_RES_TEXT := '$(_DET_DSP_NAME)' found in $($(_DET_VAR_HAS_)) $($(_DET_VAR_HAS_)_LOCAL)
ifeq ($(_DET_OPT_VERB),very)
$(call do_info,$(_DET_RES_TEXT))
endif
@@ -121,4 +143,5 @@ _DET_FLT_PLAT :=
_DET_FLT_COMP :=
_DET_INC_DEFP :=
_DET_INC_LOCL :=
_DET_LOC_PLAT :=
_DET_INC_HEAD :=

6
harbour/config/global.mk
View File

@@ -807,6 +807,12 @@ export HB_PLATFORM
export HB_COMPILER
export HB_SHELL
ifneq ($(filter $(HB_HOST_PLAT),win wce dos os2),)
HB_HOST_PLAT_UNIX :=
else
HB_HOST_PLAT_UNIX := yes
endif
ifneq ($(filter $(HB_PLATFORM),win wce dos os2),)
HB_PLATFORM_UNIX :=
else

28
harbour/contrib/gtwvg/Makefile
View File

@@ -54,36 +54,20 @@ PRG_HEADERS := \
wvtwin.ch \
wvgparts.ch \
ifeq ($(HB_WITH_GTWVG),)
ifeq ($(HB_PLATFORM),win)
ifeq ($(HB_COMPILER),mingw)
HB_WITH_GTWVG := yes
endif
ifeq ($(HB_COMPILER),msvc)
HB_WITH_GTWVG := yes
endif
ifeq ($(HB_COMPILER),watcom)
HB_WITH_GTWVG := yes
endif
ifeq ($(HB_COMPILER),pocc)
HB_WITH_GTWVG := yes
endif
ifeq ($(HB_COMPILER),icc)
HB_WITH_GTWVG := yes
endif
ifeq ($(HB_COMPILER),bcc)
HB_WITH_GTWVG := yes
endif
HB_SUPPORTED := no
ifeq ($(HB_PLATFORM),win)
ifneq ($(filter $(HB_COMPILER),mingw msvc watcom pocc icc bcc),)
HB_SUPPORTED := yes
endif
endif
ifeq ($(HB_WITH_GTWVG),yes)
ifeq ($(HB_SUPPORTED),yes)
HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbwin
include $(TOP)$(ROOT)config/header.mk
include $(TOP)$(ROOT)config/lib.mk
else
HB_SKIP_REASON := platform or compiler not supported
include $(TOP)$(ROOT)config/none.mk
endif

8
harbour/contrib/hbhpdf/Makefile
View File

@@ -19,11 +19,9 @@ _DET_VAR_INC_ := HB_INC_LIBHARU
_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_LOCL += /usr/include /usr/local/include $(TOP)$(ROOT)external/libhpdf
endif
_DET_INC_DEFP := /usr/include /usr/local/include
_DET_INC_LOCL := $(TOP)$(ROOT)external/libhpdf
_DET_LOC_PLAT := !dos
_DET_INC_HEAD := /hpdf.h
include $(TOP)$(ROOT)config/detfun.mk

17
harbour/contrib/hbmzip/Makefile
View File

@@ -17,23 +17,6 @@ C_SOURCES := \
PRG_HEADERS := \
hbmzip.ch
# force redetection
HB_HAS_ZLIB :=
_DET_DSP_NAME := zlib
_DET_VAR_INC_ := HB_INC_ZLIB
_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_LOCL += $(TOP)$(ROOT)external/zlib
endif
_DET_INC_HEAD := /zlib.h
include $(TOP)$(ROOT)config/detfun.mk
ifneq ($(HB_HAS_ZLIB),)
HB_CFLAGS += -DHB_HAS_ZLIB $(foreach d,$(HB_HAS_ZLIB),-I$(d))

7
harbour/contrib/hbsqlit3/Makefile
View File

@@ -20,10 +20,8 @@ _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_LOCL += $(TOP)$(ROOT)external/sqlite3
endif
_DET_INC_LOCL := $(TOP)$(ROOT)external/sqlite3
_DET_LOC_PLAT := win wce os2 dos
_DET_INC_HEAD := /sqlite3.h
include $(TOP)$(ROOT)config/detfun.mk
@@ -33,7 +31,6 @@ ifneq ($(HB_HAS_SQLITE3),)
include $(TOP)$(ROOT)config/header.mk
include $(TOP)$(ROOT)config/lib.mk
else
HB_SKIP_REASON := $(_DET_RES_TEXT)
include $(TOP)$(ROOT)config/none.mk

17
harbour/contrib/xhb/Makefile
View File

@@ -83,23 +83,6 @@ PRG_HEADERS := \
hbcompat.ch \
xhb.ch \
# force redetection
HB_HAS_ZLIB :=
_DET_DSP_NAME := zlib
_DET_VAR_INC_ := HB_INC_ZLIB
_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_LOCL += $(TOP)$(ROOT)external/zlib
endif
_DET_INC_HEAD := /zlib.h
include $(TOP)$(ROOT)config/detfun.mk
ifneq ($(HB_HAS_ZLIB),)
HB_CFLAGS += -DHB_HAS_ZLIB $(foreach d,$(HB_HAS_ZLIB),-I$(d))

91
harbour/external/libhpdf/Makefile vendored
View File

@@ -65,76 +65,73 @@ C_SOURCES := \
hpdfutil.c \
hpdfxref.c \
# decide whether to build it locally
ifeq ($(HB_INC_LIBHARU),)
HB_INC_LIBHARU := yes
ifeq ($(HB_PLATFORM)-$(HB_COMPILER),win-watcom)
HB_INC_LIBHARU := no
endif
ifeq ($(HB_COMPILER),pocc64)
HB_INC_LIBHARU := no
endif
ifeq ($(HB_PLATFORM),wce)
HB_INC_LIBHARU := no
endif
ifeq ($(HB_COMPILER),mingwarm)
HB_INC_LIBHARU := yes
endif
# decide if it's supported at all
HB_SUPPORTED := yes
ifeq ($(HB_PLATFORM)-$(HB_COMPILER),win-watcom)
HB_SUPPORTED := no
endif
ifeq ($(HB_COMPILER),pocc64)
HB_SUPPORTED := no
endif
ifeq ($(HB_PLATFORM),wce)
HB_SUPPORTED := no
endif
ifeq ($(HB_COMPILER),mingwarm)
HB_SUPPORTED := yes
endif
ifneq ($(HB_INC_LIBHARU),no)
ifeq ($(HB_SUPPORTED),yes)
_DET_DSP_NAME := libpng
_DET_VAR_INC_ := HB_INC_PNG
_DET_VAR_HAS_ := HB_HAS_PNG
_DET_DSP_NAME := libharu
_DET_VAR_INC_ := HB_INC_LIBHARU
_DET_VAR_HAS_ := HB_HAS_LIBHARU
_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_LOCL += $(TOP)$(ROOT)external/libpng
endif
_DET_INC_HEAD := /png.h
_DET_INC_DEFP := /usr/include /usr/local/include
_DET_INC_LOCL := $(TOP)$(ROOT)external/libhpdf
_DET_LOC_PLAT := !dos
_DET_INC_HEAD := /hpdf.h
include $(TOP)$(ROOT)config/detfun.mk
ifneq ($(HB_HAS_PNG),)
ifneq ($(HB_HAS_LIBHARU_LOCAL),)
# force redetection
HB_HAS_ZLIB :=
_DET_DSP_NAME := zlib
_DET_VAR_INC_ := HB_INC_ZLIB
_DET_VAR_HAS_ := HB_HAS_ZLIB
_DET_DSP_NAME := libpng
_DET_VAR_INC_ := HB_INC_PNG
_DET_VAR_HAS_ := HB_HAS_PNG
_DET_FLT_PLAT :=
_DET_FLT_COMP :=
_DET_INC_DEFP := /usr/include
_DET_INC_LOCL :=
ifneq ($(filter $(HB_PLATFORM),win wce os2 dos),)
_DET_INC_LOCL += $(TOP)$(ROOT)external/zlib
endif
_DET_INC_HEAD := /zlib.h
_DET_INC_LOCL := $(TOP)$(ROOT)external/libpng
_DET_LOC_PLAT := win wce os2 dos darwin
_DET_INC_HEAD := /png.h
include $(TOP)$(ROOT)config/detfun.mk
ifneq ($(HB_HAS_ZLIB),)
ifneq ($(HB_HAS_PNG),)
HB_CFLAGS += $(foreach d,$(HB_HAS_ZLIB),-I$(d))
HB_CFLAGS += $(foreach d,$(HB_HAS_PNG),-I$(d))
ifneq ($(HB_HAS_ZLIB),)
ifeq ($(HB_COMPILER),mingwarm)
HB_CFLAGS += -U__COREDLL__
HB_CFLAGS += $(foreach d,$(HB_HAS_ZLIB),-I$(d))
HB_CFLAGS += $(foreach d,$(HB_HAS_PNG),-I$(d))
ifeq ($(HB_COMPILER),mingwarm)
HB_CFLAGS += -U__COREDLL__
endif
include $(TOP)$(ROOT)config/header.mk
include $(TOP)$(ROOT)config/lib.mk
else
HB_SKIP_REASON := $(_DET_RES_TEXT)
include $(TOP)$(ROOT)config/none.mk
endif
include $(TOP)$(ROOT)config/header.mk
include $(TOP)$(ROOT)config/lib.mk
else
HB_SKIP_REASON := $(_DET_RES_TEXT)
include $(TOP)$(ROOT)config/none.mk
endif
else
HB_SKIP_REASON := $(_DET_RES_TEXT)
HB_SKIP_REASON := unused
include $(TOP)$(ROOT)config/none.mk
endif
else
HB_SKIP_REASON := platform or compiler not supported
include $(TOP)$(ROOT)config/none.mk
endif

64
harbour/external/libpng/Makefile vendored
View File

@@ -29,59 +29,45 @@ C_SOURCES := \
pngwtran.c \
pngwutil.c \
ifeq ($(HB_WITH_LIBPNG),)
ifeq ($(HB_PLATFORM),win)
HB_WITH_LIBPNG := yes
endif
ifeq ($(HB_PLATFORM),wce)
HB_WITH_LIBPNG := yes
endif
ifeq ($(HB_PLATFORM),os2)
HB_WITH_LIBPNG := yes
endif
ifeq ($(HB_PLATFORM),dos)
HB_WITH_LIBPNG := yes
endif
ifeq ($(HB_PLATFORM),darwin)
HB_WITH_LIBPNG := yes
endif
ifeq ($(HB_COMPILER),poccarm)
HB_WITH_LIBPNG := no
endif
# decide if it's supported at all
HB_SUPPORTED := yes
ifeq ($(HB_COMPILER),poccarm)
HB_SUPPORTED := no
endif
ifeq ($(HB_WITH_LIBPNG),yes)
ifeq ($(HB_SUPPORTED),yes)
# force redetection
HB_HAS_ZLIB :=
_DET_DSP_NAME := zlib
_DET_VAR_INC_ := HB_INC_ZLIB
_DET_VAR_HAS_ := HB_HAS_ZLIB
_DET_DSP_NAME := libpng
_DET_VAR_INC_ := HB_INC_PNG
_DET_VAR_HAS_ := HB_HAS_PNG
_DET_FLT_PLAT :=
_DET_FLT_COMP :=
_DET_INC_DEFP := /usr/include
_DET_INC_LOCL :=
ifneq ($(filter $(HB_PLATFORM),win wce os2 dos),)
_DET_INC_LOCL += $(TOP)$(ROOT)external/zlib
endif
_DET_INC_HEAD := /zlib.h
_DET_INC_LOCL := $(TOP)$(ROOT)external/libpng
_DET_LOC_PLAT := win wce os2 dos darwin
_DET_INC_HEAD := /png.h
include $(TOP)$(ROOT)config/detfun.mk
ifneq ($(HB_HAS_ZLIB),)
ifneq ($(HB_HAS_PNG_LOCAL),)
HB_CFLAGS += $(foreach d,$(HB_HAS_ZLIB),-I$(d))
ifneq ($(HB_HAS_ZLIB),)
ifeq ($(HB_COMPILER),djgpp)
HB_CFLAGS += -DPNG_NO_SNPRINTF
HB_CFLAGS += $(foreach d,$(HB_HAS_ZLIB),-I$(d))
ifeq ($(HB_COMPILER),djgpp)
HB_CFLAGS += -DPNG_NO_SNPRINTF
endif
include $(TOP)$(ROOT)config/lib.mk
else
HB_SKIP_REASON := $(_DET_RES_TEXT)
include $(TOP)$(ROOT)config/none.mk
endif
include $(TOP)$(ROOT)config/lib.mk
else
HB_SKIP_REASON := $(_DET_RES_TEXT)
HB_SKIP_REASON := unused
include $(TOP)$(ROOT)config/none.mk
endif
else
HB_SKIP_REASON := platform or compiler not supported
include $(TOP)$(ROOT)config/none.mk
endif

8
harbour/external/pcre/Makefile vendored
View File

@@ -32,13 +32,7 @@ C_SOURCES := \
LIBNAME := hbpcre
ifeq ($(HB_WITH_PCRE),)
ifneq ($(filter $(HB_PLATFORM),win wce os2 dos),)
HB_WITH_PCRE := yes
endif
endif
ifeq ($(HB_WITH_PCRE),yes)
ifneq ($(HB_HAS_PCRE_LOCAL),)
# workaround for problems in sunpro x86 PIC builds exploited by hbpcre library code
ifeq ($(HB_COMPILER),sunpro)

79
harbour/external/sqlite3/Makefile vendored
View File

@@ -14,45 +14,56 @@ HB_BUILD_MODE := c
C_SOURCES := \
sqlite3.c \
ifeq ($(HB_WITH_SQLITE3),)
ifeq ($(HB_PLATFORM),win)
HB_WITH_SQLITE3 := yes
endif
ifeq ($(HB_PLATFORM),wce)
HB_WITH_SQLITE3 := yes
endif
ifeq ($(HB_PLATFORM),os2)
HB_WITH_SQLITE3 := yes
endif
ifeq ($(HB_PLATFORM),dos)
HB_WITH_SQLITE3 := yes
endif
ifeq ($(HB_COMPILER),mingwarm)
HB_WITH_SQLITE3 := no
endif
ifeq ($(HB_COMPILER),poccarm)
HB_WITH_SQLITE3 := no
endif
# NOTE: dos based watcom runs out of memory. [vszakats]
ifeq ($(HB_HOST_PLAT)-$(HB_COMPILER),dos-watcom)
HB_WITH_SQLITE3 := no
# decide if it's supported at all
HB_SUPPORTED := yes
ifeq ($(HB_COMPILER),mingwarm)
HB_SUPPORTED := no
endif
ifeq ($(HB_COMPILER),poccarm)
HB_SUPPORTED := no
endif
# NOTE: dos based watcom runs out of memory. [vszakats]
ifeq ($(HB_HOST_PLAT)-$(HB_COMPILER),dos-watcom)
HB_SUPPORTED := no
endif
# NOTE: diable *nix builds on non-*nix platforms. [vszakats]
ifeq ($(HB_HOST_PLAT_UNIX),)
ifneq ($(HB_PLATFORM_UNIX),)
HB_SUPPORTED := no
endif
endif
ifeq ($(HB_WITH_SQLITE3),yes)
ifeq ($(HB_SUPPORTED),yes)
ifeq ($(HB_PLATFORM),wce)
HB_CFLAGS += -D_WIN32_WCE
endif
ifeq ($(HB_PLATFORM),dos)
# DJGPP and OpenWatcom in DOS aren't correctly recognized by SQLite,
# so we're forcing the next best available option. This will cause missing
# externals though. [vszakats]
HB_CFLAGS += -DSQLITE_OS_OTHER
endif
_DET_DSP_NAME := sqlite3
_DET_VAR_INC_ := HB_INC_SQLITE3
_DET_VAR_HAS_ := HB_HAS_SQLITE3
_DET_FLT_PLAT :=
_DET_FLT_COMP :=
_DET_INC_DEFP := /usr/include
_DET_INC_LOCL := $(TOP)$(ROOT)external/sqlite3
_DET_LOC_PLAT := win wce os2 dos
_DET_INC_HEAD := /sqlite3.h
include $(TOP)$(ROOT)config/detfun.mk
include $(TOP)$(ROOT)config/lib.mk
ifneq ($(HB_HAS_SQLITE3_LOCAL),)
ifeq ($(HB_PLATFORM),wce)
HB_CFLAGS += -D_WIN32_WCE
endif
ifeq ($(HB_PLATFORM),dos)
# DJGPP and OpenWatcom in DOS aren't correctly recognized by SQLite,
# so we're forcing the next best available option. This will cause missing
# externals though. [vszakats]
HB_CFLAGS += -DSQLITE_OS_OTHER
endif
include $(TOP)$(ROOT)config/lib.mk
else
HB_SKIP_REASON := unused
include $(TOP)$(ROOT)config/none.mk
endif
else
HB_SKIP_REASON := not supported or disabled
HB_SKIP_REASON := platform or compiler not supported
include $(TOP)$(ROOT)config/none.mk
endif

10
harbour/external/zlib/Makefile vendored
View File

@@ -24,15 +24,9 @@ C_SOURCES := \
LIBNAME := hbzlib
ifeq ($(HB_WITH_ZLIB),)
ifneq ($(filter $(HB_PLATFORM),win wce os2 dos),)
HB_WITH_ZLIB := yes
endif
endif
ifeq ($(HB_WITH_ZLIB),yes)
ifneq ($(HB_HAS_ZLIB_LOCAL),)
include $(TOP)$(ROOT)config/lib.mk
else
HB_SKIP_REASON := not supported or disabled
HB_SKIP_REASON := unused
include $(TOP)$(ROOT)config/none.mk
endif

36
harbour/source/rtl/Makefile
View File

@@ -280,44 +280,8 @@ DIRS := \
gtwvt \
gtxwc \
# force redetection
HB_HAS_ZLIB :=
_DET_DSP_NAME := zlib
_DET_VAR_INC_ := HB_INC_ZLIB
_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_LOCL += $(TOP)$(ROOT)external/zlib
endif
_DET_INC_HEAD := /zlib.h
include $(TOP)$(ROOT)config/detfun.mk
ifneq ($(HB_HAS_ZLIB),)
# Detect pcre
# force redetection
HB_HAS_PCRE :=
_DET_DSP_NAME := pcre
_DET_VAR_INC_ := HB_INC_PCRE
_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_LOCL += $(TOP)$(ROOT)external/pcre
endif
_DET_INC_HEAD := /pcre.h
include $(TOP)$(ROOT)config/detfun.mk
ifneq ($(HB_HAS_PCRE),)
HB_CFLAGS += -DHB_HAS_PCRE $(foreach d,$(HB_HAS_PCRE),-I$(d))
ifneq ($(HB_HAS_PCRE_LOCAL),)

17
harbour/source/rtl/gttrm/Makefile
View File

@@ -11,27 +11,27 @@ LIBNAME := gttrm
C_SOURCES := \
gttrm.c \
HB_WITH_GTTRM := yes
HB_SUPPORTED := yes
ifeq ($(HB_PLATFORM),win)
HB_WITH_GTTRM := no
HB_SUPPORTED := no
endif
ifeq ($(HB_PLATFORM),wce)
HB_WITH_GTTRM := no
HB_SUPPORTED := no
endif
ifeq ($(HB_PLATFORM),dos)
HB_WITH_GTTRM := no
HB_SUPPORTED := no
endif
ifeq ($(HB_PLATFORM),os2)
HB_WITH_GTTRM := no
HB_SUPPORTED := no
endif
ifeq ($(HB_COMPILER),cygwin)
HB_WITH_GTTRM := yes
HB_SUPPORTED := yes
endif
ifeq ($(HB_COMPILER),djgpp)
HB_WITH_GTTRM := yes
HB_SUPPORTED := yes
endif
ifeq ($(HB_WITH_GTTRM),yes)
ifeq ($(HB_SUPPORTED),yes)
ifneq ($(HB_HAS_GPM),)
HB_CFLAGS += -DHB_HAS_GPM
@@ -42,5 +42,6 @@ ifeq ($(HB_WITH_GTTRM),yes)
include $(TOP)$(ROOT)config/lib.mk
else
HB_SKIP_REASON := platform or compiler not supported
include $(TOP)$(ROOT)config/none.mk
endif