From d12ccc6badf8dcb641dfbd1d6e782a1fafc1630d Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 24 Feb 2009 12:40:54 +0000
Subject: [PATCH] 2009-02-24 13:39 UTC+0100 Viktor Szakats (harbour.01 syenar
 hu)   * config/win/msvc.cf   * config/win/msvc64.cf     ! Fixed to previous.

---
 harbour/ChangeLog            |  5 ++++
 harbour/config/win/msvc.cf   | 46 +++++++++++++++++++++++++++++++++++-
 harbour/config/win/msvc64.cf | 46 +-----------------------------------
 3 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0280255b46..f52033f413 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-24 13:39 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * config/win/msvc.cf
+  * config/win/msvc64.cf
+    ! Fixed to previous.
+
 2009-02-24 13:27 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * bin/hb-mkdyn.bat
   * make_gnu.bat
diff --git a/harbour/config/win/msvc.cf b/harbour/config/win/msvc.cf
index 2151b86dfc..50c146b6ba 100644
--- a/harbour/config/win/msvc.cf
+++ b/harbour/config/win/msvc.cf
@@ -4,6 +4,50 @@
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/msvc.cf
+OBJ_EXT = .obj
+EXE_EXT = .exe
+LIB_PREF =
+LIB_EXT = .lib
+
+CC = cl.exe
+CC_IN = -c
+CC_OUT = -Fo
+CPPFLAGS = -I. -I$(HB_INC_COMPILE)
+CFLAGS = -nologo -W4 -wd4127 -Gs
+# -Zi
+
+ifeq ($(HB_VISUALC_VER_PRE80),)
+CFLAGS += -Ot2b1 -EHs-c-
+else
+CFLAGS += -Ogt2yb1p -GX- -G6 -YX
+endif
+
+LD = cl.exe
+LD_OUT = -Fe
+
+# Add all libraries specified in CONTRIBS and LIBS.
+ifeq ($(HB_LIB_COMPILE),)
+LINKPATHS += /link /libpath:$(LIB_DIR)
+else
+LINKPATHS += /link /libpath:$(HB_LIB_COMPILE)
+endif
+LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
+LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
+
+# If LIBS specifies the rdd library, add all DB drivers.
+ifeq ($(findstring rdd,$(LIBS)),rdd)
+LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
+endif
+
+# Add the specified GT driver library
+ifeq ($(findstring rtl,$(LIBS)),rtl)
+LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
+endif
+
+LDFLAGS = $(LINKPATHS) user32.lib wsock32.lib advapi32.lib gdi32.lib
+
+AR = lib.exe
+ARFLAGS = $(HB_USER_AFLAGS)
+AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/win/msvc64.cf b/harbour/config/win/msvc64.cf
index 50c146b6ba..2151b86dfc 100644
--- a/harbour/config/win/msvc64.cf
+++ b/harbour/config/win/msvc64.cf
@@ -4,50 +4,6 @@
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
-OBJ_EXT = .obj
-EXE_EXT = .exe
-LIB_PREF =
-LIB_EXT = .lib
-
-CC = cl.exe
-CC_IN = -c
-CC_OUT = -Fo
-CPPFLAGS = -I. -I$(HB_INC_COMPILE)
-CFLAGS = -nologo -W4 -wd4127 -Gs
-# -Zi
-
-ifeq ($(HB_VISUALC_VER_PRE80),)
-CFLAGS += -Ot2b1 -EHs-c-
-else
-CFLAGS += -Ogt2yb1p -GX- -G6 -YX
-endif
-
-LD = cl.exe
-LD_OUT = -Fe
-
-# Add all libraries specified in CONTRIBS and LIBS.
-ifeq ($(HB_LIB_COMPILE),)
-LINKPATHS += /link /libpath:$(LIB_DIR)
-else
-LINKPATHS += /link /libpath:$(HB_LIB_COMPILE)
-endif
-LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
-LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
-
-# If LIBS specifies the rdd library, add all DB drivers.
-ifeq ($(findstring rdd,$(LIBS)),rdd)
-LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT))
-endif
-
-# Add the specified GT driver library
-ifeq ($(findstring rtl,$(LIBS)),rtl)
-LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT))
-endif
-
-LDFLAGS = $(LINKPATHS) user32.lib wsock32.lib advapi32.lib gdi32.lib
-
-AR = lib.exe
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
+include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/msvc.cf
 
 include $(TOP)$(ROOT)config/rules.cf