From 83fbbeebecfd1474eaa8e049b67ec3983b49e4bc Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 21 Apr 2009 14:34:33 +0000 Subject: [PATCH] 2009-04-21 16:25 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg + Added filter support to -o option. + Added macro support to -o option. ! Fixed missing win system libs from bcc linker command. IMPORTANT: bcc users will have to make sure they add bcc PSDK lib to their bcc32.cfg and ilink32.cfg files, otherwise hbmk2 won't work for them: --- bcc32.cfg -I"C:\devl\BCC55\Include" -L"C:\devl\BCC55\Lib";"C:\devl\BCC55\Lib\PSDK" --- ilink32.cfg /L"C:\devl\BCC55\Lib";"C:\devl\BCC55\Lib\PSDK" --- (or manually pass that with -L option to hbmk2) * -i option moved to main help screen. * utils/hbmk2/examples/fwh.hbp + Added odbc32 lib. --- harbour/ChangeLog | 20 ++++++++++++++++++++ harbour/utils/hbmk2/examples/fwh.hbp | 2 +- harbour/utils/hbmk2/hbmk2.prg | 28 ++++++++++++++++------------ 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9b2729353a..02cf12e21e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,26 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-04-21 16:25 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk2/hbmk2.prg + + Added filter support to -o option. + + Added macro support to -o option. + ! Fixed missing win system libs from bcc linker command. + IMPORTANT: bcc users will have to make sure they add bcc PSDK + lib to their bcc32.cfg and ilink32.cfg files, + otherwise hbmk2 won't work for them: + --- bcc32.cfg + -I"C:\devl\BCC55\Include" + -L"C:\devl\BCC55\Lib";"C:\devl\BCC55\Lib\PSDK" + --- ilink32.cfg + /L"C:\devl\BCC55\Lib";"C:\devl\BCC55\Lib\PSDK" + --- + (or manually pass that with -L option to hbmk2) + * -i option moved to main help screen. + + * utils/hbmk2/examples/fwh.hbp + + Added odbc32 lib. + 2009-04-21 13:41 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbrddcdx.h * harbour/source/rdd/dbfcdx/dbfcdx1.c diff --git a/harbour/utils/hbmk2/examples/fwh.hbp b/harbour/utils/hbmk2/examples/fwh.hbp index 93d08ddb7c..18a06255d1 100644 --- a/harbour/utils/hbmk2/examples/fwh.hbp +++ b/harbour/utils/hbmk2/examples/fwh.hbp @@ -12,5 +12,5 @@ {win}gt=gtgui {win}libs=fiveh fivehc -{win}libs=nddeapi iphlpapi rasapi32 +{win}libs=nddeapi iphlpapi rasapi32 odbc32 {win}libs=hbwin diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index b507e1ca46..3a2e2b4ab2 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1053,17 +1053,20 @@ FUNCTION hbmk( aArgs ) CASE Left( cParam, 2 ) == "-o" .AND. ! lStopAfterHarbour - tmp := PathSepToSelf( SubStr( cParam, 3 ) ) - hb_FNameSplit( tmp, @cDir, @cName, @cExt ) - IF ! Empty( cDir ) .AND. Empty( cName ) .AND. Empty( cExt ) - /* Only a dir was passed, let's store that and pick a default name later. */ - s_cPROGDIR := cDir - ELSEIF ! Empty( tmp ) - s_cPROGDIR := NIL - s_cPROGNAME := tmp - ELSE - s_cPROGDIR := NIL - s_cPROGNAME := NIL + tmp := MacroProc( ArchCompFilter( SubStr( cParam, 3 ) ), FN_DirGet( aParam[ _PAR_cFileName ] ) + IF ! Empty( tmp ) + tmp := PathSepToSelf( tmp ) + hb_FNameSplit( tmp, @cDir, @cName, @cExt ) + IF ! Empty( cDir ) .AND. Empty( cName ) .AND. Empty( cExt ) + /* Only a dir was passed, let's store that and pick a default name later. */ + s_cPROGDIR := cDir + ELSEIF ! Empty( tmp ) + s_cPROGDIR := NIL + s_cPROGNAME := tmp + ELSE + s_cPROGDIR := NIL + s_cPROGNAME := NIL + ENDIF ENDIF CASE Left( cParam, 2 ) == "-L" .AND. ; @@ -2033,6 +2036,7 @@ FUNCTION hbmk( aArgs ) s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-bcc" + cLibExt,; "harbour-" + cDL_Version_Alter + "-bcc" + cLibExt ) } s_aLIBSHAREDPOST := { "hbmainstd", "hbmainwin" } + s_aLIBSYS := ArrayAJoin( { s_aLIBSYS, s_aLIBSYSCORE, s_aLIBSYSMISC } ) CASE ( s_cARCH == "win" .AND. s_cCOMP $ "msvc|msvc64|msvcia64|icc|iccia64" ) .OR. ; ( s_cARCH == "wce" .AND. s_cCOMP == "msvcarm" ) /* NOTE: Cross-platform: wce/ARM on win/x86 */ @@ -4719,6 +4723,7 @@ STATIC PROCEDURE ShowHelp( lLong ) " -o output file name" ,; " -l link with library" ,; " -L additional path to search for libraries" ,; + " -i

|-incpath=

additional path to search for headers" ,; " -static|-shared link with static/shared libs" ,; " -mt|-st link with multi/single-thread VM" ,; " -gt link with GT GT driver, can be repeated to link" ,; @@ -4747,7 +4752,6 @@ STATIC PROCEDURE ShowHelp( lLong ) "" ,; " -bldf[-] inherit all/no (default) flags from Harbour build" ,; " -bldf=[p][c][l] inherit .prg/.c/linker flags (or none) from Harbour build" ,; - " -incpath=

|-i

additional path to search for headers" ,; " -inctrypath=

additional path to autodetect .c header locations" ,; " -prgflag= pass flag to Harbour" ,; " -cflag= pass flag to C compiler" ,;