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

2009-05-22 17:31 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! Fixed to use hb_osPathSeparator() instead of hardcoded 
      backslash in mingw* init section, as it may also be used 
      on *nix in cross compilation scenarios.
    ! Dropped .exe extensions from mingw* init section to also 
      work on *nix systems.
    * Extended xmingw, mingw32ce detection for all *nix systems.

  * contrib/hbodbc/odbc.c
    ! Cast.

  * INSTALL
  * config/global.cf
    * Removed requirement of 3.81 or upper GNU Make, now it's a
      recommendation only. If I understand correctly after
      2009-05-22 16:28 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
      older ones can also be used without parallel build feature.
      Lowered minimum version to 3.70.
This commit is contained in:
Viktor Szakats
2009-05-22 15:31:56 +00:00
parent ff56121181
commit cfcb03dcb6
5 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
harbour/ChangeLog
View File

@@ -17,6 +17,26 @@
past entries belonging to these authors: Viktor Szakats.
*/
2009-05-22 17:31 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
! Fixed to use hb_osPathSeparator() instead of hardcoded
backslash in mingw* init section, as it may also be used
on *nix in cross compilation scenarios.
! Dropped .exe extensions from mingw* init section to also
work on *nix systems.
* Extended xmingw, mingw32ce detection for all *nix systems.
* contrib/hbodbc/odbc.c
! Cast.
* INSTALL
* config/global.cf
* Removed requirement of 3.81 or upper GNU Make, now it's a
recommendation only. If I understand correctly after
2009-05-22 16:28 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
older ones can also be used without parallel build feature.
Lowered minimum version to 3.70.
2009-05-22 07:52 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* harbour/contrib/hbqt/generator/hbqtgen.prg
* harbour/contrib/hbqt/hbqt.h

7
harbour/INSTALL
View File

@@ -22,7 +22,7 @@ HOW TO BUILD AND INSTALL HARBOUR
For all platforms you'll need:
* Supported ANSI C compiler
* GNU Make (3.81 or upper)
* GNU Make (3.81 or upper recommended)
Linux/Darwin/BSD/HP-UX/Solaris
------------------------------
@@ -538,11 +538,6 @@ TROUBLESHOOTING
Please evaluate these points before reporting an issue on the mailing list.
- Make sure to have carefully read this document.
- Make sure to use a supported GNU Make version as indicated in
this document. Older versions are buggy and won't work.
Typical problem encountered with buggy GNU Make:
*** missing `endef', unterminated `define'. Stop.
*** missing `endif'. Stop.
- Make sure to do a 'clean' before doing a build after refreshing
the sources.
- Make sure to do a fresh checkout from the sf.net source repository

2
harbour/config/global.cf
View File

@@ -13,7 +13,7 @@
# a performance boost on a slow system.
.SUFFIXES:
need := 3.81
need := 3.70
ok := $(filter $(need),$(firstword $(sort $(MAKE_VERSION) $(need))))
ifeq ($(ok),)

2
harbour/contrib/hbodbc/odbc.c
View File

@@ -357,7 +357,7 @@ HB_FUNC( SQLCOLATTRIBUTE ) /* hStmt, nCol, nField, @cName, nLen, @nBufferLen, @n
( SQLSMALLINT * ) &wBufLen,
( SQLLEN * ) &wNumPtr );
#else
SQLINTEGER wNumPtr = hb_parnl( 7 );
SQLINTEGER wNumPtr = ( SQLINTEGER ) hb_parnl( 7 );
result = SQLColAttributes( ( SQLHSTMT ) hb_parptr( 1 ),
( SQLUSMALLINT ) hb_parni( 2 ),
( SQLUSMALLINT ) hb_parni( 3 ),

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

@@ -925,7 +925,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
AAdd( aCOMPDET_LOCAL, { {| cPrefix | tmp1 := PathNormalize( s_cHB_INSTALL_PREFIX ) + "mingw64" + hb_osPathSeparator() + "bin", iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc.exe" ), tmp1, NIL ) }, "win", "mingw64" , "x86_64-pc-mingw32-" } )
AAdd( aCOMPDET_LOCAL, { {| cPrefix | tmp1 := PathNormalize( s_cHB_INSTALL_PREFIX ) + "mingwce" + hb_osPathSeparator() + "bin", iif( hb_FileExists( tmp1 + hb_osPathSeparator() + cPrefix + "gcc.exe" ), tmp1, NIL ) }, "wce", "mingwarm", "arm-wince-mingw32ce-" } )
#elif defined( __PLATFORM__LINUX )
#elif defined( __PLATFORM__UNIX )
IF Empty( hbmk[ _HBMK_cCCPATH ] ) .AND. ;
Empty( hbmk[ _HBMK_cCCPREFIX ] )
@@ -1922,7 +1922,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
cLibPrefix := "-l"
cLibExt := ""
cObjExt := ".o"
cBin_CompC := hbmk[ _HBMK_cCCPREFIX ] + iif( s_lCPP != NIL .AND. s_lCPP, "g++.exe", "gcc.exe" )
cBin_CompC := hbmk[ _HBMK_cCCPREFIX ] + iif( s_lCPP != NIL .AND. s_lCPP, "g++", "gcc" ) /* Not using an .exe extension here. */
cOpt_CompC := "-c"
IF hbmk[ _HBMK_lOPTIM ]
cOpt_CompC += " -O3"
@@ -1945,13 +1945,13 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
cLibPathPrefix := "-L"
cLibPathSep := " "
cLibLibExt := ".a"
cBin_Lib := hbmk[ _HBMK_cCCPREFIX ] + "ar.exe"
cBin_Lib := hbmk[ _HBMK_cCCPREFIX ] + "ar"
cOpt_Lib := "{FA} rcs {OL} {LO}"
cLibObjPrefix := NIL
IF ! Empty( hbmk[ _HBMK_cCCPATH ] )
cBin_Lib := hbmk[ _HBMK_cCCPATH ] + "\" + cBin_Lib
cBin_CompC := hbmk[ _HBMK_cCCPATH ] + "\" + cBin_CompC
cBin_Link := hbmk[ _HBMK_cCCPATH ] + "\" + cBin_Link
cBin_Lib := hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Lib
cBin_CompC := hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_CompC
cBin_Link := hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Link
ENDIF
IF !( hbmk[ _HBMK_cARCH ] == "wce" )
IF hbmk[ _HBMK_lGUI ]
@@ -2006,7 +2006,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
cResExt := ".reso"
cOpt_Res := "{FR} {IR} -O coff -o {OS}"
IF ! Empty( hbmk[ _HBMK_cCCPATH ] )
cBin_Res := hbmk[ _HBMK_cCCPATH ] + "\" + cBin_Res
cBin_Res := hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Res
ENDIF
ENDIF