Mercurial > vim
annotate src/GvimExt/Makefile @ 23177:cc24ac009f29 v8.2.2134
patch 8.2.2134: Vim9: get E1099 when autocmd triggered in builtin function
Commit: https://github.com/vim/vim/commit/57f799e6a4a56f41570c752c66dc2f692b1f2c2f
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Dec 12 20:42:19 2020 +0100
patch 8.2.2134: Vim9: get E1099 when autocmd triggered in builtin function
Problem: Vim9: get E1099 when autocmd triggered in builtin function.
Solution: Check that did_emsg increased instead of checking that it changed.
(closes #7448)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 12 Dec 2020 20:45:03 +0100 |
parents | e6f0b4fe0b6d |
children | ba9d53c7c509 |
rev | line source |
---|---|
10 | 1 # Makefile for GvimExt, using MSVC |
2 # Options: | |
3 # DEBUG=yes Build debug version (for VC7 and maybe later) | |
11510
deb9295dccda
patch 8.0.0638: cannot build with new MSVC version
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
4 # CPUARG= /arch:IA32/AVX/etc, call from main makefile to set |
deb9295dccda
patch 8.0.0638: cannot build with new MSVC version
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
5 # automatically from CPUNR |
10 | 6 # |
7 | |
11510
deb9295dccda
patch 8.0.0638: cannot build with new MSVC version
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
8 TARGETOS = WINNT |
deb9295dccda
patch 8.0.0638: cannot build with new MSVC version
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
9 |
6809 | 10 !ifndef APPVER |
11510
deb9295dccda
patch 8.0.0638: cannot build with new MSVC version
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
11 APPVER = 5.01 |
6809 | 12 !endif |
19382
e6f0b4fe0b6d
patch 8.2.0249: MS-Windows: various warnings
Bram Moolenaar <Bram@vim.org>
parents:
16295
diff
changeset
|
13 !ifndef WINVER |
e6f0b4fe0b6d
patch 8.2.0249: MS-Windows: various warnings
Bram Moolenaar <Bram@vim.org>
parents:
16295
diff
changeset
|
14 WINVER = 0x0501 |
e6f0b4fe0b6d
patch 8.2.0249: MS-Windows: various warnings
Bram Moolenaar <Bram@vim.org>
parents:
16295
diff
changeset
|
15 !endif |
10 | 16 |
17 !if "$(DEBUG)" != "yes" | |
18 NODEBUG = 1 | |
19 !endif | |
20 | |
7566
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
21 !ifdef PROCESSOR_ARCHITECTURE |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
22 # On Windows NT |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
23 ! ifndef CPU |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
24 CPU = i386 |
7591
4447dc38bc22
commit https://github.com/vim/vim/commit/3d6d5cc3a417c04d9772596ea83f8e6b41321781
Christian Brabandt <cb@256bit.org>
parents:
7566
diff
changeset
|
25 ! if !defined(PLATFORM) && defined(TARGET_CPU) |
4447dc38bc22
commit https://github.com/vim/vim/commit/3d6d5cc3a417c04d9772596ea83f8e6b41321781
Christian Brabandt <cb@256bit.org>
parents:
7566
diff
changeset
|
26 PLATFORM = $(TARGET_CPU) |
4447dc38bc22
commit https://github.com/vim/vim/commit/3d6d5cc3a417c04d9772596ea83f8e6b41321781
Christian Brabandt <cb@256bit.org>
parents:
7566
diff
changeset
|
27 ! endif |
7566
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
28 ! ifdef PLATFORM |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
29 ! if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64") |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
30 CPU = AMD64 |
16229
081522b02c2d
patch 8.1.1119: no support for Windows on ARM64.
Bram Moolenaar <Bram@vim.org>
parents:
12600
diff
changeset
|
31 ! elseif ("$(PLATFORM)" == "arm64") || ("$(PLATFORM)" == "ARM64") |
081522b02c2d
patch 8.1.1119: no support for Windows on ARM64.
Bram Moolenaar <Bram@vim.org>
parents:
12600
diff
changeset
|
32 CPU = ARM64 |
7566
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
33 ! elseif ("$(PLATFORM)" != "x86") && ("$(PLATFORM)" != "X86") |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
34 ! error *** ERROR Unknown target platform "$(PLATFORM)". Make aborted. |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
35 ! endif |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
36 ! endif |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
37 ! endif |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
38 !else |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
39 CPU = i386 |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
40 !endif |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
41 |
3943 | 42 !ifdef SDK_INCLUDE_DIR |
43 !include $(SDK_INCLUDE_DIR)\Win32.mak | |
12001
fecb0ff6e8cf
patch 8.0.0881: win32.mak no longer included in Windows SDK
Christian Brabandt <cb@256bit.org>
parents:
11510
diff
changeset
|
44 !elseif "$(USE_WIN32MAK)"=="yes" |
fecb0ff6e8cf
patch 8.0.0881: win32.mak no longer included in Windows SDK
Christian Brabandt <cb@256bit.org>
parents:
11510
diff
changeset
|
45 !include <Win32.mak> |
3943 | 46 !else |
12001
fecb0ff6e8cf
patch 8.0.0881: win32.mak no longer included in Windows SDK
Christian Brabandt <cb@256bit.org>
parents:
11510
diff
changeset
|
47 cc = cl |
fecb0ff6e8cf
patch 8.0.0881: win32.mak no longer included in Windows SDK
Christian Brabandt <cb@256bit.org>
parents:
11510
diff
changeset
|
48 link = link |
fecb0ff6e8cf
patch 8.0.0881: win32.mak no longer included in Windows SDK
Christian Brabandt <cb@256bit.org>
parents:
11510
diff
changeset
|
49 rc = rc |
fecb0ff6e8cf
patch 8.0.0881: win32.mak no longer included in Windows SDK
Christian Brabandt <cb@256bit.org>
parents:
11510
diff
changeset
|
50 cflags = -nologo -c |
fecb0ff6e8cf
patch 8.0.0881: win32.mak no longer included in Windows SDK
Christian Brabandt <cb@256bit.org>
parents:
11510
diff
changeset
|
51 lflags = -incremental:no -nologo |
fecb0ff6e8cf
patch 8.0.0881: win32.mak no longer included in Windows SDK
Christian Brabandt <cb@256bit.org>
parents:
11510
diff
changeset
|
52 rcflags = /r |
fecb0ff6e8cf
patch 8.0.0881: win32.mak no longer included in Windows SDK
Christian Brabandt <cb@256bit.org>
parents:
11510
diff
changeset
|
53 olelibsdll = ole32.lib uuid.lib oleaut32.lib user32.lib gdi32.lib advapi32.lib |
3943 | 54 !endif |
10 | 55 |
11510
deb9295dccda
patch 8.0.0638: cannot build with new MSVC version
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
56 # include CPUARG |
deb9295dccda
patch 8.0.0638: cannot build with new MSVC version
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
57 cflags = $(cflags) $(CPUARG) |
deb9295dccda
patch 8.0.0638: cannot build with new MSVC version
Christian Brabandt <cb@256bit.org>
parents:
10264
diff
changeset
|
58 |
19382
e6f0b4fe0b6d
patch 8.2.0249: MS-Windows: various warnings
Bram Moolenaar <Bram@vim.org>
parents:
16295
diff
changeset
|
59 # set WINVER and _WIN32_WINNT |
e6f0b4fe0b6d
patch 8.2.0249: MS-Windows: various warnings
Bram Moolenaar <Bram@vim.org>
parents:
16295
diff
changeset
|
60 cflags = $(cflags) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) |
e6f0b4fe0b6d
patch 8.2.0249: MS-Windows: various warnings
Bram Moolenaar <Bram@vim.org>
parents:
16295
diff
changeset
|
61 |
e6f0b4fe0b6d
patch 8.2.0249: MS-Windows: various warnings
Bram Moolenaar <Bram@vim.org>
parents:
16295
diff
changeset
|
62 !if "$(CL)" == "/D_USING_V110_SDK71_" |
e6f0b4fe0b6d
patch 8.2.0249: MS-Windows: various warnings
Bram Moolenaar <Bram@vim.org>
parents:
16295
diff
changeset
|
63 rcflags = $(rcflags) /D_USING_V110_SDK71_ |
e6f0b4fe0b6d
patch 8.2.0249: MS-Windows: various warnings
Bram Moolenaar <Bram@vim.org>
parents:
16295
diff
changeset
|
64 !endif |
e6f0b4fe0b6d
patch 8.2.0249: MS-Windows: various warnings
Bram Moolenaar <Bram@vim.org>
parents:
16295
diff
changeset
|
65 |
12600
590424e87b65
patch 8.0.1178: using old compiler on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
12001
diff
changeset
|
66 SUBSYSTEM = console |
590424e87b65
patch 8.0.1178: using old compiler on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
12001
diff
changeset
|
67 !if "$(SUBSYSTEM_VER)" != "" |
590424e87b65
patch 8.0.1178: using old compiler on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
12001
diff
changeset
|
68 SUBSYSTEM = $(SUBSYSTEM),$(SUBSYSTEM_VER) |
590424e87b65
patch 8.0.1178: using old compiler on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
12001
diff
changeset
|
69 !endif |
590424e87b65
patch 8.0.1178: using old compiler on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
12001
diff
changeset
|
70 |
16295
b2ed528e85ef
patch 8.1.1152: compiler warning with VS2019
Bram Moolenaar <Bram@vim.org>
parents:
16229
diff
changeset
|
71 !if "$(CPU)" == "AMD64" || "$(CPU)" == "ARM64" |
16229
081522b02c2d
patch 8.1.1119: no support for Windows on ARM64.
Bram Moolenaar <Bram@vim.org>
parents:
12600
diff
changeset
|
72 OFFSET = 0x11C000000 |
081522b02c2d
patch 8.1.1119: no support for Windows on ARM64.
Bram Moolenaar <Bram@vim.org>
parents:
12600
diff
changeset
|
73 !else |
081522b02c2d
patch 8.1.1119: no support for Windows on ARM64.
Bram Moolenaar <Bram@vim.org>
parents:
12600
diff
changeset
|
74 OFFSET = 0x1C000000 |
081522b02c2d
patch 8.1.1119: no support for Windows on ARM64.
Bram Moolenaar <Bram@vim.org>
parents:
12600
diff
changeset
|
75 !endif |
081522b02c2d
patch 8.1.1119: no support for Windows on ARM64.
Bram Moolenaar <Bram@vim.org>
parents:
12600
diff
changeset
|
76 |
10 | 77 all: gvimext.dll |
78 | |
79 gvimext.dll: gvimext.obj \ | |
80 gvimext.res | |
16229
081522b02c2d
patch 8.1.1119: no support for Windows on ARM64.
Bram Moolenaar <Bram@vim.org>
parents:
12600
diff
changeset
|
81 $(link) $(lflags) -dll -def:gvimext.def -base:$(OFFSET) -out:$*.dll $** $(olelibsdll) shell32.lib comctl32.lib -subsystem:$(SUBSYSTEM) |
12600
590424e87b65
patch 8.0.1178: using old compiler on MS-Windows
Christian Brabandt <cb@256bit.org>
parents:
12001
diff
changeset
|
82 if exist $*.dll.manifest mt -nologo -manifest $*.dll.manifest -outputresource:$*.dll;2 |
10 | 83 |
84 gvimext.obj: gvimext.h | |
85 | |
86 .cpp.obj: | |
7566
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
87 $(cc) $(cflags) -DFEAT_GETTEXT $(cvarsmt) $*.cpp |
10 | 88 |
89 gvimext.res: gvimext.rc | |
7887
a98b93736894
commit https://github.com/vim/vim/commit/bc073092254df17b282d162d8e8181e8f6a7a356
Christian Brabandt <cb@256bit.org>
parents:
7591
diff
changeset
|
90 $(rc) /nologo $(rcflags) $(rcvars) gvimext.rc |
10 | 91 |
92 clean: | |
7566
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
93 - if exist gvimext.dll del gvimext.dll |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
94 - if exist gvimext.lib del gvimext.lib |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
95 - if exist gvimext.exp del gvimext.exp |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
96 - if exist gvimext.obj del gvimext.obj |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
97 - if exist gvimext.res del gvimext.res |
1dd5b27a79b1
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1
Christian Brabandt <cb@256bit.org>
parents:
6809
diff
changeset
|
98 - if exist gvimext.dll.manifest del gvimext.dll.manifest |