diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-28 19:46:49 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-28 19:46:49 +0200 |
| commit | afde13b62b8fa25dac4635d5caee8d088b937ee0 (patch) | |
| tree | 6a8b58aa58e180e55b2948e5d0bfdbc3d4692a49 /src/feature.h | |
| parent | ab4cece6053b0bfd604e15065227b94af873608b (diff) | |
| download | vim-git-afde13b62b8fa25dac4635d5caee8d088b937ee0.tar.gz | |
patch 8.1.1230: a lot of code is shared between vim.exe and gvim.exev8.1.1230
Problem: A lot of code is shared between vim.exe and gvim.exe.
Solution: Optionally put the shared code in vim.dll. (Ken Takata,
closes #4287)
Diffstat (limited to 'src/feature.h')
| -rw-r--r-- | src/feature.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/feature.h b/src/feature.h index 95701a79a..bfbabe0af 100644 --- a/src/feature.h +++ b/src/feature.h @@ -712,7 +712,8 @@ * there is no terminal version, and on Windows we can't figure out how to * fork one off with :gui. */ -#if defined(FEAT_GUI_MSWIN) || (defined(FEAT_GUI_MAC) && !defined(MACOS_X_DARWIN)) +#if (defined(FEAT_GUI_MSWIN) && !defined(VIMDLL)) \ + || (defined(FEAT_GUI_MAC) && !defined(MACOS_X_DARWIN)) # define ALWAYS_USE_GUI #endif @@ -1138,8 +1139,8 @@ * mouse shape Adjust the shape of the mouse pointer to the mode. */ #ifdef FEAT_NORMAL -/* MS-DOS console and Win32 console can change cursor shape */ -# if defined(MSWIN) && !defined(FEAT_GUI_MSWIN) +// Win32 console can change cursor shape +# if defined(MSWIN) && (!defined(FEAT_GUI_MSWIN) || defined(VIMDLL)) # define MCH_CURSOR_SHAPE # endif # if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) \ @@ -1263,7 +1264,8 @@ * +balloon_eval_term Allow balloon expression evaluation in the terminal. */ #if defined(FEAT_HUGE) && defined(FEAT_TIMERS) && \ - (defined(UNIX) || defined(VMS) || (defined(MSWIN) && !defined(FEAT_GUI_MSWIN))) + (defined(UNIX) || defined(VMS) || \ + (defined(MSWIN) && (!defined(FEAT_GUI_MSWIN) || defined(VIMDLL)))) # define FEAT_BEVAL_TERM #endif @@ -1317,6 +1319,6 @@ /* * +vtp: Win32 virtual console. */ -#if !defined(FEAT_GUI) && defined(MSWIN) +#if (!defined(FEAT_GUI) || defined(VIMDLL)) && defined(MSWIN) # define FEAT_VTP #endif |