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

2010-03-29 22:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! Fixed to always convert pathseps in icon filename to forward 
      slashes.

  * utils/hbrun/hbrun.rc
    * Cleaned. Now back to original commit with purely forward 
      slashes. Should see if this works with OS/2 GCC windres.
This commit is contained in:
Viktor Szakats
2010-03-29 20:36:08 +00:00
parent dae414e1ce
commit 8ea115f759
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -17,6 +17,15 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-03-29 22:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
! Fixed to always convert pathseps in icon filename to forward
slashes.
* utils/hbrun/hbrun.rc
* Cleaned. Now back to original commit with purely forward
slashes. Should see if this works with OS/2 GCC windres.
2010-03-29 13:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
* config/os2/gcc.mk

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

@@ -4309,9 +4309,9 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
'/* You can safely delete it. */' + Chr( 10 ) +;
'' + Chr( 10 )
IF hbmk[ _HBMK_cPLAT ] == "os2"
AEval( hbmk[ _HBMK_aICON ], {| tmp, tmp1 | cFile += 'ICON ' + hb_ntos( tmp1 ) + ' DISCARDABLE "' + FN_Escape( PathSepToTarget( hbmk, tmp ), _ESC_BACKSLASH ) + '"' + Chr( 10 ) } )
AEval( hbmk[ _HBMK_aICON ], {| tmp, tmp1 | cFile += 'ICON ' + hb_ntos( tmp1 ) + ' DISCARDABLE "' + PathSepToForward( tmp ) + '"' + Chr( 10 ) } )
ELSE
AEval( hbmk[ _HBMK_aICON ], {| tmp, tmp1 | cFile += 'ICON' + hb_ntos( tmp1 ) + ' ICON DISCARDABLE "' + FN_Escape( PathSepToTarget( hbmk, tmp ), _ESC_BACKSLASH ) + '"' + Chr( 10 ) } )
AEval( hbmk[ _HBMK_aICON ], {| tmp, tmp1 | cFile += 'ICON' + hb_ntos( tmp1 ) + ' ICON DISCARDABLE "' + PathSepToForward( tmp ) + '"' + Chr( 10 ) } )
ENDIF
IF hbmk[ _HBMK_lINC ]
@@ -6098,6 +6098,9 @@ STATIC FUNCTION FN_FromArray( aPath, nFrom, nTo, cFileName, cDirPrefix )
RETURN hb_FNameMerge( DirDelPathSep( DirAddPathSep( cDirPrefix ) + cDir ), cFileName )
STATIC FUNCTION PathSepToForward( cFileName )
RETURN StrTran( cFileName, "\", "/" )
STATIC FUNCTION PathSepToSelf( cFileName )
#if defined( __PLATFORM__WINDOWS ) .OR. ;
defined( __PLATFORM__DOS ) .OR. ;

5
harbour/utils/hbrun/hbrun.rc
View File

@@ -2,9 +2,8 @@
* $Id$
*/
#if ( defined( OS2 ) || defined( __OS2__ ) || defined( OS_2 ) ) && ! defined( __GNUC__ )
/* os2/watcom */
ICON DISCARDABLE "../../../../../package/harbour.ico"
#if defined( OS2 ) || defined( __OS2__ ) || defined( OS_2 )
ICON 1 DISCARDABLE "../../../../../package/harbour.ico"
#else
ICON1 ICON DISCARDABLE "../../../../../package/harbour.ico"
#endif