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

2011-04-21 19:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + Added -c=/-cpp= dialect support for sunpro, icc, clang, watcom.
      Many thanks to Tamas for the information.
    + Added dialect support for vxworks/diag

  * contrib/hbpre.hbm
    - do not set any C++ std in contrib area
      it's a mess.
This commit is contained in:
Viktor Szakats
2011-04-21 17:24:42 +00:00
parent 2086668add
commit a576d4bbc3
3 changed files with 61 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -16,6 +16,16 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-04-21 19:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ Added -c=/-cpp= dialect support for sunpro, icc, clang, watcom.
Many thanks to Tamas for the information.
+ Added dialect support for vxworks/diag
* contrib/hbpre.hbm
- do not set any C++ std in contrib area
it's a mess.
2011-04-21 16:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* ChangeLog
! Addes missing change to 2011-04-21 01:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu):

1
harbour/contrib/hbpre.hbm
View File

@@ -18,6 +18,5 @@
{_HB_BUILD_LIBDYN}-hbdyn
-c=iso90
-cpp=iso98
-warn=yes

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

@@ -4037,6 +4037,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
ELSE
cOpt_CompC += " {LC}"
ENDIF
DO CASE
CASE hbmk[ _HBMK_cC ] == "iso99" ; AAdd( hbmk[ _HBMK_aOPTCX ], "-za99" )
ENDCASE
IF lStopAfterCComp .AND. ! hbmk[ _HBMK_lCreateLib ] .AND. ! hbmk[ _HBMK_lCreateDyn ]
IF ( Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) ) == 1
AAdd( hbmk[ _HBMK_aOPTC ], "-fo={OO}" )
@@ -4585,6 +4588,10 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
ELSE
cOpt_CompC += " {LC}"
ENDIF
DO CASE
CASE hbmk[ _HBMK_cC ] == "iso90" ; AAdd( hbmk[ _HBMK_aOPTCX ], "-xc99=none" )
CASE hbmk[ _HBMK_cC ] == "iso99" ; AAdd( hbmk[ _HBMK_aOPTCX ], "-xc99=all" )
ENDCASE
cBin_Link := cBin_CompC
cOpt_Link := "{LO} {LA} {FL} {DL}"
cLibPathPrefix := "-L"
@@ -4719,6 +4726,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
ELSE
cOpt_CompC += " {LC}"
ENDIF
DO CASE
CASE hbmk[ _HBMK_cC ] == "iso90" ; AAdd( hbmk[ _HBMK_aOPTCX ], "-Xdialect-ansi" ) /* Conform to ANSI X3.159-1989 with some additions [as shown in the table below]. */
ENDCASE
/* lib path list ({DL}) must precede lib list */
cBin_Dyn := cBin_CompC
cOpt_Dyn := "-Xpic -Wl, -Xshared -o {OD} {LO} {DL} {FD} {LS}"
@@ -6699,25 +6709,52 @@ STATIC PROCEDURE Set_lCreateDyn( hbmk, lValue )
STATIC FUNCTION gcc_opt_lngc_fill( hbmk )
SWITCH hbmk[ _HBMK_cC ]
CASE "iso90" ; RETURN "-std=c89"
CASE "iso99" ; RETURN "-std=c9x"
CASE "iso1x" ; RETURN "-std=c1x"
CASE "gnu90" ; RETURN "-std=gnu89"
CASE "gnu99" ; RETURN "-std=gnu9x"
CASE "gnu1x" ; RETURN "-std=gnu1x"
ENDSWITCH
DO CASE
CASE HBMK_ISCOMP( "gcc|gccarm|gccomf|mingw|mingw64|mingwarm|djgpp" )
SWITCH hbmk[ _HBMK_cC ]
CASE "iso90" ; RETURN "-std=c89"
CASE "iso99" ; RETURN "-std=c9x"
CASE "iso1x" ; RETURN "-std=c1x"
CASE "gnu90" ; RETURN "-std=gnu89"
CASE "gnu99" ; RETURN "-std=gnu9x"
CASE "gnu1x" ; RETURN "-std=gnu1x"
ENDSWITCH
CASE HBMK_ISCOMP( "icc|clang" )
SWITCH hbmk[ _HBMK_cC ]
CASE "iso90" ; RETURN "-std=c89"
CASE "iso99" ; RETURN "-std=c99"
CASE "gnu90" ; RETURN "-std=gnu89"
CASE "gnu99" ; RETURN "-std=gnu99"
ENDSWITCH
ENDCASE
RETURN ""
STATIC FUNCTION gcc_opt_lngcpp_fill( hbmk )
SWITCH hbmk[ _HBMK_cCPP ]
CASE "iso98" ; RETURN "-std=c++98"
CASE "iso0x" ; RETURN "-std=c++0x"
CASE "gnu98" ; RETURN "-std=gnu++98"
CASE "gnu0x" ; RETURN "-std=gnu++0x"
ENDSWITCH
DO CASE
CASE HBMK_ISCOMP( "gcc|gccarm|gccomf|mingw|mingw64|mingwarm|" )
SWITCH hbmk[ _HBMK_cCPP ]
CASE "iso98" ; RETURN "-std=c++98"
CASE "iso0x" ; RETURN "-std=c++0x"
CASE "gnu98" ; RETURN "-std=gnu++98"
CASE "gnu0x" ; RETURN "-std=gnu++0x"
ENDSWITCH
CASE HBMK_ISCOMP( "icc" )
SWITCH hbmk[ _HBMK_cCPP ]
CASE "iso98"
CASE "gnu98" ; RETURN "-std=gnu++98"
CASE "iso0x" ; RETURN "-std=c++0x"
ENDSWITCH
ENDCASE
RETURN ""