From 037260a10bce2854e54591aa34df9e47ee7d71d9 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 28 Mar 2010 09:43:41 +0000
Subject: [PATCH] 2010-03-28 11:38 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * config/wce/mingwarm.mk   * config/win/mingw.mk   *
 config/win/cygwin.mk   * config/os2/gcc.mk     ! Fixed resource compiler
 binary name to honor CCPREFIX and friends.

  * utils/hbrun/Makefile
  + utils/hbrun/hbrun.rc
    + Added resource file to include icon.
    ; TOFIX: The .ico file path is hard-wired and will break if HB_BUILD_NAME
             contains subdirs.

  * bin/postinst.bat
    - Deleted no more necessary hack to build hbrun with icon using hbmk2.
---
 harbour/ChangeLog              | 16 ++++++++++++++++
 harbour/bin/postinst.bat       | 17 -----------------
 harbour/config/os2/gcc.mk      |  2 +-
 harbour/config/wce/mingwarm.mk |  2 +-
 harbour/config/win/cygwin.mk   |  2 +-
 harbour/config/win/mingw.mk    |  2 +-
 harbour/utils/hbrun/Makefile   |  3 +++
 harbour/utils/hbrun/hbrun.rc   |  9 +++++++++
 8 files changed, 32 insertions(+), 21 deletions(-)
 create mode 100644 harbour/utils/hbrun/hbrun.rc

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2ccbd56f3e..f7eaed0c61 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,22 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-03-28 11:38 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/wce/mingwarm.mk
+  * config/win/mingw.mk
+  * config/win/cygwin.mk
+  * config/os2/gcc.mk
+    ! Fixed resource compiler binary name to honor CCPREFIX and friends.
+
+  * utils/hbrun/Makefile
+  + utils/hbrun/hbrun.rc
+    + Added resource file to include icon.
+    ; TOFIX: The .ico file path is hard-wired and will break if HB_BUILD_NAME
+             contains subdirs.
+
+  * bin/postinst.bat
+    - Deleted no more necessary hack to build hbrun with icon using hbmk2.
+
 2010-03-28 11:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
   * config/rules.mk
diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat
index b06987af3a..b34a2e141f 100644
--- a/harbour/bin/postinst.bat
+++ b/harbour/bin/postinst.bat
@@ -33,23 +33,6 @@ if "%HB_SHELL%" == "nt" goto _SH_NT
 
 :_SH_NT
 
-   if "%HB_PLATFORM%" == "dos" goto _NO_ICON_BIN
-   if "%HB_PLATFORM%" == "linux" goto _NO_ICON_BIN
-
-   rem ; We build this here, because GNU Make wouldn't add the icon.
-   echo ! Making hbrun with application icon...
-
-   set _HB_OPTIONS_=
-   if "%HB_BUILD_SHARED%" == "yes" set _HB_OPTIONS_=-shared
-   if "%HB_BUILD_DLL%" == "no"     set _HB_OPTIONS_=
-   if "%HB_BUILD_MODE%" == "cpp"   set _HB_OPTIONS_=%_HB_OPTIONS_% -cpp=yes
-   if "%HB_BUILD_MODE%" == "c"     set _HB_OPTIONS_=%_HB_OPTIONS_% -cpp=no
-   if "%HB_BUILD_DEBUG%" == "yes"  set _HB_OPTIONS_=%_HB_OPTIONS_% -debug
-   "%HB_HOST_BIN_DIR%\hbmk2" -quiet -q0 -lang=en %_HB_OPTIONS_% "-o%HB_BIN_INSTALL%\hbrun" "%~dp0..\utils\hbrun\hbrun.hbp"
-   set _HB_OPTIONS_=
-
-:_NO_ICON_BIN
-
    if "%HB_PLATFORM%" == "linux" goto _NO_PKG
    if not "%HB_BUILD_PKG%" == "yes" goto _NO_PKG
    if "%HB_TOP%" == "" goto _NO_PKG
diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk
index 85172ab695..a2e5b881cc 100644
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -39,7 +39,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
    CFLAGS += -g
 endif
 
-RC := windres
+RC := $(HB_CCPATH)$(HB_CCPREFIX)windres
 RC_OUT := -o$(subst x,x, )
 ifeq ($(HB_COMPILER),gccomf)
    RCFLAGS := -O omf
diff --git a/harbour/config/wce/mingwarm.mk b/harbour/config/wce/mingwarm.mk
index 74dd0547b5..7ee9c1d512 100644
--- a/harbour/config/wce/mingwarm.mk
+++ b/harbour/config/wce/mingwarm.mk
@@ -34,7 +34,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
    CFLAGS += -g
 endif
 
-RC := windres
+RC := $(HB_CCPATH)$(HB_CCPREFIX)windres
 RC_OUT := -o$(subst x,x, )
 RCFLAGS := -O coff
 
diff --git a/harbour/config/win/cygwin.mk b/harbour/config/win/cygwin.mk
index 1e8b7780d0..9f5ae65873 100644
--- a/harbour/config/win/cygwin.mk
+++ b/harbour/config/win/cygwin.mk
@@ -31,7 +31,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
    CFLAGS += -g
 endif
 
-RC := windres
+RC := $(HB_CCPATH)$(HB_CCPREFIX)windres
 RC_OUT := -o$(subst x,x, )
 RCFLAGS := -O coff
 
diff --git a/harbour/config/win/mingw.mk b/harbour/config/win/mingw.mk
index 8a02bbf35b..02f89159c8 100644
--- a/harbour/config/win/mingw.mk
+++ b/harbour/config/win/mingw.mk
@@ -50,7 +50,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
    CFLAGS += -g
 endif
 
-RC := windres
+RC := $(HB_CCPATH)$(HB_CCPREFIX)windres
 RC_OUT := -o$(subst x,x, )
 RCFLAGS := -O coff
 
diff --git a/harbour/utils/hbrun/Makefile b/harbour/utils/hbrun/Makefile
index 6c8f7f0cc4..cdadbed672 100644
--- a/harbour/utils/hbrun/Makefile
+++ b/harbour/utils/hbrun/Makefile
@@ -9,6 +9,9 @@ include $(TOP)$(ROOT)config/global.mk
 PRG_SOURCES := \
    hbrun.prg \
 
+RC_SOURCES := \
+   hbrun.rc
+
 PRG_MAIN := hbrun.prg
 
 LIBS = hbcplr hbpp hbcommon $(HB_LIBS_ST_RDD)
diff --git a/harbour/utils/hbrun/hbrun.rc b/harbour/utils/hbrun/hbrun.rc
new file mode 100644
index 0000000000..776b4ae7d1
--- /dev/null
+++ b/harbour/utils/hbrun/hbrun.rc
@@ -0,0 +1,9 @@
+/*
+ * $Id$
+ */
+
+#if defined( __BORLANDC__ )
+ICON1 ICON DISCARDABLE "..\..\..\..\..\package\harbour.ico"
+#else
+ICON1 ICON DISCARDABLE "..\\..\\..\\..\\..\\package\\harbour.ico"
+#endif