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

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

Browse Source 
* contrib/hbqt/hbqts/Makefile
  * contrib/hbqt/qtgui/qtguis/Makefile
  * contrib/hbqt/qtgui/Makefile
  * contrib/hbqt/qtwebkit/Makefile
  * contrib/hbqt/qtwebkit/qtwebkits/Makefile
  * contrib/hbqt/qtcore/qtcores/Makefile
  * contrib/hbqt/qtcore/Makefile
  * contrib/hbqt/qtnetwork/qtnetworks/Makefile
  * contrib/hbqt/qtnetwork/Makefile
  * contrib/hbqt/Makefile
  + contrib/hbqt/detect.mk
    % Moved QT detection and common setup task to separate .mk file 
      to avoid redundancy.
This commit is contained in:
Viktor Szakats
2009-10-23 08:24:05 +00:00
parent 434812c2fc
commit d941950c7a
12 changed files with 71 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
harbour/ChangeLog
View File

@@ -17,6 +17,21 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-10-23 10:23 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/hbqts/Makefile
* contrib/hbqt/qtgui/qtguis/Makefile
* contrib/hbqt/qtgui/Makefile
* contrib/hbqt/qtwebkit/Makefile
* contrib/hbqt/qtwebkit/qtwebkits/Makefile
* contrib/hbqt/qtcore/qtcores/Makefile
* contrib/hbqt/qtcore/Makefile
* contrib/hbqt/qtnetwork/qtnetworks/Makefile
* contrib/hbqt/qtnetwork/Makefile
* contrib/hbqt/Makefile
+ contrib/hbqt/detect.mk
% Moved QT detection and common setup task to separate .mk file
to avoid redundancy.
2009-10-23 09:46 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/hbpgsql/postgres.c
* harbour/contrib/hbgd/gdwrp.c
@@ -203,10 +218,10 @@
Nice job Pritpal.
; TODO: Since now QT detection .mk code will be replicated
in 10 places, this will have to be optimized.
; TOFIX: static mode.
in 10 places, this will have to be optimized. [DONE]
; TOFIX: static mode. [DONE]
; FIXED: I'm getting a compile error, so could check the whole build run yet:
; TOFIX: I'm getting a compile error, so could check the whole build run yet: [DONE]
---
hbqt_slots.cpp
../../../hbqt_slots.cpp(1787) : error C2065: 'str' : undeclared identifier
@@ -214,7 +229,7 @@
../../../hbqt_slots.cpp(1787) : error C2070: ''unknown-type'': illegal sizeof operand
../../../hbqt_slots.cpp(1787) : error C2065: 'str' : undeclared identifier
---
; FIXED: I saw these warnings in almost all tested .cpp files:
; TOFIX: I saw these warnings in almost all tested .cpp files: [DONE]
---
../../../QWebSettings.cpp(86) : warning C4100: 'Cargo' : unreferenced formal parameter
---

37
harbour/contrib/hbqt/Makefile
View File

@@ -11,42 +11,10 @@ LIBNAME := hbqt
PRG_HEADERS := \
hbqt.ch \
# 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 !os2
_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
_DET_INC_HEAD := /Qt/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/Versions/4/Headers
_DET_INC_HEAD := /QtCore
include $(TOP)$(ROOT)config/detfun.mk
_QT_DARWIN := yes
endif
endif
include $(TOP)$(ROOT)contrib/hbqt/detect.mk
ifneq ($(HB_HAS_QT),)
ifeq ($(_QT_DARWIN),yes)
HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
else
HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
endif
include $(TOP)$(ROOT)contrib/hbqt/filelist.mk
include $(TOP)$(ROOT)config/header.mk
@@ -65,7 +33,4 @@ ifneq ($(HB_HAS_QT),)
endif
include $(TOP)$(ROOT)config/dir.mk
else
HB_SKIP_REASON := $(_DET_RES_TEXT)
include $(TOP)$(ROOT)config/none.mk
endif

42
harbour/contrib/hbqt/detect.mk Normal file
View File

@@ -0,0 +1,42 @@
#
# $Id$
#
# 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 !os2
_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
_DET_INC_HEAD := /Qt/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/Versions/4/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/QtCore.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
else
HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
endif
else
HB_SKIP_REASON := $(_DET_RES_TEXT)
include $(TOP)$(ROOT)config/none.mk
endif

40
harbour/contrib/hbqt/hbqts/Makefile
View File

@@ -11,52 +11,14 @@ vpath %.prg ../
LIBNAME := hbqts
PRG_HEADERS := \
hbqt.ch \
# 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 !os2
_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
_DET_INC_HEAD := /Qt/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/Versions/4/Headers
_DET_INC_HEAD := /QtCore
include $(TOP)$(ROOT)config/detfun.mk
_QT_DARWIN := yes
endif
endif
include $(TOP)$(ROOT)contrib/hbqt/detect.mk
ifneq ($(HB_HAS_QT),)
ifeq ($(_QT_DARWIN),yes)
HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
else
HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
endif
HB_CFLAGS += -DQT_NODLL
include $(TOP)$(ROOT)contrib/hbqt/filelist.mk
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

37
harbour/contrib/hbqt/qtcore/Makefile
View File

@@ -8,42 +8,10 @@ include $(TOP)$(ROOT)config/global.mk
LIBNAME := hbqtcore
# 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 !os2
_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
_DET_INC_HEAD := /Qt/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/Versions/4/Headers
_DET_INC_HEAD := /QtCore
include $(TOP)$(ROOT)config/detfun.mk
_QT_DARWIN := yes
endif
endif
include $(TOP)$(ROOT)contrib/hbqt/detect.mk
ifneq ($(HB_HAS_QT),)
ifeq ($(_QT_DARWIN),yes)
HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
else
HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
endif
include $(TOP)$(ROOT)contrib/hbqt/qtcore/filelist.mk
include $(TOP)$(ROOT)config/header.mk
@@ -55,7 +23,4 @@ ifneq ($(HB_HAS_QT),)
include $(TOP)$(ROOT)config/dir.mk
endif
endif
else
HB_SKIP_REASON := $(_DET_RES_TEXT)
include $(TOP)$(ROOT)config/none.mk
endif

34
harbour/contrib/hbqt/qtcore/qtcores/Makefile
View File

@@ -11,42 +11,10 @@ vpath %.prg ../
LIBNAME := hbqtcores
# 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 !os2
_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
_DET_INC_HEAD := /Qt/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/Versions/4/Headers
_DET_INC_HEAD := /QtCore
include $(TOP)$(ROOT)config/detfun.mk
_QT_DARWIN := yes
endif
endif
include $(TOP)$(ROOT)contrib/hbqt/detect.mk
ifneq ($(HB_HAS_QT),)
ifeq ($(_QT_DARWIN),yes)
HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
else
HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
endif
HB_CFLAGS += -DQT_NODLL
include $(TOP)$(ROOT)contrib/hbqt/qtcore/filelist.mk

37
harbour/contrib/hbqt/qtgui/Makefile
View File

@@ -8,42 +8,10 @@ include $(TOP)$(ROOT)config/global.mk
LIBNAME := hbqtgui
# 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 !os2
_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
_DET_INC_HEAD := /Qt/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/Versions/4/Headers
_DET_INC_HEAD := /QtCore
include $(TOP)$(ROOT)config/detfun.mk
_QT_DARWIN := yes
endif
endif
include $(TOP)$(ROOT)contrib/hbqt/detect.mk
ifneq ($(HB_HAS_QT),)
ifeq ($(_QT_DARWIN),yes)
HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
else
HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
endif
include $(TOP)$(ROOT)contrib/hbqt/qtgui/filelist.mk
include $(TOP)$(ROOT)config/header.mk
@@ -55,7 +23,4 @@ ifneq ($(HB_HAS_QT),)
include $(TOP)$(ROOT)config/dir.mk
endif
endif
else
HB_SKIP_REASON := $(_DET_RES_TEXT)
include $(TOP)$(ROOT)config/none.mk
endif

34
harbour/contrib/hbqt/qtgui/qtguis/Makefile
View File

@@ -11,42 +11,10 @@ vpath %.prg ../
LIBNAME := hbqtguis
# 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 !os2
_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
_DET_INC_HEAD := /Qt/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/Versions/4/Headers
_DET_INC_HEAD := /QtCore
include $(TOP)$(ROOT)config/detfun.mk
_QT_DARWIN := yes
endif
endif
include $(TOP)$(ROOT)contrib/hbqt/detect.mk
ifneq ($(HB_HAS_QT),)
ifeq ($(_QT_DARWIN),yes)
HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
else
HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
endif
HB_CFLAGS += -DQT_NODLL
include $(TOP)$(ROOT)contrib/hbqt/qtgui/filelist.mk

34
harbour/contrib/hbqt/qtnetwork/Makefile
View File

@@ -8,42 +8,10 @@ include $(TOP)$(ROOT)config/global.mk
LIBNAME := hbqtnetwork
# 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 !os2
_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
_DET_INC_HEAD := /Qt/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/Versions/4/Headers
_DET_INC_HEAD := /QtCore
include $(TOP)$(ROOT)config/detfun.mk
_QT_DARWIN := yes
endif
endif
include $(TOP)$(ROOT)contrib/hbqt/detect.mk
ifneq ($(HB_HAS_QT),)
ifeq ($(_QT_DARWIN),yes)
HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
else
HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
endif
include $(TOP)$(ROOT)contrib/hbqt/qtnetwork/filelist.mk
include $(TOP)$(ROOT)config/header.mk

34
harbour/contrib/hbqt/qtnetwork/qtnetworks/Makefile
View File

@@ -11,42 +11,10 @@ vpath %.prg ../
LIBNAME := hbqtnetworks
# 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 !os2
_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
_DET_INC_HEAD := /Qt/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/Versions/4/Headers
_DET_INC_HEAD := /QtCore
include $(TOP)$(ROOT)config/detfun.mk
_QT_DARWIN := yes
endif
endif
include $(TOP)$(ROOT)contrib/hbqt/detect.mk
ifneq ($(HB_HAS_QT),)
ifeq ($(_QT_DARWIN),yes)
HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
else
HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
endif
HB_CFLAGS += -DQT_NODLL
include $(TOP)$(ROOT)contrib/hbqt/qtnetwork/filelist.mk

34
harbour/contrib/hbqt/qtwebkit/Makefile
View File

@@ -8,42 +8,10 @@ include $(TOP)$(ROOT)config/global.mk
LIBNAME := hbqtwebkit
# 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 !os2
_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
_DET_INC_HEAD := /Qt/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/Versions/4/Headers
_DET_INC_HEAD := /QtCore
include $(TOP)$(ROOT)config/detfun.mk
_QT_DARWIN := yes
endif
endif
include $(TOP)$(ROOT)contrib/hbqt/detect.mk
ifneq ($(HB_HAS_QT),)
ifeq ($(_QT_DARWIN),yes)
HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
else
HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
endif
include $(TOP)$(ROOT)contrib/hbqt/qtwebkit/filelist.mk
include $(TOP)$(ROOT)config/header.mk

34
harbour/contrib/hbqt/qtwebkit/qtwebkits/Makefile
View File

@@ -11,42 +11,10 @@ vpath %.prg ../
LIBNAME := hbqtwebkits
# 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 !os2
_DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
_DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
_DET_INC_HEAD := /Qt/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/Versions/4/Headers
_DET_INC_HEAD := /QtCore
include $(TOP)$(ROOT)config/detfun.mk
_QT_DARWIN := yes
endif
endif
include $(TOP)$(ROOT)contrib/hbqt/detect.mk
ifneq ($(HB_HAS_QT),)
ifeq ($(_QT_DARWIN),yes)
HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
else
HB_CFLAGS += $(foreach d,$(HB_HAS_QT),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
endif
HB_CFLAGS += -DQT_NODLL
include $(TOP)$(ROOT)contrib/hbqt/qtwebkit/filelist.mk