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

make_bc5.mak patch

Expand Messages
  • vim-multibyte-egroups-wrapper@vim.org
    Oh... I try again. below is a thing sake. ... diff -cr src.org/Make_bc5.mak src/Make_bc5.mak ... *************** ... !if ( $(GUI) == ) GUI = 1 !endif + !if
    Message 1 of 2 , Aug 1, 2001
    • 0 Attachment
      Oh...

      I try again.

      below is a thing sake.
      ----------------------------------------------------
      diff -cr src.org/Make_bc5.mak src/Make_bc5.mak
      *** src.org/Make_bc5.mak Sat Jul 28 21:08:00 2001
      --- src/Make_bc5.mak Wed Aug 01 09:56:27 2001
      ***************
      *** 67,72 ****
      --- 67,78 ----
      !if ("$(GUI)"=="")
      GUI = 1
      !endif
      + !if ("$(MBYTE)"=="")
      + MBYTE = 1
      + !endif
      + !if ("$(ICONV)"=="")
      + ICONV = 1
      + !endif
      #
      ### PERL: uncommented this line if you want perl support in vim
      # 'USEDLL' doesn't seem to work with perl, don't know why.
      ***************
      *** 121,127 ****
      ### FASTCALL: 1 to use FASTCALL calling convention (RECOMMENDED!), 0 otherwise
      # Incompatible when calling external functions (like MSVC-compiled DLLs), so
      # don't use FASTCALL when linking with external libs.
      ! !if ("$(FASTCALL)"=="") && ("$(PYTHON)"=="") && ("$(PERL)"=="") && ("$(TCL)"=="")
      FASTCALL = 1
      !endif
      #
      --- 127,138 ----
      ### FASTCALL: 1 to use FASTCALL calling convention (RECOMMENDED!), 0 otherwise
      # Incompatible when calling external functions (like MSVC-compiled DLLs), so
      # don't use FASTCALL when linking with external libs.
      ! !if ("$(FASTCALL)"=="") && \
      ! ("$(PYTHON)"=="") && \
      ! ("$(PERL)"=="") && \
      ! ("$(TCL)"=="") && \
      ! ("$(ICONV)"=="") \
      ! ("$(MBYTE)"=="")
      FASTCALL = 1
      !endif
      #
      ***************
      *** 181,187 ****
      # shouldn't have to change:
      LIB = $(BOR)\lib
      INCLUDE = $(BOR)\include;.;proto
      ! DEFINES = -DWIN32 -DPC $(WINVER)
      #
      !ifdef PERL
      DEFINES = $(DEFINES) -DFEAT_PERL
      --- 192,198 ----
      # shouldn't have to change:
      LIB = $(BOR)\lib
      INCLUDE = $(BOR)\include;.;proto
      ! DEFINES = -DWIN32 -DPC $(WINVER) -DHAVE_PATHDEF
      #
      !ifdef PERL
      DEFINES = $(DEFINES) -DFEAT_PERL
      ***************
      *** 236,243 ****
      DEFINES = $(DEFINES) -DFEAT_OLE
      !endif
      #
      !if ($(GUI)==1)
      ! DEFINES = $(DEFINES) -DFEAT_GUI_W32 -DFEAT_CLIPBOARD
      !ifdef DEBUG
      TARGET = gvimd.exe
      !else
      --- 247,264 ----
      DEFINES = $(DEFINES) -DFEAT_OLE
      !endif
      #
      + !if ($(MBYTE)==1)
      + MBDEFINES = $(MBDEFINES) -DFEAT_MBYTE -DDYNAMIC_GETTEXT
      + !if ($(GUI)==1)
      + MBDEFINES = $(MBDEFINES) -DFEAT_MBYTE_IME -DDYNAMIC_IME
      + !endif
      + !if ($(ICONV)==1)
      + MBDEFINES = $(MBDEFINES) -DDYNAMIC_ICONV
      + !endif
      + !endif
      +
      !if ($(GUI)==1)
      ! DEFINES = $(DEFINES) -DFEAT_GUI_W32 -DFEAT_CLIPBOARD
      !ifdef DEBUG
      TARGET = gvimd.exe
      !else
      ***************
      *** 270,276 ****
      STARTUPOBJ = c0x32.obj
      LINK2 = -ap -OS -o -P
      !endif
      ! RESFILE =
      !endif

      !if ($(USEDLL)==1)
      --- 291,297 ----
      STARTUPOBJ = c0x32.obj
      LINK2 = -ap -OS -o -P
      !endif
      ! RESFILE = vim.res
      !endif

      !if ($(USEDLL)==1)
      ***************
      *** 374,379 ****
      --- 395,401 ----
      $(OBJDIR)\ui.obj \
      $(OBJDIR)\undo.obj \
      $(OBJDIR)\version.obj \
      + $(OBJDIR)\pathdef.obj \
      $(OBJDIR)\window.obj

      !if ($(OLE)==1)
      ***************
      *** 480,485 ****
      --- 502,508 ----

      vim: $(OSTYPE) $(OBJDIR) $(OBJDIR)\bcc.cfg $(TARGETS)
      @del $(OBJDIR)\version.obj
      + @del $(OBJDIR)\pathdef.obj

      $(OSTYPE):
      -@md $(OSTYPE)
      ***************
      *** 557,565 ****
      |

      !if ($(VIMDLL)==1)
      ! $(TARGET): $(OBJDIR) $(DLLTARGET) $(vimmain) $(RESFILE)
      !else
      ! $(TARGET): $(OBJDIR) $(vimobj) $(RESFILE)
      !endif
      $(LINK) @&&|
      $(LFLAGS) +
      --- 580,588 ----
      |

      !if ($(VIMDLL)==1)
      ! $(TARGET): $(OBJDIR) $(DLLTARGET) $(vimmain) $(OBJDIR)\$(RESFILE)
      !else
      ! $(TARGET): $(OBJDIR) $(vimobj) $(OBJDIR)\$(RESFILE)
      !endif
      $(LINK) @&&|
      $(LFLAGS) +
      ***************
      *** 673,678 ****
      --- 696,703 ----

      $(OBJDIR)\version.obj: version.c

      + $(OBJDIR)\pathdef.obj: auto\pathdef.c
      +
      $(OBJDIR)\os_win32.obj: os_win32.c

      $(OBJDIR)\os_mswin.obj: os_mswin.c
      ***************
      *** 689,694 ****
      --- 714,730 ----

      $(OBJDIR)\if_ole.obj: if_ole.cpp

      + auto\pathdef.c:
      + @echo creating auto/pathdef.c
      + @echo /* pathdef.c */ > auto\pathdef.c
      + @echo \#include "vim.h" >> auto\pathdef.c
      + @echo char_u *default_vim_dir = (char_u *)"$(VIMRCLOC:\=\\)"; >> auto\pathdef.c
      + @echo char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR:\=\\)"; >> auto\pathdef.c
      + @echo char_u *all_cflags = (char_u *)"$(CC:\=\\) $(CFLAGS)"; >> auto\pathdef.c
      + @echo char_u *all_lflags = (char_u *)"$(link:\=\\) $(LINKARGS1:\=\\) $(LINKARGS2:\=\\)"; >> auto\pathdef.c
      + @echo char_u *compiled_user = (char_u *)"$(USERNAME)"; >> auto\pathdef.c
      + @echo char_u *compiled_sys = (char_u *)"$(USERDOMAIN)"; >> auto\pathdef.c
      +
      $(OBJDIR)\os_w32exe.obj: os_w32exe.c
      $(CC) $(CCARG) $(CC1) -I$(INCLUDE) -WE $(CC2)$@ os_w32exe.c

      ***************
      *** 705,712 ****
      $(OBJDIR)\if_tcl.obj: if_tcl.c tcl.lib
      $(CC) $(CCARG) $(CC1) $(CC2)$@ -pc if_tcl.c

      ! vim.res: vim.rc version.h tools.bmp tearoff.bmp vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico
      ! $(BRC) $(DEFINES) -i $(BOR)\include -w32 -r $*.rc

      perl.lib: $(PERL)\lib\CORE\perl$(PERL_VER).lib
      coff2omf $(PERL)\lib\CORE\perl$(PERL_VER).lib $@
      --- 741,749 ----
      $(OBJDIR)\if_tcl.obj: if_tcl.c tcl.lib
      $(CC) $(CCARG) $(CC1) $(CC2)$@ -pc if_tcl.c

      ! $(OBJDIR)\vim.res: vim.rc version.h tools.bmp tearoff.bmp \
      ! vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico
      ! $(BRC) $(DEFINES) -fo$(OBJDIR)\vim.res -i $(BOR)\include -w32 -r vim.rc

      perl.lib: $(PERL)\lib\CORE\perl$(PERL_VER).lib
      coff2omf $(PERL)\lib\CORE\perl$(PERL_VER).lib $@
      ***************
      *** 731,736 ****
      --- 768,774 ----
      $(CFLAGS)
      -L$(LIB)
      $(DEFINES)
      + $(MBDEFINES)
      $(EXETYPE)
      $(DEBUG)
      $(OPT)
      diff -cr src.org/mbyte.c src/mbyte.c
      *** src.org/mbyte.c Sat Jul 28 19:41:13 2001
      --- src/mbyte.c Wed Aug 01 09:48:03 2001
      ***************
      *** 88,93 ****
      --- 88,96 ----
      #ifdef X_LOCALE
      #include <X11/Xlocale.h>
      #endif
      + #ifndef EILSEQ
      + # define EILSEQ 123
      + #endif

      #if defined(FEAT_MBYTE) || defined(PROTO)

      diff -cr src.org/vim.h src/vim.h
      *** src.org/vim.h Sun Jul 29 05:56:27 2001
      --- src/vim.h Wed Aug 01 09:45:29 2001
      ***************
      *** 11,17 ****

      /* use fastcall for Borland, when compiling for Win32 (not for DOS16) */
      #if defined(__BORLANDC__) && defined(WIN32) && !defined(DEBUG)
      ! # if defined(FEAT_PERL) || defined(FEAT_PYTHON) || defined(FEAT_RUBY) || defined(FEAT_TCL)
      # pragma option -pc
      # else
      # pragma option -pr
      --- 11,22 ----

      /* use fastcall for Borland, when compiling for Win32 (not for DOS16) */
      #if defined(__BORLANDC__) && defined(WIN32) && !defined(DEBUG)
      ! #if defined(FEAT_PERL) || \
      ! defined(FEAT_PYTHON) || \
      ! defined(FEAT_RUBY) || \
      ! defined(FEAT_TCL) || \
      ! defined(DYNAMIC_GETTEXT) || \
      ! defined(DYNAMIC_IME)
      # pragma option -pc
      # else
      # pragma option -pr
    • Bram Moolenaar
      ... There should be && in the line with ICONV. -- ... :-) Bishop /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net ((( Creator
      Message 2 of 2 , Aug 1, 2001
      • 0 Attachment
        Yasuhiro Matsumoto wrote:

        > I try again.
        >
        > below is a thing sake.

        Thanks, got it now. Did you fully test this? I spotted one problem:

        > # don't use FASTCALL when linking with external libs.
        > ! !if ("$(FASTCALL)"=="") && \
        > ! ("$(PYTHON)"=="") && \
        > ! ("$(PERL)"=="") && \
        > ! ("$(TCL)"=="") && \
        > ! ("$(ICONV)"=="") \
        > ! ("$(MBYTE)"=="")
        > FASTCALL = 1

        There should be "&&" in the line with ICONV.

        --
        >From "know your smileys":
        <>:-) Bishop

        /// Bram Moolenaar -- Bram@... -- http://www.moolenaar.net \\\
        ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim )))
        \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org ///
      Your message has been successfully submitted and would be delivered to recipients shortly.