From f83c8f069e260eb6f30114bbf6cbf1d8762724bb Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 18 Feb 2010 16:00:52 +0000
Subject: [PATCH] 2010-02-18 16:59 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg   * config/wce/mingwarm.mk   *
 config/wce/poccarm.mk     ! Fixes to previous change after testing:       -
 '-D_WINCE' is required by pocc headers, so I've readded it there.       -
 '-DARM' is already defined by mingwarm, so it's not needed.

---
 harbour/ChangeLog              | 8 ++++++++
 harbour/config/wce/mingwarm.mk | 2 +-
 harbour/config/wce/poccarm.mk  | 2 ++
 harbour/utils/hbmk2/hbmk2.prg  | 3 +--
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c0e358d258..2a4d9a4dc9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-18 16:59 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+  * config/wce/mingwarm.mk
+  * config/wce/poccarm.mk
+    ! Fixes to previous change after testing:
+      - '-D_WINCE' is required by pocc headers, so I've readded it there.
+      - '-DARM' is already defined by mingwarm, so it's not needed.
+
 2010-02-18 16:46 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbsetup.h
     * Cleaned the way WinCE is detected.
diff --git a/harbour/config/wce/mingwarm.mk b/harbour/config/wce/mingwarm.mk
index 92c32c70df..e73d50b786 100644
--- a/harbour/config/wce/mingwarm.mk
+++ b/harbour/config/wce/mingwarm.mk
@@ -16,7 +16,7 @@ CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE) -DARM
+CFLAGS += -I. -I$(HB_INC_COMPILE)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -Wall -W
diff --git a/harbour/config/wce/poccarm.mk b/harbour/config/wce/poccarm.mk
index c61ab90433..4487737827 100644
--- a/harbour/config/wce/poccarm.mk
+++ b/harbour/config/wce/poccarm.mk
@@ -15,6 +15,8 @@ CC_IN := -c
 CC_OUT := -Fo
 
 CFLAGS += -I. -I$(HB_INC_COMPILE)
+# Required by pocc Windows headers
+CFLAGS += -D_WINCE
 
 CFLAGS += -Ze -Go
 
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 8051e8a106..908810fe21 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2632,11 +2632,9 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
             l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-x64",;
                                                       "harbour" + cDL_Version_Alter + "-x64" ) }
          CASE hbmk[ _HBMK_cCOMP ] == "mingwarm"
-            AAdd( hbmk[ _HBMK_aOPTC ], "-DARM" )
             l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-wce-arm",;
                                                       "harbour" + cDL_Version_Alter + "-wce-arm" ) }
          CASE hbmk[ _HBMK_cCOMP ] == "mingw" .AND. hbmk[ _HBMK_cPLAT ] = "wce"
-            AAdd( hbmk[ _HBMK_aOPTC ], "-D_X86_" )
             l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-wce-x86",;
                                                       "harbour" + cDL_Version_Alter + "-wce-x86" ) }
          OTHERWISE
@@ -3307,6 +3305,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
          cOpt_Dyn := "{FD} -dll -out:{OD} {DL} {LO} {LL} {LB} {LS}"
          IF hbmk[ _HBMK_cPLAT ] == "wce"
             AAdd( hbmk[ _HBMK_aOPTC ], "-DUNICODE" )
+            AAdd( hbmk[ _HBMK_aOPTC ], "-D_WINCE" ) /* Required by pocc Windows headers */
             AAdd( hbmk[ _HBMK_aOPTC ], "-D_WIN32_WCE=0x501 -DUNDER_CE" )
             AAdd( hbmk[ _HBMK_aOPTRES ], "-D_WIN32_WCE=0x501 -DUNDER_CE" )
          ENDIF