* contrib/hbqt/hbqt_common.hbm
* contrib/hbqt/detect.mk
+ Enabled for mingw64.
* src/rtl/inkey.c
- Deleted recently added HB_KEYLAST()/HB_KEYNEXT().
- Deleted dirty/hidden parameter extension from LASTKEY().
- Deprecated NEXTKEY() dirty/hidden extension by HB_LEGACY_LEVEL3.
71 lines
2.2 KiB
Makefile
71 lines
2.2 KiB
Makefile
#
|
|
# $Id$
|
|
#
|
|
|
|
# ---------------------------------------------------------------
|
|
# Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
|
|
# See COPYING for licensing terms.
|
|
# ---------------------------------------------------------------
|
|
|
|
# force redetect. needed for _QT_DARWIN trick
|
|
HB_HAS_QT :=
|
|
|
|
_DET_DSP_NAME := qt
|
|
_DET_VAR_INC_ := HB_INC_QT
|
|
_DET_VAR_HAS_ := HB_HAS_QT
|
|
_DET_FLT_PLAT := !dos
|
|
_DET_FLT_COMP := !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
|
|
_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
|
|
_DET_INC_HEAD := /QtCore/qglobal.h
|
|
include $(TOP)$(ROOT)config/detfun.mk
|
|
|
|
_QT_DARWIN :=
|
|
ifeq ($(HB_PLATFORM),darwin)
|
|
ifeq ($(HB_HAS_QT),)
|
|
_DET_DSP_NAME := qt
|
|
_DET_VAR_INC_ := HB_INC_QT
|
|
_DET_VAR_HAS_ := HB_HAS_QT
|
|
_DET_INC_DEFP := /Library/Frameworks/QtCore.framework/Headers
|
|
_DET_INC_HEAD := /QtCore
|
|
include $(TOP)$(ROOT)config/detfun.mk
|
|
_QT_DARWIN := yes
|
|
endif
|
|
endif
|
|
|
|
ifneq ($(HB_HAS_QT),)
|
|
ifeq ($(_QT_DARWIN),yes)
|
|
HB_CFLAGS += -I/Library/Frameworks
|
|
else
|
|
HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d))
|
|
endif
|
|
|
|
# Locate 'moc' executable
|
|
ifeq ($(MOC_BIN),)
|
|
ifeq ($(HB_QT_MOC_BIN),)
|
|
ifeq ($(HB_HOST_PLAT),win)
|
|
MOC_BIN := $(HB_HAS_QT)\..\bin\moc.exe
|
|
else
|
|
MOC_BIN := $(firstword $(call find_in_path_par,moc,$(PATH) /opt/qtsdk/qt/bin))
|
|
ifeq ($(MOC_BIN),)
|
|
MOC_BIN := $(firstword $(call find_in_path_par,moc-qt4,$(PATH) /opt/qtsdk/qt/bin))
|
|
ifeq ($(MOC_BIN),)
|
|
$(error ! HB_QT_MOC_BIN not set, could not autodetect)
|
|
endif
|
|
endif
|
|
endif
|
|
$(info ! Using QT 'moc' executable: $(MOC_BIN) (autodetected))
|
|
else
|
|
ifneq ($(wildcard $(HB_QT_MOC_BIN)),)
|
|
MOC_BIN := $(HB_QT_MOC_BIN)
|
|
$(info ! Using QT 'moc' executable: $(MOC_BIN))
|
|
else
|
|
$(error ! HB_QT_MOC_BIN points to non-existent file. Make sure to set it to full path and filename of moc executable.)
|
|
endif
|
|
endif
|
|
export MOC_BIN
|
|
endif
|
|
else
|
|
HB_SKIP_REASON := $(_DET_RES_TEXT)
|
|
include $(TOP)$(ROOT)config/none.mk
|
|
endif
|