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

Patch 6.1.240 (extra)

Expand Messages
  • Bram Moolenaar
    Patch 6.1.240 (extra) Problem: Win32 with BCC 5: CPU may be defined in the environment, which causes a wrong argument for the compiler. (Walter Briscoe)
    Message 1 of 1 , Oct 27, 2002
    • 0 Attachment
      Patch 6.1.240 (extra)
      Problem: Win32 with BCC 5: CPU may be defined in the environment, which
      causes a wrong argument for the compiler. (Walter Briscoe)
      Solution: Use CPUNR instead of CPU.
      Files: src/Make_bc5.mak


      *** ../vim61.239/src/Make_bc5.mak Thu May 16 22:08:09 2002
      --- src/Make_bc5.mak Sun Oct 27 20:47:57 2002
      ***************
      *** 56,62 ****
      # OSTYPE DOS16 or WIN32 (WIN32)
      # DEBUG set to "-v" if you wish a DEBUGging build (not defined)
      # CODEGUARD set to "-vG" if you want to use CODEGUARD (not defined)
      ! # CPU 1 through 6: select CPU to compile for (3)
      # USEDLL no or yes: set to yes to use the Runtime library DLL (no)
      # For USEDLL=yes the cc3250.dll is required to run Vim.
      # VIMDLL no or yes: create vim32.dll, and stub (g)vim.exe (no)
      --- 56,63 ----
      # OSTYPE DOS16 or WIN32 (WIN32)
      # DEBUG set to "-v" if you wish a DEBUGging build (not defined)
      # CODEGUARD set to "-vG" if you want to use CODEGUARD (not defined)
      ! # CPUNR 1 through 6: select -CPU argument to compile with (3)
      ! # 3 for 386, 4 for 486, 5 for pentium, 6 for pentium pro.
      # USEDLL no or yes: set to yes to use the Runtime library DLL (no)
      # For USEDLL=yes the cc3250.dll is required to run Vim.
      # VIMDLL no or yes: create vim32.dll, and stub (g)vim.exe (no)
      ***************
      *** 117,125 ****
      ### CODEGUARD: Uncomment to use the CODEGUARD stuff (BC 5.0 or later):
      #CODEGUARD = -vG
      #
      ! ### CPU: set your target processor (3 to 6)
      ! !if ("$(CPU)"=="")
      ! CPU = 3
      !endif
      #
      ### Comment out to use precompiled headers (faster, but uses lots of disk!)
      --- 118,126 ----
      ### CODEGUARD: Uncomment to use the CODEGUARD stuff (BC 5.0 or later):
      #CODEGUARD = -vG
      #
      ! ### CPUNR: set your target processor (3 to 6)
      ! !if ("$(CPUNR)"=="")
      ! CPUNR = 3
      !endif
      #
      ### Comment out to use precompiled headers (faster, but uses lots of disk!)
      ***************
      *** 179,186 ****
      # Sanity checks for the above options:
      #
      !if ($(OSTYPE)==DOS16)
      ! !if (($(CPU)+0)>4)
      ! !error CPU Must be less than or equal to 4 for DOS16
      !endif
      #
      !if (($(ALIGN)+0)>2)
      --- 180,187 ----
      # Sanity checks for the above options:
      #
      !if ($(OSTYPE)==DOS16)
      ! !if (($(CPUNR)+0)>4)
      ! !error CPUNR Must be less than or equal to 4 for DOS16
      !endif
      #
      !if (($(ALIGN)+0)>2)
      ***************
      *** 188,195 ****
      !endif
      #
      !else # not DOS16
      ! !if (($(CPU)+0)<3)
      ! !error CPU Must be greater or equal to 3 for WIN32
      !endif
      !endif
      #
      --- 189,196 ----
      !endif
      #
      !else # not DOS16
      ! !if (($(CPUNR)+0)<3)
      ! !error CPUNR Must be greater or equal to 3 for WIN32
      !endif
      !endif
      #
      ***************
      *** 289,296 ****
      #
      # DO NOT change below:
      #
      ! CPU = -$(CPU)
      ! ALIGN = -a$(ALIGN)
      #
      !ifdef DEBUG
      DEFINES=$(DEFINES) -DDEBUG
      --- 290,297 ----
      #
      # DO NOT change below:
      #
      ! CPUARG = -$(CPUNR)
      ! ALIGNARG = -a$(ALIGN)
      #
      !ifdef DEBUG
      DEFINES=$(DEFINES) -DDEBUG
      ***************
      *** 553,560 ****
      MSG = $(MSG)(dynamic)
      ! endif
      !endif
      ! MSG = $(MSG) cpu=$(CPU)
      ! MSG = $(MSG) Align=$(ALIGN)

      !message $(MSG)

      --- 554,561 ----
      MSG = $(MSG)(dynamic)
      ! endif
      !endif
      ! MSG = $(MSG) cpu=$(CPUARG)
      ! MSG = $(MSG) Align=$(ALIGNARG)

      !message $(MSG)

      ***************
      *** 853,860 ****
      $(DEBUG)
      $(OPT)
      $(CODEGUARD)
      ! $(CPU)
      ! $(ALIGN)
      | $@

      # vi:set sts=4 sw=4:
      --- 854,861 ----
      $(DEBUG)
      $(OPT)
      $(CODEGUARD)
      ! $(CPUARG)
      ! $(ALIGNARG)
      | $@

      # vi:set sts=4 sw=4:
      *** ../vim61.239/src/version.c Sun Oct 27 20:44:05 2002
      --- src/version.c Sun Oct 27 20:48:03 2002
      ***************
      *** 608,609 ****
      --- 608,611 ----
      { /* Add new patch number below this line */
      + /**/
      + 240,
      /**/

      --
      ARTHUR: Well, I AM king...
      DENNIS: Oh king, eh, very nice. An' how'd you get that, eh? By exploitin'
      the workers -- by 'angin' on to outdated imperialist dogma which
      perpetuates the economic an' social differences in our society! If
      there's ever going to be any progress--
      The Quest for the Holy Grail (Monty Python)

      /// Bram Moolenaar -- Bram@... -- http://www.moolenaar.net \\\
      /// Creator of Vim - Vi IMproved -- http://www.vim.org \\\
      \\\ Project leader for A-A-P -- http://www.a-a-p.org ///
      \\\ Lord Of The Rings helps Uganda - http://iccf-holland.org/lotr.html ///
    Your message has been successfully submitted and would be delivered to recipients shortly.