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

2009-11-05 15:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
  * config/os2/gcc.mk
    ! Fixed to use .lib extension in gccomf mode. As far I could 
      debunk it from lenghty e-mail, this is the default extension for 
      libs, used by OS/2 GCC in OMF mode.
      If not, don't blame me.
    ! Fixed to not use lib prefix in gccomf mode.
      It does seem alright but due to no testing again give me 
      *very short correction information*, if this turns out to be 
      false.

  * contrib/hbct/disk.c
    ! Typo in comment.
This commit is contained in:
Viktor Szakats
2009-11-05 14:10:27 +00:00
parent 8eb52166ad
commit bb37817b27
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -17,6 +17,21 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-11-05 15:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
* config/os2/gcc.mk
! Fixed to use .lib extension in gccomf mode. As far I could
debunk it from lenghty e-mail, this is the default extension for
libs, used by OS/2 GCC in OMF mode.
If not, don't blame me.
! Fixed to not use lib prefix in gccomf mode.
It does seem alright but due to no testing again give me
*very short correction information*, if this turns out to be
false.
* contrib/hbct/disk.c
! Typo in comment.
2009-11-04 20:04 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/utils/hbmk2/hbmk2.prg
! do not overwrite file extensions set in .clp file when checking

6
harbour/config/os2/gcc.mk
View File

@@ -10,7 +10,11 @@ endif
OBJ_EXT := .o
LIB_PREF :=
LIB_EXT := .a
ifeq ($(HB_COMPILER),gccomf)
LIB_EXT := .lib
else
LIB_EXT := .a
endif
CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
CC_IN := -c

2
harbour/contrib/hbct/disk.c
View File

@@ -104,7 +104,7 @@ HB_FUNC( DIRNAME )
if( pszDrive )
{
UCHAR uc = ( UCHAR ) *pszDrive;
/* some network drivers (f.e. NETX from Novel Netware) allow
/* some network drivers (f.e. NETX from Novell NetWare) allow
* to create drives after 'Z' letter.
*/
if( uc >= 'A' && uc < 'A' + 32 )

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

@@ -2500,7 +2500,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
IF hbmk[ _HBMK_lDEBUG ]
AAdd( hbmk[ _HBMK_aOPTC ], "-g" )
ENDIF
cLibLibPrefix := "lib"
cLibPrefix := "-l"
cLibExt := ""
cObjExt := ".o"
@@ -2524,14 +2523,16 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
cOpt_Link := "{LO} {LA} {FL} {DL}"
cLibPathPrefix := "-L"
cLibPathSep := " "
cLibLibExt := ".a"
IF hbmk[ _HBMK_cCOMP ] == "gccomf"
cLibLibExt := ".lib"
cBin_Lib := hbmk[ _HBMK_cCCPREFIX ] + "emxomfar" + cCCEXT
AAdd( hbmk[ _HBMK_aOPTC ], "-Zomf" )
AAdd( hbmk[ _HBMK_aOPTL ], "-Zomf" )
AAdd( hbmk[ _HBMK_aOPTD ], "-Zomf" )
ELSE
cLibLibPrefix := "lib"
cLibLibExt := ".a"
cBin_Lib := hbmk[ _HBMK_cCCPREFIX ] + "ar" + cCCEXT
ENDIF
cOpt_Lib := "{FA} rcs {OL} {LO}"