* contrib/Makefile
* Moved hbxbp to the end of list as a workaround for potentially
outdated hbqt.ch reference, if it's before hbqt build.
Still not prefect though. We should probably fix the ordering
of -I option in build process, but it doesn't seem trivial.
Or avoid installing headers into central include dir, but that
also leads far.
* utils/hbmk2/hbmk2.prg
* Minor step to fix a recent regression.
* source/rtl/hbzlibgz.c
* HB_GZDIRECT() is now always defined in core, if it's built against
older zlib version, it will simply do nothing.
We can discuss how to handle this situation, all have pros and cons:
1) Always define: Throw RTE at runtime.
2) Always define: Return error at runtime.
3) Don't define if low-level wrapper isn't present. Makes it
easy to catch missing dependencies on .prg level, but it
break Harbour to provide a consistent higher level API.
* examples/hbextern/hbextern.prg
! Minor fix in generated comment.
* examples/hbextern/hbextern.hbp
+ -w2 -> -w3
* ChangeLog
! Wrong header in previous entry.
* contrib/hbqt/hbqt_qimage.cpp
* contrib/hbqt/hbqt_qtextdocument.cpp
* contrib/hbqt/hbqt_qapplication.cpp
* contrib/hbqt/hbqt_qtextcursor.cpp
* contrib/hbqt/hbqt_qclipboard.cpp
* contrib/hbqt/hbqt_qurl.cpp
* contrib/hbqt/hbqt_qwebhistoryitem.cpp
* contrib/hbqt/hbqt_qvariant.cpp
* contrib/hbqt/hbqt_qfont.cpp
* contrib/hbqt/hbqt_qimagereader.cpp
* contrib/hbqt/hbqt_qcursor.cpp
* contrib/hbqt/hbqt_qfontdatabase.cpp
* contrib/hbqt/hbqt_qcoreapplication.cpp
* contrib/hbqt/hbqt_qobject.cpp
* contrib/hbqt/hbqt_qtextframe.cpp
* contrib/hbqt/hbqt_qabstractitemmodel.cpp
* Minor EOF change after regerenating them with hbqtgen.
(probably it would be better to generate only one EOLs at
EOF by hbqtgen)
68 lines
709 B
Makefile
68 lines
709 B
Makefile
#
|
|
# $Id$
|
|
#
|
|
|
|
ROOT = ../
|
|
|
|
ifeq ($(HB_CONTRIBLIBS),)
|
|
|
|
# standalone contribs
|
|
|
|
DIRS=\
|
|
gtwvg \
|
|
hbbmcdx \
|
|
hbbtree \
|
|
hbclipsm \
|
|
hbcrypt \
|
|
hbct \
|
|
hbgt \
|
|
hbmisc \
|
|
hbmzip \
|
|
hbnf \
|
|
hbodbc \
|
|
hbsqlit3 \
|
|
hbtip \
|
|
hbtpathy \
|
|
hbvpdf \
|
|
hbwin \
|
|
hbziparc \
|
|
rddado \
|
|
xhb \
|
|
xpp \
|
|
|
|
# contribs with external dependencies
|
|
DIRS +=\
|
|
gtalleg \
|
|
hbblat \
|
|
hbcurl \
|
|
hbfbird \
|
|
hbfimage \
|
|
hbgd \
|
|
hbhpdf \
|
|
hbmysql \
|
|
hbpgsql \
|
|
hbqt \
|
|
hbssl \
|
|
rddads \
|
|
rddsql \
|
|
|
|
# contribs dependent on above
|
|
DIRS +=\
|
|
hbxbp \
|
|
|
|
else
|
|
|
|
ifneq ($(HB_CONTRIBLIBS),no)
|
|
DIRS = $(HB_CONTRIBLIBS)
|
|
endif
|
|
|
|
endif
|
|
|
|
DIRS += $(HB_CONTRIB_ADDONS)
|
|
|
|
ifneq ($(DIRS),)
|
|
include $(TOP)$(ROOT)config/dir.cf
|
|
else
|
|
include $(TOP)$(ROOT)config/none.cf
|
|
endif
|