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

2009-06-11 11:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* INSTALL
    * Further cleanups in pocc examples.

  * utils/hbmk2/hbmk2.prg
    + Added support to detect pocc64 vs. pocc when one 
      common PellesC installation is used. This is probably 
      how most users will use it in real life.
      New pocc 6.0 support one unified build for pocc, pocc64 and poccarm.
This commit is contained in:
Viktor Szakats
2009-06-11 09:05:52 +00:00
parent 1817ad2b29
commit 4259e6ca3d
3 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -17,6 +17,16 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-06-11 11:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
* Further cleanups in pocc examples.
* utils/hbmk2/hbmk2.prg
+ Added support to detect pocc64 vs. pocc when one
common PellesC installation is used. This is probably
how most users will use it in real life.
New pocc 6.0 support one unified build for pocc, pocc64 and poccarm.
2009-06-11 10:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
- contrib/hbxbp/tests/hbqt.hbc
+ contrib/hbxbp/tests/hbmk.hbm

20
harbour/INSTALL
View File

@@ -410,7 +410,7 @@ EXAMPLES
---
--- Borland/CodeGear C++
set PATH=C:\Borland\BCC55\bin;%PATH%
set PATH=C:\Borland\BCC55\Bin;%PATH%
rem
set HB_COMPILER=bcc
set HB_INSTALL_PREFIX=C:\hb-%HB_COMPILER%
@@ -418,9 +418,9 @@ EXAMPLES
---
--- Pelles C
set PATH=%ProgramFiles%\PellesC\bin;%PATH%
set INCLUDE=%ProgramFiles%\PellesC\include;%ProgramFiles%\PellesC\include\win;%INCLUDE%
set LIB=%ProgramFiles%\PellesC\lib;%ProgramFiles%\PellesC\lib\win;%LIB%
set PATH=%ProgramFiles%\PellesC\Bin;%PATH%
set INCLUDE=%ProgramFiles%\PellesC\Include;%ProgramFiles%\PellesC\Include\Win;%INCLUDE%
set LIB=%ProgramFiles%\PellesC\Lib;%ProgramFiles%\PellesC\Lib\Win;%LIB%
rem
set HB_COMPILER=pocc
set HB_INSTALL_PREFIX=C:\hb-%HB_COMPILER%
@@ -428,9 +428,9 @@ EXAMPLES
---
--- Pelles C x86-64 (requires native x86 Harbour binaries)
set PATH=%ProgramFiles%\PellesC-64\bin;%PATH%
set INCLUDE=%ProgramFiles%\PellesC-64\include;%ProgramFiles%\PellesC-64\include\win;%INCLUDE%
set LIB=%ProgramFiles%\PellesC-64\lib;%ProgramFiles%\PellesC-64\lib\win64;%LIB%
set PATH=%ProgramFiles%\PellesC\Bin;%PATH%
set INCLUDE=%ProgramFiles%\PellesC\Include;%ProgramFiles%\PellesC\Include\Win;%INCLUDE%
set LIB=%ProgramFiles%\PellesC\Lib;%ProgramFiles%\PellesC\Lib\Win64;%LIB%
rem
set HB_BIN_COMPILE=C:\hb-pocc\bin
set HB_PPGEN_PATH=%HB_BIN_COMPILE%
@@ -441,9 +441,9 @@ EXAMPLES
---
--- Pelles C WinCE/ARM (requires native x86 Harbour binaries)
set PATH=%ProgramFiles%\PellesC\bin;%PATH%
set INCLUDE=%ProgramFiles%\PellesC\include\wince;%ProgramFiles%\PellesC\include;%INCLUDE%
set LIB=%ProgramFiles%\PellesC\lib;%ProgramFiles%\PellesC\lib\wince;%INCLUDE%
set PATH=%ProgramFiles%\PellesC\Bin;%PATH%
set INCLUDE=%ProgramFiles%\PellesC\Include\WinCE;%ProgramFiles%\PellesC\Include;%INCLUDE%
set LIB=%ProgramFiles%\PellesC\Lib;%ProgramFiles%\PellesC\Lib\WinCE;%LIB%
rem
set HB_BIN_COMPILE=C:\hb-pocc\bin
set HB_PPGEN_PATH=%HB_BIN_COMPILE%

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

@@ -925,7 +925,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
FindInPath( "cl" ),;
NIL ) }, "msvc" },;
{ {|| _BCC_BIN_DETECT() }, "bcc" },;
{ {|| FindInPath( "porc64" ) }, "pocc64" },;
{ {|| iif( FindInPath( "dbgeng.lib", GetEnv( "LIB" ) ) != NIL .AND. ( tmp1 := FindInPath( "pocc" ) ) != NIL, tmp1, NIL ) }, "pocc64" },;
{ {|| FindInPath( "pocc" ) }, "pocc" },;
{ {|| iif( ( tmp1 := FindInPath( "icl" ) ) != NIL .AND. "itanium" $ Lower( tmp1 ), tmp1, NIL ) }, "iccia64" },;
{ {|| FindInPath( "icl" ) }, "icc" },;
@@ -4210,7 +4210,7 @@ STATIC FUNCTION LibExists( hbmk, cDir, cLib, cLibExt )
RETURN NIL
STATIC FUNCTION FindInPath( cFileName )
STATIC FUNCTION FindInPath( cFileName, cPath )
LOCAL cDir
LOCAL cName
LOCAL cExt
@@ -4236,13 +4236,15 @@ STATIC FUNCTION FindInPath( cFileName )
ENDIF
ENDIF
DEFAULT cPath TO GetEnv( "PATH" )
/* Check in the PATH. */
#if defined( __PLATFORM__WINDOWS ) .OR. ;
defined( __PLATFORM__DOS ) .OR. ;
defined( __PLATFORM__OS2 )
FOR EACH cDir IN hb_ATokens( GetEnv( "PATH" ), hb_osPathListSeparator(), .T., .T. )
FOR EACH cDir IN hb_ATokens( cPath, hb_osPathListSeparator(), .T., .T. )
#else
FOR EACH cDir IN hb_ATokens( GetEnv( "PATH" ), hb_osPathListSeparator() )
FOR EACH cDir IN hb_ATokens( cPath, hb_osPathListSeparator() )
#endif
IF ! Empty( cDir )
IF hb_FileExists( cFileName := hb_FNameMerge( DirAddPathSep( StrStripQuote( cDir ) ), cName, cExt ) )