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

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

Browse Source 
- contrib/hbxbp/tests/hbqt.hbc
  + contrib/hbxbp/tests/hbmk.hbm
  + contrib/hbxbp/hbxbp.hbc
    * Sorted out hbmk2 make files.

  * contrib/hbxbp/Makefile
    + Added hbqt dir as include path to .prg level.
      After this hbqt.ch can be moved to hbqt lib where
      it belongs (at least that's what its name suggest).

  * contrib/hbxbp/appevent.ch
    ! SVN header.

  ; TOFIX: There is a windows.h reference in apigeneric.cpp.
This commit is contained in:
Viktor Szakats
2009-06-11 08:18:46 +00:00
parent 1c88611400
commit 1817ad2b29
6 changed files with 34 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
harbour/ChangeLog
View File

@@ -17,6 +17,22 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-06-11 10:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
- contrib/hbxbp/tests/hbqt.hbc
+ contrib/hbxbp/tests/hbmk.hbm
+ contrib/hbxbp/hbxbp.hbc
* Sorted out hbmk2 make files.
* contrib/hbxbp/Makefile
+ Added hbqt dir as include path to .prg level.
After this hbqt.ch can be moved to hbqt lib where
it belongs (at least that's what its name suggest).
* contrib/hbxbp/appevent.ch
! SVN header.
; TOFIX: There is a windows.h reference in apigeneric.cpp.
2009-06-11 00:51 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+ harbour/contrib/hbxbp
@@ -46,7 +62,7 @@
+ harbour/contrib/hbxbp/tests/hbqt.hbc
+ harbour/contrib/hbxbp/tests/demoxbp.prg
+ Initial upload of Xbase++ compatible class framework based on QT 4.5.
/*

38
harbour/contrib/hbxbp/Makefile
View File

@@ -2,6 +2,8 @@
# $Id$
#
HB_USER_PRGFLAGS += -I$(TOP)$(ROOT)contrib/hbqt
ROOT = ../../
LIBNAME=hbxbp
@@ -36,40 +38,9 @@ endif
ifeq ($(HB_WITH_QT),yes)
ifeq ($(HB_INC_QT),)
ifeq ($(HB_XBUILD),)
HB_INC_QT = /usr/include/qt4 /usr/include /Developer/qt/include
endif
endif
HB_INC_QT_OK += $(foreach d, $(HB_INC_QT), $(if $(wildcard $(d)/Qt/qglobal.h),$(d),))
ifeq ($(HB_ARCHITECTURE),darwin)
ifeq ($(strip $(HB_INC_QT_OK)),)
HB_INC_QT_OK = $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,)
ifeq ($(HB_INC_QT_OK),spec)
HB_USER_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
HB_USER_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
HB_USER_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
HB_USER_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
endif
endif
endif
ifneq ($(strip $(HB_INC_QT_OK)),)
ifneq ($(HB_QT_STATIC),)
LIBNAME=gtqtcs
HB_USER_CFLAGS += -DQT_NODLL
endif
ifneq ($(strip $(HB_INC_QT_OK)),spec)
HB_USER_CFLAGS += $(foreach d, $(HB_INC_QT_OK), -I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
endif
CPP_SOURCES=\
apigeneric.cpp \
PRG_SOURCES=\
xbpgeneric.prg \
xbpdialog.prg \
@@ -77,13 +48,11 @@ PRG_SOURCES=\
xbpparthandler.prg \
xbpmenubar.prg \
PRG_HEADERS=\
xbp.ch \
appevent.ch \
apig.ch \
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
@@ -94,6 +63,3 @@ install::
else
include $(TOP)$(ROOT)config/none.cf
endif
else
include $(TOP)$(ROOT)config/none.cf
endif

4
harbour/contrib/hbxbp/appevent.ch
View File

@@ -1,3 +1,7 @@
/*
* $Id$
*/
/*----------------------------------------------------------------------*/
#ifndef _APPEVENT_CH

6
harbour/contrib/hbxbp/hbxbp.hbc Normal file
View File

@@ -0,0 +1,6 @@
#
# $Id$
#
libs=hbxbp
hbcs=../hbqt/hbqt.hbc

5
harbour/contrib/hbxbp/tests/hbmk.hbm Normal file
View File

@@ -0,0 +1,5 @@
#
# $Id$
#
../hbxbp.hbc

21
harbour/contrib/hbxbp/tests/hbqt.hbc
View File

@@ -1,21 +0,0 @@
#
# $Id$
#
{allwin}libpaths=${HB_DIR_QT}\lib
{mingw|mingwce|(gcc&(linux|darwin))}libs=supc++
{!HB_QT_STATIC}libs=hbqt hbxbp
{HB_QT_STATIC}libs=hbqts
{win}libs=version shlwapi
{allwin&!HB_QT_STATIC}libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4
{allwin&HB_QT_STATIC}libs=QtCore QtGui QtNetwork QtWebKit
{linux}libs=QtCore QtGui QtNetwork QtWebKit
{darwin}libs=/Library/Frameworks/QtCore.framework/QtCore
{darwin}libs=/Library/Frameworks/QtGui.framework/QtGui
{darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
{darwin}libs=/Library/Frameworks/QtWebKit.framework/QtWebKit
gui=yes
gt=gtnul
cflags=-D__DEBUG__