55fa645e86
* source/Makefile
* config/lib.mk
+ Added Przemek's patch to add local hbzlib and hbpcre
libs to Harbour dynlib.
; TODO: Add some ways to disable this because it has some
drawbacks (it f.e. makes it impossible to link 3rd
party libs also exporting zlib / pcre interfaces).
This information needs to be passed to hbmk2, too.
I don't have any elegant way to solve this problem ATM.
* utils/hbmk2/hbmk2.prg
* Changed to only add local hbzlib and hbpcre libs to liblist
in static mode. (this is needed to support change above).
+ Enabled lib grouping for beos/gcc.
+ Added supc++/supcxx lib to liblist of gcc family compilers.
This aims to solve link problems when Harbour is built
in C++, but hbmk2 is used in C mode.
* contrib/hbqt/hbqts.hbc
* contrib/hbqt/hbqt.hbc
* contrib/gtqtc/gtqtcs.hbc
* contrib/gtqtc/gtqtc.hbc
- Deleted explicit supc++ libspec. Now it's added by
hbmk2 automatically.
* config/dyn.mk
! Modified to add local hbpcre and hbzlib to syslib
list to make it link with beos/haiku.
Please test/confirm this change.
- Disabled above logic, since it's not needed.
* config/global.mk
+ Added autodetection for linux/sunpro, linux/icc,
darwin/clang, darwin/gcc, darwin/icc.
On darwin clang became the default, if available.
* external/sqlite3/Makefile
+ Tweak for linux/watcom. Based on Przemek patch sent to the devlist.
* config/detfun.mk
* config/bin.mk
* config/dyn.mk
* source/Makefile
* config/lib.mk
% Minor modification to HB_HAS_*_LOCAL logic to make
it safe to use this var without first checking HB_HAS_*.
; Please test/review these. I didn't restest everything after above changes.
73 lines
1.7 KiB
Makefile
73 lines
1.7 KiB
Makefile
#
|
|
# $Id$
|
|
#
|
|
|
|
ROOT := ../../
|
|
|
|
include $(TOP)$(ROOT)config/global.mk
|
|
|
|
LIBNAME := sqlite3
|
|
|
|
HB_BUILD_WARN := no
|
|
HB_BUILD_MODE := c
|
|
|
|
C_SOURCES := \
|
|
sqlite3.c \
|
|
|
|
# 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_SUPPORTED),yes)
|
|
|
|
_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_INC_HEAD := /sqlite3.h
|
|
include $(TOP)$(ROOT)config/detfun.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
|
|
ifeq ($(HB_PLATFORM)-$(HB_COMPILER),linux-watcom)
|
|
# Watcom Linux builds cannot use system header files
|
|
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 := platform or compiler not supported
|
|
include $(TOP)$(ROOT)config/none.mk
|
|
endif
|