From bf8305fe00c4041adf424e81bfdeffd70c92b955 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 14 Sep 2012 07:55:58 +0000
Subject: [PATCH] 2012-09-14 09:54 UTC+0200 Viktor Szakats (harbour syenar.net)
   * config/global.mk   * include/hbsetup.h   * INSTALL   *
 utils/hbmk2/hbmk2.prg     + added bits (docs, version autodetect, etc) for MS
 Visual Studio 2012

---
 harbour/ChangeLog             |  7 +++++++
 harbour/INSTALL               | 26 +++++++++++++++++++++++---
 harbour/config/global.mk      | 12 ++++++++++++
 harbour/include/hbsetup.h     |  1 +
 harbour/utils/hbmk2/hbmk2.prg |  2 ++
 5 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 91884ac0fb..ee60bdc3c5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-09-14 09:54 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * config/global.mk
+  * include/hbsetup.h
+  * INSTALL
+  * utils/hbmk2/hbmk2.prg
+    + added bits (docs, version autodetect, etc) for MS Visual Studio 2012
+
 2012-09-13 14:27 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbxbp/toolbar.prg
     + Added: to send a QIcon() along the text for a toolbar button.
diff --git a/harbour/INSTALL b/harbour/INSTALL
index e90bc737af..a563ef1439 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -240,9 +240,9 @@ HARBOUR
       cd contrib/<name>
       ../../bin/<plat>/<comp>/hbmk2 ../make.hb [clean] [custom hbmk2 options]
 
-      NOTE: 'install' doesn't work when doing a partial [re]build 
-            at this time. To work this around, simply avoid 'install' 
-            completely, do a complete rebuild or copy the created 
+      NOTE: 'install' doesn't work when doing a partial [re]build
+            at this time. To work this around, simply avoid 'install'
+            completely, do a complete rebuild or copy the created
             lib(s) manually.
 
 
@@ -871,6 +871,16 @@ HARBOUR
              - To redirect all output to a log file, append this after the make
                command: '> log.txt 2>&1' (without quotes)
 
+      --- MSVC 2012
+      call "%ProgramFiles%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat"
+      win-make
+      ---
+
+      --- MSVC 2012 for Windows x86-64 (requires preceding build for native target)
+      call "%ProgramFiles%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86_amd64
+      win-make
+      ---
+
       --- MSVC 2010 and Windows SDK 7.1
       call "%ProgramFiles%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
       win-make
@@ -1100,6 +1110,16 @@ HARBOUR
       win-make
       ---
 
+      --- MSVC 2012 for Windows x86
+      call "%ProgramFiles(x86)%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat"
+      win-make
+      ---
+
+      --- MSVC 2012 for Windows x86-64 (requires preceding build for native target)
+      call "%ProgramFiles(x86)%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" amd64
+      win-make
+      ---
+
       --- MSVC 2010 and Windows SDK 7.1 for Windows x86
       call "%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
       win-make
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 5a1b30284b..3edef661b0 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -674,6 +674,10 @@ ifeq ($(HB_COMPILER),)
                                                 else
                                                 ifneq ($(findstring 10.0,$(HB_COMP_PATH)),)
                                                    HB_COMPILER_VER := 1600
+                                                else
+                                                ifneq ($(findstring 11.0,$(HB_COMP_PATH)),)
+                                                   HB_COMPILER_VER := 1700
+                                                endif
                                                 endif
                                                 endif
                                                 endif
@@ -690,6 +694,10 @@ ifeq ($(HB_COMPILER),)
                                                    else
                                                    ifneq ($(findstring 10.0,$(HB_COMP_PATH)),)
                                                       HB_COMPILER_VER := 1600
+                                                   else
+                                                   ifneq ($(findstring 11.0,$(HB_COMP_PATH)),)
+                                                      HB_COMPILER_VER := 1700
+                                                   endif
                                                    endif
                                                    endif
                                                    endif
@@ -711,6 +719,10 @@ ifeq ($(HB_COMPILER),)
                                                       else
                                                       ifneq ($(findstring 10.0,$(HB_COMP_PATH)),)
                                                          HB_COMPILER_VER := 1600
+                                                      else
+                                                      ifneq ($(findstring 11.0,$(HB_COMP_PATH)),)
+                                                         HB_COMPILER_VER := 1700
+                                                      endif
                                                       endif
                                                       endif
                                                       endif
diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h
index cf1ec1ea70..3b61f28c52 100644
--- a/harbour/include/hbsetup.h
+++ b/harbour/include/hbsetup.h
@@ -285,6 +285,7 @@
    Visual Studio 2005, version 8.0         1400
    Visual Studio 2008, version 9.0         1500
    Visual Studio 2010, version 10.0        1600
+   Visual Studio 2012, version 11.0        1700
 */
 
 /* ***********************************************************************
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index b29367b955..30660d53e1 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2101,6 +2101,8 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
                hbmk[ _HBMK_nCOMPVer ] := 1500
             CASE "10.0" $ cPath_CompC /* Visual Studio 2010 or Windows SDK 7.1 */
                hbmk[ _HBMK_nCOMPVer ] := 1600
+            CASE "11.0" $ cPath_CompC /* Visual Studio 2012 */
+               hbmk[ _HBMK_nCOMPVer ] := 1700
             OTHERWISE
                hbmk[ _HBMK_nCOMPVer ] := 1400
             ENDCASE