From 21baf7c58a8873bf230e2f0c5e0ed0d04f046524 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 22 Feb 2009 21:39:32 +0000
Subject: [PATCH] 2009-02-22 22:39 UTC+0100 Viktor Szakats (harbour.01 syenar
 hu)   * make_vc.mak     ! Added workaround for WinCE mode.

  * config/win/msvcce.cf
    ! Fixed cl name when building with older MSVC version.
---
 harbour/ChangeLog            | 7 +++++++
 harbour/config/win/msvcce.cf | 4 ++++
 harbour/make_vc.mak          | 9 ++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2868629667..7f317cda27 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-22 22:39 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * make_vc.mak
+    ! Added workaround for WinCE mode.
+
+  * config/win/msvcce.cf
+    ! Fixed cl name when building with older MSVC version.
+
 2009-02-22 21:52 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * bin/hb-mkdll.bat
     + Added Borland C/C++ .dll building.
diff --git a/harbour/config/win/msvcce.cf b/harbour/config/win/msvcce.cf
index a454f2eae3..e985dd0611 100644
--- a/harbour/config/win/msvcce.cf
+++ b/harbour/config/win/msvcce.cf
@@ -14,7 +14,11 @@ LIB_EXT = .lib
 # Favor size for CE builds.
 HB_GCMODE=0
 
+ifeq ($(HB_VISUALC_VER_PRE80),)
 CC = cl.exe
+else
+CC = clarm.exe
+endif
 CC_IN = -c
 CC_OUT = -Fo
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak
index d988d99b21..70bd47f1f6 100644
--- a/harbour/make_vc.mak
+++ b/harbour/make_vc.mak
@@ -89,10 +89,17 @@ MKLIB  = lib.exe
 # substitution, so we have to hardcode it
 
 # TOFIX: This won't work properly if HB_CC_NAME is overridden by user (f.e. for WinCE builds).
+!if "$(HB_BUILD_WINCE)" == "yes"
+VMMTDLL_LIB_OBJS = $(VM_DLL_OBJS:obj\vcce=obj\vcce\mt_dll)
+VMMT_LIB_OBJS = $(VM_LIB_OBJS:obj\vcce=obj\vcce\mt)
+DLL_OBJS = $(TMP_DLL_OBJS:obj\vcce=obj\vcce\dll) $(VM_DLL_OBJS:obj\vcce=obj\vcce\dll)
+MTDLL_OBJS = $(TMP_DLL_OBJS:obj\vcce=obj\vcce\dll) $(VMMTDLL_LIB_OBJS)
+!else
 VMMTDLL_LIB_OBJS = $(VM_DLL_OBJS:obj\vc=obj\vc\mt_dll)
 VMMT_LIB_OBJS = $(VM_LIB_OBJS:obj\vc=obj\vc\mt)
 DLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\vc\dll) $(VM_DLL_OBJS:obj\vc=obj\vc\dll)
 MTDLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\vc\dll) $(VMMTDLL_LIB_OBJS)
+!endif
 
 #**********************************************************
 # C compiler, Harbour compiler and Linker flags.
@@ -757,7 +764,7 @@ LDFLAGSDLL     = /debug $(LDFLAGSDLL)
 all : $(HB_DEST_DIRS) $(HB_BUILD_TARGETS)
 
 #**********************************************************
-# Helper targets - disabled for Msvc
+# Helper targets - disabled for MSVC
 #**********************************************************
 
 #BasicLibs : $(COMMON_LIB) $(COMPILER_LIB) $(PP_LIB)