From 1a199ad2d36307544b2ddc1a8a77976fb585ac52 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 26 Jun 2010 22:08:57 +0000 Subject: [PATCH] 2010-06-27 00:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/utils/hbqtui.prg * contrib/hbqt/utils/hbqtui.hbp ! Readded HBQT dependency. * contrib/hbgd/hbgd.hbc * Experimenting with -hbdyn mode. * contrib/makefile.prg ! Fixes to prev. Typo, fixed build order. --- harbour/ChangeLog | 13 +++++- harbour/contrib/hbgd/hbgd.hbc | 2 +- harbour/contrib/hbqt/utils/hbqtui.hbp | 2 + harbour/contrib/hbqt/utils/hbqtui.prg | 2 + harbour/contrib/makefile.prg | 59 ++++++++++++++------------- 5 files changed, 48 insertions(+), 30 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8eec60d7c0..b75e0235db 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,9 +16,20 @@ The license applies to all entries newer than 2009-04-28. */ +2010-06-27 00:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbqt/utils/hbqtui.prg + * contrib/hbqt/utils/hbqtui.hbp + ! Readded HBQT dependency. + + * contrib/hbgd/hbgd.hbc + * Experimenting with -hbdyn mode. + + * contrib/makefile.prg + ! Fixes to prev. Typo, fixed build order. + 2010-06-26 14:10 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) - contrib/hbqt/qtgui/QItemEditorCreator.cpp - _ contrib/hbqt/qtgui/TQItemEditorCreator.prg + - contrib/hbqt/qtgui/TQItemEditorCreator.prg - Deleted: residual files. 2010-06-26 23:11 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) diff --git a/harbour/contrib/hbgd/hbgd.hbc b/harbour/contrib/hbgd/hbgd.hbc index f9f523da28..733f3db2ff 100644 --- a/harbour/contrib/hbgd/hbgd.hbc +++ b/harbour/contrib/hbgd/hbgd.hbc @@ -4,7 +4,7 @@ incpaths=. -libs=${hb_name} +{!hbdyn}libs=${hb_name} {win}libs=bgd {linux}libs=gdlib png jpeg freetype m {darwin}libs=gd diff --git a/harbour/contrib/hbqt/utils/hbqtui.hbp b/harbour/contrib/hbqt/utils/hbqtui.hbp index 334d9bd167..d10d6b6da2 100644 --- a/harbour/contrib/hbqt/utils/hbqtui.hbp +++ b/harbour/contrib/hbqt/utils/hbqtui.hbp @@ -4,4 +4,6 @@ -w3 -es2 +../hbqt.hbc + hbqtui.prg diff --git a/harbour/contrib/hbqt/utils/hbqtui.prg b/harbour/contrib/hbqt/utils/hbqtui.prg index 15632fc6df..c1c0ac5069 100644 --- a/harbour/contrib/hbqt/utils/hbqtui.prg +++ b/harbour/contrib/hbqt/utils/hbqtui.prg @@ -68,6 +68,8 @@ #include "hbclass.ch" #include "common.ch" +#include "hbqt.ch" + /*----------------------------------------------------------------------*/ #define STRINGIFY( cStr ) '"' + cStr + '"' diff --git a/harbour/contrib/makefile.prg b/harbour/contrib/makefile.prg index 2f9f2125c8..55f18ad215 100644 --- a/harbour/contrib/makefile.prg +++ b/harbour/contrib/makefile.prg @@ -3,7 +3,7 @@ */ /* - * Copyright 2009 Viktor Szakats (harbour.01 syenar.hu) + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) * See COPYING for licensing terms. */ @@ -11,8 +11,7 @@ 1. error handling / reporting / feedback 2. copy headers and other stuff (hbide) 3. add .dll generation for contrib libs - 4. first do all the clean's - 5. hbmk2 fix to create work dir before calling out plugin + 4. first do all the 'clean's */ #pragma warninglevel=3 @@ -47,7 +46,29 @@ PROCEDURE Main( ... ) "sddoci/sddoci.hbi" ,; "sddpg/sddpg.hbi" } - LOCAL aLibPass1 := {; + LOCAL aLibsPass1 := {; + "hbblink/hbblink.hbp" ,; + "hbbz2/hbbz2.hbp" ,; + "hbclipsm/hbclipsm.hbp" ,; + "hbcomm/hbcomm.hbp" ,; + "hbct/hbct.hbp" ,; + "hbfoxpro/hbfoxpro.hbp" ,; + "hbfship/hbfship.hbp" ,; + "hbgt/hbgt.hbp" ,; + "hbmemio/hbmemio.hbp" ,; + "hbmisc/hbmisc.hbp" ,; + "hbmzip/hbmzip.hbp" ,; + "hbnetio/hbnetio.hbp" ,; + "hbnf/hbnf.hbp" ,; + "hbodbc/hbodbc.hbp" ,; + "hbsms/hbsms.hbp" ,; + "hbsqlit3/hbsqlit3.hbp" ,; + "hbtpathy/hbtpathy.hbp" ,; + "hbwin/hbwin.hbp" ,; + "hbxpp/hbxpp.hbp" ,; + "rddbmcdx/hbbmcdx.hbp" } + + LOCAL aLibsPass2 := {; "gtalleg/gtalleg.hbp" ,; "gtalleg/gtallegs.hbp" ,; "hbblat/hbblat.hbp" ,; @@ -81,42 +102,23 @@ PROCEDURE Main( ... ) "sddpg/sddpg.hbp" ,; /* uses: rddsql */ "sddsqlt3/sddsqlt3.hbp" } /* uses: rddsql */ - LOCAL aLibsPass2 := {; - "hbblink/hbblink.hbp" ,; - "hbbz2/hbbz2.hbp" ,; - "hbclipsm/hbclipsm.hbp" ,; - "hbcomm/hbcomm.hbp" ,; - "hbct/hbct.hbp" ,; - "hbfoxpro/hbfoxpro.hbp" ,; - "hbfship/hbfship.hbp" ,; - "hbgt/hbgt.hbp" ,; - "hbmemio/hbmemio.hbp" ,; - "hbmisc/hbmisc.hbp" ,; - "hbmzip/hbmzip.hbp" ,; - "hbnetio/hbnetio.hbp" ,; - "hbnf/hbnf.hbp" ,; - "hbodbc/hbodbc.hbp" ,; - "hbsms/hbsms.hbp" ,; - "hbsqlit3/hbsqlit3.hbp" ,; + LOCAL aLibsPass3 := {; + "gtwvg/gtwvg.hbp" ,; /* uses: hbwin */ "hbtip/hbtip.hbp" ,; "hbtip/hbtipssl.hbp" ,; /* uses: hbssl */ - "hbtpathy/hbtpathy.hbp" ,; - "hbwin/hbwin.hbp" ,; - "hbxpp/hbxpp.hbp" ,; "hbziparc/hbziparc.hbp" ,; /* uses: hbmzip */ - "rddbmcdx/hbbmcdx.hbp" ,; - "xhb/xhb.hbp" ,; /* uses: hbct, hbtip, hbwin */ - "gtwvg/gtwvg.hbp" } /* uses: hbwin */ + "xhb/xhb.hbp" } /* uses: hbct, hbtip, hbwin */ LOCAL aUtils := {; "hbnetio/utils/netiosrv.hbp" ,; /* uses: hbnetio */ - "hbqt/utils/hbqtui.hbp" ,; + "hbqt/utils/hbqtui.hbp" ,; /* uses: hbqt */ "hbide/hbide.hbp" } /* uses: hbxbp, hbqt */ LOCAL aAll := {; aImpLibs ,; aLibsPass1 ,; aLibsPass2 ,; + aLibsPass3 ,; aUtils,; hb_ATokens( GetEnv( "HB_ADDONS_LIB" ),, .T. ),; hb_ATokens( GetEnv( "HB_ADDONS_BIN" ),, .T. ) } @@ -125,6 +127,7 @@ PROCEDURE Main( ... ) "implib" ,; "lib" ,; "lib" ,; + "lib" ,; "bin" ,; "lib" ,; "bin" }