From 8ea115f759f5082e530dbe83142b1c6cac60de55 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 29 Mar 2010 20:36:08 +0000
Subject: [PATCH] 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.
---
 harbour/ChangeLog             | 9 +++++++++
 harbour/utils/hbmk2/hbmk2.prg | 7 +++++--
 harbour/utils/hbrun/hbrun.rc  | 5 ++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1d8a50fc95..5f18330e3d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -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
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 993b65216e..dd7cc57102 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -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. ;
diff --git a/harbour/utils/hbrun/hbrun.rc b/harbour/utils/hbrun/hbrun.rc
index a833b17a63..040f114369 100644
--- a/harbour/utils/hbrun/hbrun.rc
+++ b/harbour/utils/hbrun/hbrun.rc
@@ -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