From 69ebe57a5803b687626b94d5f965bb8f541ceb99 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 14 Mar 2010 11:22:12 +0000 Subject: [PATCH] 2010-03-14 12:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * config/wce/msvcarm.mk * utils/hbmk2/hbmk2.prg ! Added -D_ARM_ required by some MSVC releases. This caused compilation errors with some sources. --- harbour/ChangeLog | 6 ++++++ harbour/config/wce/msvcarm.mk | 4 ++-- harbour/utils/hbmk2/hbmk2.prg | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3cb4815ac8..97bcaeae94 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-14 12:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * config/wce/msvcarm.mk + * utils/hbmk2/hbmk2.prg + ! Added -D_ARM_ required by some MSVC releases. + This caused compilation errors with some sources. + 2010-03-14 11:48 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbxbp/xbpgra.prg ! Fixed to use HB_SYMBOL_UNUSED() instead of wrong "HBXBP_JUST" diff --git a/harbour/config/wce/msvcarm.mk b/harbour/config/wce/msvcarm.mk index 555d1d23e6..4c461c5d22 100644 --- a/harbour/config/wce/msvcarm.mk +++ b/harbour/config/wce/msvcarm.mk @@ -22,11 +22,11 @@ CFLAGS += -I. -I$(HB_INC_COMPILE) CFLAGS += -nologo ifeq ($(HB_COMPILER),msvcarm) - CFLAGS += -D_M_ARM -DARM + CFLAGS += -D_M_ARM -DARM -D_ARM_ else ifeq ($(HB_COMPILER),msvcsh) CFLAGS += -D_M_SH -DSHx else ifeq ($(HB_COMPILER),msvcmips) - CFLAGS += -D_M_MRX000=4000 -DMIPS + CFLAGS += -D_M_MRX000=4000 -DMIPS -D_MIPS_ else ifeq ($(HB_COMPILER),msvc) CFLAGS += -D_M_IX86 -D_X86_ endif diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 401104280f..8490e4ce00 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -3249,7 +3249,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause ) AAdd( hbmk[ _HBMK_aOPTRES ], "-DUNDER_CE" ) DO CASE CASE hbmk[ _HBMK_cCOMP ] == "msvcarm" - AAdd( hbmk[ _HBMK_aOPTC ], "-D_M_ARM -DARM" ) + AAdd( hbmk[ _HBMK_aOPTC ], "-D_M_ARM -DARM -D_ARM_" ) CASE hbmk[ _HBMK_cCOMP ] == "msvc" /* TODO */ ENDCASE