diff options
| author | matveyt <matthewtarasov@gmail.com> | 2021-05-24 18:48:27 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-05-24 18:48:27 +0200 |
| commit | e97c7c962ca0fd7cad0d157f1762eb5cc5887fca (patch) | |
| tree | 2d82c566de01059fe2993c8adaa9e1d0955ec24e /src/Make_cyg_ming.mak | |
| parent | 15bbb8f4f38d25d491d7dff83ef0552e2d442d5d (diff) | |
patch 8.2.2883: MS-Windows manifest file name is misleadingv8.2.2883
Problem: MS-Windows manifest file name is misleading.
Solution: Rename the file. (closes #8241)
Diffstat (limited to 'src/Make_cyg_ming.mak')
| -rw-r--r-- | src/Make_cyg_ming.mak | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 8895d2797f..0be3abbaa1 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -820,11 +820,11 @@ OBJ = \ $(OUTDIR)/window.o ifeq ($(VIMDLL),yes) -OBJ += $(OUTDIR)/os_w32dll.o $(OUTDIR)/vimrcd.o -EXEOBJC = $(OUTDIR)/os_w32exec.o $(OUTDIR)/vimrcc.o -EXEOBJG = $(OUTDIR)/os_w32exeg.o $(OUTDIR)/vimrcg.o +OBJ += $(OUTDIR)/os_w32dll.o $(OUTDIR)/vimresd.o +EXEOBJC = $(OUTDIR)/os_w32exec.o $(OUTDIR)/vimresc.o +EXEOBJG = $(OUTDIR)/os_w32exeg.o $(OUTDIR)/vimresg.o else -OBJ += $(OUTDIR)/os_w32exe.o $(OUTDIR)/vimrc.o +OBJ += $(OUTDIR)/os_w32exe.o $(OUTDIR)/vimres.o endif ifdef PERL @@ -1145,21 +1145,21 @@ $(OUTDIR)/%.o : %.c $(INCL) $(CC) -c $(CFLAGS) $< -o $@ ifeq ($(VIMDLL),yes) -$(OUTDIR)/vimrcc.o: vim.rc gvim.exe.mnf version.h gui_w32_rc.h vim.ico +$(OUTDIR)/vimresc.o: vim.rc vim.manifest version.h gui_w32_rc.h vim.ico $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) -UFEAT_GUI_MSWIN \ --input-format=rc --output-format=coff -i vim.rc -o $@ -$(OUTDIR)/vimrcg.o: vim.rc gvim.exe.mnf version.h gui_w32_rc.h vim.ico +$(OUTDIR)/vimresg.o: vim.rc vim.manifest version.h gui_w32_rc.h vim.ico $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) \ --input-format=rc --output-format=coff -i vim.rc -o $@ -$(OUTDIR)/vimrcd.o: vim.rc version.h gui_w32_rc.h \ +$(OUTDIR)/vimresd.o: vim.rc version.h gui_w32_rc.h \ tools.bmp tearoff.bmp vim.ico vim_error.ico \ vim_alert.ico vim_info.ico vim_quest.ico $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) -DRCDLL -DVIMDLLBASE=\\\"$(VIMDLLBASE)\\\" \ --input-format=rc --output-format=coff -i vim.rc -o $@ else -$(OUTDIR)/vimrc.o: vim.rc gvim.exe.mnf version.h gui_w32_rc.h \ +$(OUTDIR)/vimres.o: vim.rc vim.manifest version.h gui_w32_rc.h \ tools.bmp tearoff.bmp vim.ico vim_error.ico \ vim_alert.ico vim_info.ico vim_quest.ico $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) \ |