Loading ...
Sorry, an error occurred while loading the content.

Patch 7.4.078

Expand Messages
  • Bram Moolenaar
    Patch 7.4.078 Problem: MSVC 2013 is not supported. Solution: Recognize and support MSVC 2013. (Ed Brown) Files: src/Make_mvc.mak ... ***************
    Message 1 of 4 , Nov 7, 2013
    • 0 Attachment
      Patch 7.4.078
      Problem: MSVC 2013 is not supported.
      Solution: Recognize and support MSVC 2013. (Ed Brown)
      Files: src/Make_mvc.mak


      *** ../vim-7.4.077/src/Make_mvc.mak 2013-07-09 13:13:12.000000000 +0200
      --- src/Make_mvc.mak 2013-11-08 03:12:48.000000000 +0100
      ***************
      *** 424,429 ****
      --- 424,432 ----
      !if "$(_NMAKE_VER)" == "11.00.60610.1"
      MSVCVER = 11.0
      !endif
      + !if "$(_NMAKE_VER)" == "12.00.21005.1"
      + MSVCVER = 12.0
      + !endif
      !endif

      # Abort building VIM if version of VC is unrecognised.
      ***************
      *** 438,444 ****
      !endif

      # Convert processor ID to MVC-compatible number
      ! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0") && ("$(MSVCVER)" != "11.0")
      !if "$(CPUNR)" == "i386"
      CPUARG = /G3
      !elseif "$(CPUNR)" == "i486"
      --- 441,447 ----
      !endif

      # Convert processor ID to MVC-compatible number
      ! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0") && ("$(MSVCVER)" != "11.0") && ("$(MSVCVER)" != "12.0")
      !if "$(CPUNR)" == "i386"
      CPUARG = /G3
      !elseif "$(CPUNR)" == "i486"
      ***************
      *** 472,478 ****
      OPTFLAG = /Ox
      !endif

      ! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0")
      # Use link time code generation if not worried about size
      !if "$(OPTIMIZE)" != "SPACE"
      OPTFLAG = $(OPTFLAG) /GL
      --- 475,481 ----
      OPTFLAG = /Ox
      !endif

      ! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0") || ("$(MSVCVER)" == "12.0")
      # Use link time code generation if not worried about size
      !if "$(OPTIMIZE)" != "SPACE"
      OPTFLAG = $(OPTFLAG) /GL
      ***************
      *** 485,491 ****
      !endif

      # Static code analysis generally available starting with VS2012
      ! !if ("$(ANALYZE)" == "yes") && ("$(MSVCVER)" == "11.0")
      CFLAGS=$(CFLAGS) /analyze
      !endif

      --- 488,494 ----
      !endif

      # Static code analysis generally available starting with VS2012
      ! !if ("$(ANALYZE)" == "yes") && ("$(MSVCVER)" == "11.0") && ("$(MSVCVER)" == "12.0")
      CFLAGS=$(CFLAGS) /analyze
      !endif

      ***************
      *** 943,949 ****

      # Report link time code generation progress if used.
      !ifdef NODEBUG
      ! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0")
      !if "$(OPTIMIZE)" != "SPACE"
      LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
      !endif
      --- 946,952 ----

      # Report link time code generation progress if used.
      !ifdef NODEBUG
      ! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0") || ("$(MSVCVER)" == "12.0")
      !if "$(OPTIMIZE)" != "SPACE"
      LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
      !endif
      *** ../vim-7.4.077/src/version.c 2013-11-07 04:49:23.000000000 +0100
      --- src/version.c 2013-11-08 03:13:56.000000000 +0100
      ***************
      *** 740,741 ****
      --- 740,743 ----
      { /* Add new patch number below this line */
      + /**/
      + 78,
      /**/

      --
      Every time I lose weight, it finds me again!

      /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
      /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
      \\\ an exciting new programming language -- http://www.Zimbu.org ///
      \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

      --
      --
      You received this message from the "vim_dev" maillist.
      Do not top-post! Type your reply below the text you are replying to.
      For more information, visit http://www.vim.org/maillist.php

      ---
      You received this message because you are subscribed to the Google Groups "vim_dev" group.
      To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
      For more options, visit https://groups.google.com/groups/opt_out.
    • KF Leong
      ... The check should be Logical OR: (MSVCVER == 11.0 || MSVCVER == 12.0 ) KF -- -- You received this message from the vim_dev maillist. Do not top-post!
      Message 2 of 4 , Nov 7, 2013
      • 0 Attachment
        On Friday, 8 November 2013 10:16:08 UTC+8, Bram Moolenaar wrote:
        > Patch 7.4.078
        >
        > Problem: MSVC 2013 is not supported.
        > Solution: Recognize and support MSVC 2013. (Ed Brown)
        > Files: src/Make_mvc.mak
        ...
        >
        > --- 488,494 ----
        > !endif
        >
        > # Static code analysis generally available starting with VS2012
        > ! !if ("$(ANALYZE)" == "yes") && ("$(MSVCVER)" == "11.0") && ("$(MSVCVER)" == "12.0")
        > CFLAGS=$(CFLAGS) /analyze
        > !endif
        >

        The check should be Logical OR: (MSVCVER == "11.0" || MSVCVER == "12.0")

        KF

        --
        --
        You received this message from the "vim_dev" maillist.
        Do not top-post! Type your reply below the text you are replying to.
        For more information, visit http://www.vim.org/maillist.php

        ---
        You received this message because you are subscribed to the Google Groups "vim_dev" group.
        To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
        For more options, visit https://groups.google.com/groups/opt_out.
      • Ken Takata
        Hi, ... cl.exe Ver.16.00 shipped with Windows SDK 7.1 also supports /analyze option. (The version number is same as VS2010, but VS2010 Express Edition doesn t
        Message 3 of 4 , Nov 8, 2013
        • 0 Attachment
          Hi,

          2013/11/08 Fri 14:54:55 UTC+9 KF Leong wrote:
          > On Friday, 8 November 2013 10:16:08 UTC+8, Bram Moolenaar wrote:
          > > Patch 7.4.078
          > >
          > > Problem: MSVC 2013 is not supported.
          > > Solution: Recognize and support MSVC 2013. (Ed Brown)
          > > Files: src/Make_mvc.mak
          > ...
          > >
          > > --- 488,494 ----
          > > !endif
          > >
          > > # Static code analysis generally available starting with VS2012
          > > ! !if ("$(ANALYZE)" == "yes") && ("$(MSVCVER)" == "11.0") && ("$(MSVCVER)" == "12.0")
          > > CFLAGS=$(CFLAGS) /analyze
          > > !endif
          > >
          >
          > The check should be Logical OR: (MSVCVER == "11.0" || MSVCVER == "12.0")

          cl.exe Ver.16.00 shipped with Windows SDK 7.1 also supports /analyze option.
          (The version number is same as VS2010, but VS2010 Express Edition doesn't
          support /analyze. I don't know about VS2010Pro.)
          I think it's better to change the line as:

          !if ("$(ANALYZE)" == "yes") && (("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0") || ("$(MSVCVER)" == "12.0"))

          or just remove the version checking:

          !if "$(ANALYZE)" == "yes"


          Regards,
          Ken Takata

          --
          --
          You received this message from the "vim_dev" maillist.
          Do not top-post! Type your reply below the text you are replying to.
          For more information, visit http://www.vim.org/maillist.php

          ---
          You received this message because you are subscribed to the Google Groups "vim_dev" group.
          To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
          For more options, visit https://groups.google.com/groups/opt_out.
        • Bram Moolenaar
          ... Yes, that s obvious. -- Did Adam and Eve have navels? /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net /// sponsor Vim,
          Message 4 of 4 , Nov 8, 2013
          • 0 Attachment
            KF Leong wrote:

            > On Friday, 8 November 2013 10:16:08 UTC+8, Bram Moolenaar wrote:
            > > Patch 7.4.078
            > >
            > > Problem: MSVC 2013 is not supported.
            > > Solution: Recognize and support MSVC 2013. (Ed Brown)
            > > Files: src/Make_mvc.mak
            > ...
            > >
            > > --- 488,494 ----
            > > !endif
            > >
            > > # Static code analysis generally available starting with VS2012
            > > ! !if ("$(ANALYZE)" == "yes") && ("$(MSVCVER)" == "11.0") && ("$(MSVCVER)" == "12.0")
            > > CFLAGS=$(CFLAGS) /analyze
            > > !endif
            > >
            >
            > The check should be Logical OR: (MSVCVER == "11.0" || MSVCVER == "12.0")

            Yes, that's obvious.

            --
            Did Adam and Eve have navels?

            /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
            /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
            \\\ an exciting new programming language -- http://www.Zimbu.org ///
            \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

            --
            --
            You received this message from the "vim_dev" maillist.
            Do not top-post! Type your reply below the text you are replying to.
            For more information, visit http://www.vim.org/maillist.php

            ---
            You received this message because you are subscribed to the Google Groups "vim_dev" group.
            To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
            For more options, visit https://groups.google.com/groups/opt_out.
          Your message has been successfully submitted and would be delivered to recipients shortly.