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

2009-02-20 15:47 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* bin/hb-func.sh
    ! Two typos.
    - Disabled slang/ncurses lib stuff.

  * utils/hbmk2/hbmk2.prg
    ! Fixed to put a space after -o gcc option for darwin.
    ; This makes hbmk2 work under darwin (for basic cases).
This commit is contained in:
Viktor Szakats
2009-02-20 14:48:55 +00:00
parent 4dfad4f3ef
commit 932edd00cd
3 changed files with 77 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
harbour/ChangeLog
View File

@@ -8,14 +8,23 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-20 15:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* Makefile
* bin/postinst.bat
+ bin/postinst.cmd
+ Added postinst for OS/2.
2009-02-20 15:47 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* bin/hb-func.sh
! Two typos.
- Disabled slang/ncurses lib stuff.
* utils/hbmk2/hbmk2.prg
* Minor in comment.
* utils/hbmk2/hbmk2.prg
! Fixed to put a space after -o gcc option for darwin.
; This makes hbmk2 work under darwin (for basic cases).
2009-02-20 15:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* Makefile
* bin/postinst.bat
+ bin/postinst.cmd
+ Added postinst for OS/2.
* utils/hbmk2/hbmk2.prg
* Minor in comment.
2009-02-20 15:13 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg

14
harbour/bin/hb-func.sh
View File

@@ -234,15 +234,15 @@ mk_hbtools()
if [ -n "${CC_HB_USER_LDFLAGS}" ]; then
echo "ldflags=${CC_HB_USER_LDFLAGS}">> ${hb_hbmkcfg}
fi
if [ "\${HB_GPM_MOUSE}" = "yes" ]; then
if [ "${HB_GPM_MOUSE}" = "yes" ]; then
echo "libs=gpm">> ${hb_hbmkcfg}
if
if [ -n "${HB_CRS_LIB}" ]; then
echo "libs=${HB_CRS_LIB}">> ${hb_hbmkcfg}
fi
if [ -n "${HB_SLN_LIB}" ]; then
echo "libs=${HB_SLN_LIB}">> ${hb_hbmkcfg}
fi
# if [ -n "${HB_CRS_LIB}" ]; then
# echo "libs=${HB_CRS_LIB}">> ${hb_hbmkcfg}
# fi
# if [ -n "${HB_SLN_LIB}" ]; then
# echo "libs=${HB_SLN_LIB}">> ${hb_hbmkcfg}
# fi
echo "Generating ${hb_tool}... "
cat > ${hb_tool} <<EOF

98
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -557,24 +557,23 @@ FUNCTION Main( ... )
ENDIF
NEXT
IF ! lNOHBP
/* Process automatic control files. */
HBP_ProcessAll( @s_aLIBUSER,;
@s_aLIBPATH,;
@s_aOPTPRG,;
@s_aOPTC,;
@s_aOPTL,;
@s_lGUI,;
@s_lMT,;
@s_lSHARED,;
@s_lSTATICFULL,;
@s_lDEBUG,;
@s_lNULRDD,;
@s_lMAP,;
@s_lSTRIP,;
@s_lRUN,;
@s_cGT )
ENDIF
/* Process automatic control files. */
HBP_ProcessAll( lNOHBP
@s_aLIBUSER,;
@s_aLIBPATH,;
@s_aOPTPRG,;
@s_aOPTC,;
@s_aOPTL,;
@s_lGUI,;
@s_lMT,;
@s_lSHARED,;
@s_lSTATICFULL,;
@s_lDEBUG,;
@s_lNULRDD,;
@s_lMAP,;
@s_lSTRIP,;
@s_lRUN,;
@s_cGT )
/* Process command line (2nd pass) */
FOR EACH cParam IN aParams
@@ -830,10 +829,18 @@ FUNCTION Main( ... )
IF lStopAfterCComp
AAdd( s_aOPTC, "-c" )
IF ( Len( s_aPRG ) + Len( s_aC ) ) == 1
AAdd( s_aOPTC, "-o{OO}" )
IF t_cARCH == "darwin"
AAdd( s_aOPTC, "-o {OO}" )
ELSE
AAdd( s_aOPTC, "-o{OO}" )
ENDIF
ENDIF
ELSE
AAdd( s_aOPTC, "-o{OE}" )
IF t_cARCH == "darwin"
AAdd( s_aOPTC, "-o {OE}" )
ELSE
AAdd( s_aOPTC, "-o{OE}" )
ENDIF
ENDIF
/* Always inherit/reproduce some flags from self */
@@ -1562,7 +1569,8 @@ STATIC FUNCTION FN_ExtSet( cFileName, cExt )
#define HBMK_CFG_NAME "hbmkcfg.hbp"
STATIC PROCEDURE HBP_ProcessAll( /* @ */ aLIBS,;
STATIC PROCEDURE HBP_ProcessAll( lConfigOnly,;
/* @ */ aLIBS,;
/* @ */ aLIBPATH,;
/* @ */ aOPTPRG,;
/* @ */ aOPTC,;
@@ -1608,30 +1616,32 @@ STATIC PROCEDURE HBP_ProcessAll( /* @ */ aLIBS,;
ENDIF
NEXT
FOR EACH aFile IN Directory( "*.hbp" )
cFileName := aFile[ F_NAME ]
IF !( cFileName == HBMK_CFG_NAME )
IF t_lInfo
OutStd( "hbmk: Processing: " + cFileName + hb_osNewLine() )
IF ! lConfigOnly
FOR EACH aFile IN Directory( "*.hbp" )
cFileName := aFile[ F_NAME ]
IF !( cFileName == HBMK_CFG_NAME )
IF t_lInfo
OutStd( "hbmk: Processing: " + cFileName + hb_osNewLine() )
ENDIF
HBP_ProcessOne( cFileName,;
@aLIBS,;
@aLIBPATH,;
@aOPTPRG,;
@aOPTC,;
@aOPTL,;
@lGUI,;
@lMT,;
@lSHARED,;
@lSTATICFULL,;
@lDEBUG,;
@lNULRDD,;
@lMAP,;
@lSTRIP,;
@lRUN,;
@cGT )
ENDIF
HBP_ProcessOne( cFileName,;
@aLIBS,;
@aLIBPATH,;
@aOPTPRG,;
@aOPTC,;
@aOPTL,;
@lGUI,;
@lMT,;
@lSHARED,;
@lSTATICFULL,;
@lDEBUG,;
@lNULRDD,;
@lMAP,;
@lSTRIP,;
@lRUN,;
@cGT )
ENDIF
NEXT
NEXT
ENDIF
RETURN