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

2009-12-21 20:11 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/utils/hbmk2/hbmk2.prg
    * added 'clib3r' to linked library list in DOS OpenWatcom builds.
      In pure C mode this library is not included automatically.
    ! do not use version suffix for harbour shared library in DJGPP builds
      to keep 8.3 plain DOS names (harbour[m].dxe)
    ! added -U to DXE3GEN parameters
This commit is contained in:
Przemyslaw Czerpak
2009-12-21 19:11:43 +00:00
parent 613ece5a14
commit 47d927670e
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -17,6 +17,14 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-12-21 20:11 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/utils/hbmk2/hbmk2.prg
* added 'clib3r' to linked library list in DOS OpenWatcom builds.
In pure C mode this library is not included automatically.
! do not use version suffix for harbour shared library in DJGPP builds
to keep 8.3 plain DOS names (harbour[m].dxe)
! added -U to DXE3GEN parameters
2009-12-21 16:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ Enabled -shared support for dos/djgpp. Not tested.

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

@@ -2658,7 +2658,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
cOpt_CompC += " {LC}"
ENDIF
cBin_Dyn := "dxe3gen"
cOpt_Dyn := "--whole-archive {FD} -o {OD} {DL} {LO} {LL} {LB} {LS}"
cOpt_Dyn := "--whole-archive -U {FD} -o {OD} {DL} {LO} {LL} {LB} {LS}"
cBin_Link := cBin_CompC
cOpt_Link := "{LO} {LA} {FL} {DL}{SCRIPT}"
cLibPathPrefix := "-L"
@@ -2702,8 +2702,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
AAdd( l_aLIBSYS, "pdcurses" )
ENDIF
l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourm" + cDL_Version_Alter + cLibExt,;
"harbour" + cDL_Version_Alter + cLibExt ) }
l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourm" + cLibExt,;
"harbour" + cLibExt ) }
IF ! Empty( hbmk[ _HBMK_cCCPATH ] )
cBin_Lib := FN_Escape( hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Lib, nCmd_Esc )
@@ -2804,6 +2804,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
CASE hbmk[ _HBMK_cPLAT ] == "win" ; cOpt_Dyn := "OP quiet SYS nt_dll {FD} NAME {OD} {LO} {DL} {LL} {LB} {LS}{SCRIPT}"
CASE hbmk[ _HBMK_cPLAT ] == "os2" ; cOpt_Dyn := "OP quiet SYS os2v2_dll {FD} NAME {OD} {LO} {DL} {LL} {LB} {LS}{SCRIPT}"
ENDCASE
IF hbmk[ _HBMK_cPLAT ] == "dos"
/* workaround for not included automatically CLIB in pure C mode DOS builds */
cOpt_Link += " LIB clib3r"
ENDIF
cBin_Lib := "wlib" + cCCEXT
cOpt_Lib := "-q {FA} {OL} {LO}{SCRIPT}"
cLibLibExt := cLibExt