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

2010-02-16 15:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! Fix to add 'lib' prefix for gcc compiler when using -implib option.
    + Added comment detailing prev change.

  * config/wce/msvcarm.mk
  * config/win/msvc.mk
    - Deleted -YX option. 
      We don't want to force precompiled headers by default on older 
      MSVC versions.
This commit is contained in:
Viktor Szakats
2010-02-16 14:07:07 +00:00
parent cd83e94235
commit b0396dac4e
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -17,6 +17,17 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-02-16 15:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
! Fix to add 'lib' prefix for gcc compiler when using -implib option.
+ Added comment detailing prev change.
* config/wce/msvcarm.mk
* config/win/msvc.mk
- Deleted -YX option.
We don't want to force precompiled headers by default on older
MSVC versions.
2010-02-16 11:13 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* include/hbthread.h
* src/vm/fm.c

2
harbour/config/wce/msvcarm.mk
View File

@@ -60,7 +60,7 @@ endif
ifneq ($(HB_BUILD_OPTIM),no)
ifneq ($(filter $(HB_COMPILER_VER),600 700 710),)
CFLAGS += -Oxsb1 -EHsc -YX -GF
CFLAGS += -Oxsb1 -EHsc -GF
else
CFLAGS += -Od -Os -Gy -EHsc-
endif

2
harbour/config/win/msvc.mk
View File

@@ -47,7 +47,7 @@ endif
ifneq ($(HB_BUILD_OPTIM),no)
ifneq ($(filter $(HB_COMPILER_VER),600 700 710),)
CFLAGS += -Ogt2yb1p -GX- -G6 -YX
CFLAGS += -Ogt2yb1p -GX- -G6
else
CFLAGS += -Ot2b1 -EHs-c-
endif

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

@@ -597,6 +597,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
LOCAL l_aOPTRUN
LOCAL l_cPROGDIR
LOCAL l_cPROGNAME
LOCAL l_cIMPLIBNAME
LOCAL l_aOBJ
LOCAL l_aOBJA
LOCAL l_aCLEAN
@@ -1484,6 +1485,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
l_aOBJA := {}
l_cPROGDIR := NIL
l_cPROGNAME := NIL
l_cIMPLIBNAME := NIL
hbmk[ _HBMK_cFIRST ] := NIL
hbmk[ _HBMK_aPO ] := {}
hbmk[ _HBMK_cHBL ] := NIL
@@ -3174,6 +3176,8 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
ELSE
IF hbmk[ _HBMK_nWARN ] == _WARN_YES
IF hbmk[ _HBMK_cCOMP ] == "msvcarm" .AND. nCCompVer < 800
/* Lowered warning level to avoid large amount of warnings in system headers.
Maybe this is related to the msvc2003 kit I was using. [vszakats] */
AAdd( hbmk[ _HBMK_aOPTC ], "-W2" )
ELSE
AAdd( hbmk[ _HBMK_aOPTC ], "-W4 -wd4127" )
@@ -3521,10 +3525,12 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
IF Empty( cExt ) .AND. ! Empty( cBinExt )
l_cPROGNAME := hb_FNameMerge( cDir, cName, cBinExt )
ENDIF
l_cIMPLIBNAME := hb_FNameMerge( cDir, cLibLibPrefix + cName, cLibLibExt )
CASE lStopAfterCComp .AND. hbmk[ _HBMK_lCreateDyn ]
IF Empty( cExt ) .AND. ! Empty( cDynLibExt )
l_cPROGNAME := hb_FNameMerge( cDir, cName, cDynLibExt )
ENDIF
l_cIMPLIBNAME := hb_FNameMerge( cDir, cLibLibPrefix + cName, cLibLibExt )
CASE lStopAfterCComp .AND. hbmk[ _HBMK_lCreateLib ]
l_cPROGNAME := hb_FNameMerge( cDir, cLibLibPrefix + cName, iif( Empty( cLibLibExt ), cExt, cLibLibExt ) )
ENDCASE
@@ -4552,7 +4558,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
cOpt_Link := StrTran( cOpt_Link, "{LB}" , ArrayToList( l_aLIBA,, nOpt_Esc ) )
cOpt_Link := StrTran( cOpt_Link, "{OE}" , FN_Escape( PathSepToTarget( hbmk, l_cPROGNAME ), nOpt_Esc ) )
cOpt_Link := StrTran( cOpt_Link, "{OM}" , FN_Escape( PathSepToTarget( hbmk, FN_ExtSet( l_cPROGNAME, ".map" ) ), nOpt_Esc ) )
cOpt_Link := StrTran( cOpt_Link, "{OI}" , FN_Escape( PathSepToTarget( hbmk, FN_ExtSet( l_cPROGNAME, cLibLibExt ) ), nOpt_Esc ) )
cOpt_Link := StrTran( cOpt_Link, "{OI}" , FN_Escape( PathSepToTarget( hbmk, l_cIMPLIBNAME ), nOpt_Esc ) )
cOpt_Link := StrTran( cOpt_Link, "{DL}" , ArrayToList( hbmk[ _HBMK_aLIBPATH ], cLibPathSep, nOpt_Esc, cLibPathPrefix ) )
cOpt_Link := StrTran( cOpt_Link, "{DB}" , l_cHB_BIN_INSTALL )
@@ -4641,7 +4647,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
cOpt_Dyn := StrTran( cOpt_Dyn, "{LB}" , ArrayToList( l_aLIBA,, nOpt_Esc ) )
cOpt_Dyn := StrTran( cOpt_Dyn, "{OD}" , FN_Escape( PathSepToTarget( hbmk, l_cPROGNAME ), nOpt_Esc ) )
cOpt_Dyn := StrTran( cOpt_Dyn, "{OM}" , FN_Escape( PathSepToTarget( hbmk, FN_ExtSet( l_cPROGNAME, ".map" ) ), nOpt_Esc ) )
cOpt_Dyn := StrTran( cOpt_Dyn, "{OI}" , FN_Escape( PathSepToTarget( hbmk, FN_ExtSet( l_cPROGNAME, cLibLibExt ) ), nOpt_Esc ) )
cOpt_Dyn := StrTran( cOpt_Dyn, "{OI}" , FN_Escape( PathSepToTarget( hbmk, l_cIMPLIBNAME ), nOpt_Esc ) )
cOpt_Dyn := StrTran( cOpt_Dyn, "{DL}" , ArrayToList( hbmk[ _HBMK_aLIBPATH ], cLibPathSep, nOpt_Esc, cLibPathPrefix ) )
cOpt_Dyn := StrTran( cOpt_Dyn, "{DB}" , l_cHB_BIN_INSTALL )