Mercurial > vim
comparison src/Make_ivc.mak @ 15886:cdb9cbe731b3 v8.1.0949
patch 8.1.0949: MS-windows defines GUI macros different than other systems
commit https://github.com/vim/vim/commit/0472b6d149445579e3a63519b15f099f9adda3f7
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Feb 18 21:41:37 2019 +0100
patch 8.1.0949: MS-windows defines GUI macros different than other systems
Problem: MS-windows defines GUI macros different than other systems.
Solution: Swap FEAT_GUI and FEAT_GUI_MSWIN. (Hirohito Higashi, closes https://github.com/vim/vim/issues/3996)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 18 Feb 2019 21:45:07 +0100 |
parents | 7fad90423bd2 |
children | 570a296aa0b4 |
comparison
equal
deleted
inserted
replaced
15885:95b27518f4f3 | 15886:cdb9cbe731b3 |
---|---|
90 | 90 |
91 LINK32_FLAGS= oldnames.lib kernel32.lib user32.lib gdi32.lib version.lib comdlg32.lib comctl32.lib advapi32.lib shell32.lib ole32.lib netapi32.lib uuid.lib /nologo /machine:I386 /nodefaultlib | 91 LINK32_FLAGS= oldnames.lib kernel32.lib user32.lib gdi32.lib version.lib comdlg32.lib comctl32.lib advapi32.lib shell32.lib ole32.lib netapi32.lib uuid.lib /nologo /machine:I386 /nodefaultlib |
92 # ADD LINK32 oldnames.lib kernel32.lib user32.lib gdi32.lib version.lib comdlg32.lib comctl32.lib advapi32.lib shell32.lib ole32.lib uuid.lib /nologo /machine:I386 /nodefaultlib | 92 # ADD LINK32 oldnames.lib kernel32.lib user32.lib gdi32.lib version.lib comdlg32.lib comctl32.lib advapi32.lib shell32.lib ole32.lib uuid.lib /nologo /machine:I386 /nodefaultlib |
93 # SUBTRACT LINK32 /incremental:yes | 93 # SUBTRACT LINK32 /incremental:yes |
94 | 94 |
95 RSC_PROJ= /l 0x409 /d "FEAT_GUI" | 95 RSC_PROJ= /l 0x409 /d "FEAT_GUI_MSWIN" |
96 # ADD RSC /l 0x409 /d "FEAT_GUI" | 96 # ADD RSC /l 0x409 /d "FEAT_GUI_MSWIN" |
97 | 97 |
98 !IF "$(CFG)" == "Vim - Win32 Release gvim OLE" | 98 !IF "$(CFG)" == "Vim - Win32 Release gvim OLE" |
99 | 99 |
100 # PROP Use_Debug_Libraries 0 | 100 # PROP Use_Debug_Libraries 0 |
101 # PROP Output_Dir .\oleRel | 101 # PROP Output_Dir .\oleRel |
103 | 103 |
104 INTDIR=.\oleRel | 104 INTDIR=.\oleRel |
105 VIM=gvim | 105 VIM=gvim |
106 EXTRAS="$(INTDIR)/if_ole.obj" "$(INTDIR)/vim.res" "$(INTDIR)/gui.obj" "$(INTDIR)/gui_w32.obj" "$(INTDIR)/gui_beval.obj" "$(INTDIR)/os_w32exe.obj" | 106 EXTRAS="$(INTDIR)/if_ole.obj" "$(INTDIR)/vim.res" "$(INTDIR)/gui.obj" "$(INTDIR)/gui_w32.obj" "$(INTDIR)/gui_beval.obj" "$(INTDIR)/os_w32exe.obj" |
107 | 107 |
108 CPP_PROJ=$(CPP_PROJ) /Zi /O2 /D "NDEBUG" /D "FEAT_GUI" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/ | 108 CPP_PROJ=$(CPP_PROJ) /Zi /O2 /D "NDEBUG" /D "FEAT_GUI_MSWIN" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/ |
109 # ADD CPP /Zi /O2 /D "NDEBUG" /D "FEAT_GUI" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/ | 109 # ADD CPP /Zi /O2 /D "NDEBUG" /D "FEAT_GUI_MSWIN" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/ |
110 | 110 |
111 RSC_PROJ=$(RSC_PROJ) /I ".\oleRel" /d "NDEBUG" /d "FEAT_OLE" /fo.\oleRel\vim.res | 111 RSC_PROJ=$(RSC_PROJ) /I ".\oleRel" /d "NDEBUG" /d "FEAT_OLE" /fo.\oleRel\vim.res |
112 # ADD RSC /I ".\oleRel" /d "NDEBUG" /d "FEAT_OLE" /fo.\oleRel\vim.res | 112 # ADD RSC /I ".\oleRel" /d "NDEBUG" /d "FEAT_OLE" /fo.\oleRel\vim.res |
113 | 113 |
114 LINK32_FLAGS=$(LINK32_FLAGS) /pdb:.\oleRel/gvim.pdb -debug:full -debugtype:cv,fixup /map:.\oleDbg\gvim.map libc.lib oleaut32.lib /subsystem:windows /out:.\gvim.exe | 114 LINK32_FLAGS=$(LINK32_FLAGS) /pdb:.\oleRel/gvim.pdb -debug:full -debugtype:cv,fixup /map:.\oleDbg\gvim.map libc.lib oleaut32.lib /subsystem:windows /out:.\gvim.exe |
122 | 122 |
123 INTDIR=.\oleDbg | 123 INTDIR=.\oleDbg |
124 VIM=gvimd | 124 VIM=gvimd |
125 EXTRAS="$(INTDIR)/if_ole.obj" "$(INTDIR)/vim.res" "$(INTDIR)/gui.obj" "$(INTDIR)/gui_w32.obj" "$(INTDIR)/gui_beval.obj" "$(INTDIR)/os_w32exe.obj" | 125 EXTRAS="$(INTDIR)/if_ole.obj" "$(INTDIR)/vim.res" "$(INTDIR)/gui.obj" "$(INTDIR)/gui_w32.obj" "$(INTDIR)/gui_beval.obj" "$(INTDIR)/os_w32exe.obj" |
126 | 126 |
127 CPP_PROJ=$(CPP_PROJ) /Zi /Od /D "_DEBUG" /D "FEAT_GUI" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleDbg/ /Fo.\oleDbg/ | 127 CPP_PROJ=$(CPP_PROJ) /Zi /Od /D "_DEBUG" /D "FEAT_GUI_MSWIN" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleDbg/ /Fo.\oleDbg/ |
128 # ADD CPP /Zi /Od /D "_DEBUG" /D "FEAT_GUI" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleDbg/ /Fo.\oleDbg/ | 128 # ADD CPP /Zi /Od /D "_DEBUG" /D "FEAT_GUI_MSWIN" /D "DYNAMIC_GETTEXT" /D "FEAT_OLE" /Fd.\oleDbg/ /Fo.\oleDbg/ |
129 | 129 |
130 RSC_PROJ=$(RSC_PROJ) /I .\oleDbg /d "_DEBUG" /d "FEAT_OLE" /fo.\oleDbg\vim.res | 130 RSC_PROJ=$(RSC_PROJ) /I .\oleDbg /d "_DEBUG" /d "FEAT_OLE" /fo.\oleDbg\vim.res |
131 # ADD RSC /I .\oleDbg /d "_DEBUG" /d "FEAT_OLE" /fo.\oleDbg\vim.res | 131 # ADD RSC /I .\oleDbg /d "_DEBUG" /d "FEAT_OLE" /fo.\oleDbg\vim.res |
132 | 132 |
133 LINK32_FLAGS=$(LINK32_FLAGS) libcd.lib oleaut32.lib /subsystem:windows /debug /profile /pdb:.\oleDbg/gvimd.pdb -debug:full -debugtype:cv,fixup /map:.\oleDbg\gvimd.map /out:.\gvimd.exe | 133 LINK32_FLAGS=$(LINK32_FLAGS) libcd.lib oleaut32.lib /subsystem:windows /debug /profile /pdb:.\oleDbg/gvimd.pdb -debug:full -debugtype:cv,fixup /map:.\oleDbg\gvimd.map /out:.\gvimd.exe |
142 | 142 |
143 INTDIR=.\gRel | 143 INTDIR=.\gRel |
144 VIM=gvim | 144 VIM=gvim |
145 EXTRAS="$(INTDIR)/vim.res" "$(INTDIR)/gui.obj" "$(INTDIR)/gui_w32.obj" "$(INTDIR)/gui_beval.obj" "$(INTDIR)/os_w32exe.obj" | 145 EXTRAS="$(INTDIR)/vim.res" "$(INTDIR)/gui.obj" "$(INTDIR)/gui_w32.obj" "$(INTDIR)/gui_beval.obj" "$(INTDIR)/os_w32exe.obj" |
146 | 146 |
147 CPP_PROJ=$(CPP_PROJ) /Zi /O2 /D "NDEBUG" /D "FEAT_GUI" /Fd.\gRel/ /Fo.\gRel/ | 147 CPP_PROJ=$(CPP_PROJ) /Zi /O2 /D "NDEBUG" /D "FEAT_GUI_MSWIN" /Fd.\gRel/ /Fo.\gRel/ |
148 # ADD CPP /Zi /O2 /D "NDEBUG" /D "FEAT_GUI" /Fd.\gRel/ /Fo.\gRel/ | 148 # ADD CPP /Zi /O2 /D "NDEBUG" /D "FEAT_GUI_MSWIN" /Fd.\gRel/ /Fo.\gRel/ |
149 | 149 |
150 RSC_PROJ=$(RSC_PROJ) /d "NDEBUG" /fo.\gRel\vim.res | 150 RSC_PROJ=$(RSC_PROJ) /d "NDEBUG" /fo.\gRel\vim.res |
151 # ADD RSC /d "NDEBUG" /fo.\gRel\vim.res | 151 # ADD RSC /d "NDEBUG" /fo.\gRel\vim.res |
152 | 152 |
153 LINK32_FLAGS=$(LINK32_FLAGS) /pdb:.\gRel/gvim.pdb -debug:full -debugtype:cv,fixup /map:.\oleDbg\gvim.map libc.lib /subsystem:windows /out:.\gvim.exe | 153 LINK32_FLAGS=$(LINK32_FLAGS) /pdb:.\gRel/gvim.pdb -debug:full -debugtype:cv,fixup /map:.\oleDbg\gvim.map libc.lib /subsystem:windows /out:.\gvim.exe |
161 | 161 |
162 INTDIR=.\gDbg | 162 INTDIR=.\gDbg |
163 VIM=gvimd | 163 VIM=gvimd |
164 EXTRAS="$(INTDIR)/vim.res" "$(INTDIR)/gui.obj" "$(INTDIR)/gui_w32.obj" "$(INTDIR)/gui_beval.obj" "$(INTDIR)/os_w32exe.obj" | 164 EXTRAS="$(INTDIR)/vim.res" "$(INTDIR)/gui.obj" "$(INTDIR)/gui_w32.obj" "$(INTDIR)/gui_beval.obj" "$(INTDIR)/os_w32exe.obj" |
165 | 165 |
166 CPP_PROJ=$(CPP_PROJ) /Zi /Od /D "_DEBUG" /D "FEAT_GUI" /Fd.\gDbg/ /Fo.\gDbg/ | 166 CPP_PROJ=$(CPP_PROJ) /Zi /Od /D "_DEBUG" /D "FEAT_GUI_MSWIN" /Fd.\gDbg/ /Fo.\gDbg/ |
167 # ADD CPP /Zi /Od /D "_DEBUG" /D "FEAT_GUI" /Fd.\gDbg/ /Fo.\gDbg/ | 167 # ADD CPP /Zi /Od /D "_DEBUG" /D "FEAT_GUI_MSWIN" /Fd.\gDbg/ /Fo.\gDbg/ |
168 | 168 |
169 RSC_PROJ=$(RSC_PROJ) /d "_DEBUG" /fo.\gDbg\vim.res | 169 RSC_PROJ=$(RSC_PROJ) /d "_DEBUG" /fo.\gDbg\vim.res |
170 # ADD RSC /d "_DEBUG" /fo.\gDbg\vim.res | 170 # ADD RSC /d "_DEBUG" /fo.\gDbg\vim.res |
171 | 171 |
172 LINK32_FLAGS=$(LINK32_FLAGS) libcd.lib /subsystem:windows /debug /profile /pdb:.\gDbg/gvimd.pdb -debug:full -debugtype:cv,fixup /map:.\gDbg\gvimd.map /out:.\gvimd.exe | 172 LINK32_FLAGS=$(LINK32_FLAGS) libcd.lib /subsystem:windows /debug /profile /pdb:.\gDbg/gvimd.pdb -debug:full -debugtype:cv,fixup /map:.\gDbg\gvimd.map /out:.\gvimd.exe |
506 | 506 |
507 # PROP Ignore_Default_Tool 1 | 507 # PROP Ignore_Default_Tool 1 |
508 # Begin Custom Build | 508 # Begin Custom Build |
509 | 509 |
510 "$(INTDIR)\if_ole.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\if_ole.h" | 510 "$(INTDIR)\if_ole.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\if_ole.h" |
511 cl.exe /nologo /MT /W3 /GX /I ".\proto" /D "WIN32" /c /Zi /O2 /D "NDEBUG" /D "FEAT_GUI" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/ /I ".\oleRel" .\if_ole.cpp | 511 cl.exe /nologo /MT /W3 /GX /I ".\proto" /D "WIN32" /c /Zi /O2 /D "NDEBUG" /D "FEAT_GUI_MSWIN" /D "FEAT_OLE" /Fd.\oleRel/ /Fo.\oleRel/ /I ".\oleRel" .\if_ole.cpp |
512 @rem This is the default rule with /I "$(IntDir)" added | 512 @rem This is the default rule with /I "$(IntDir)" added |
513 | 513 |
514 # End Custom Build | 514 # End Custom Build |
515 | 515 |
516 !ELSEIF "$(CFG)" == "Vim - Win32 Debug gvim OLE" | 516 !ELSEIF "$(CFG)" == "Vim - Win32 Debug gvim OLE" |
517 | 517 |
518 # PROP Ignore_Default_Tool 1 | 518 # PROP Ignore_Default_Tool 1 |
519 # Begin Custom Build | 519 # Begin Custom Build |
520 | 520 |
521 "$(INTDIR)\if_ole.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\if_ole.h" | 521 "$(INTDIR)\if_ole.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\if_ole.h" |
522 cl.exe /nologo /MT /W3 /GX /I ".\proto" /D "WIN32" /c /Zi /Od /D "_DEBUG" /D "FEAT_GUI" /D "FEAT_OLE" /Fd.\oleDbg/ /Fo.\oleDbg/ /I ".\oleDbg" .\if_ole.cpp | 522 cl.exe /nologo /MT /W3 /GX /I ".\proto" /D "WIN32" /c /Zi /Od /D "_DEBUG" /D "FEAT_GUI_MSWIN" /D "FEAT_OLE" /Fd.\oleDbg/ /Fo.\oleDbg/ /I ".\oleDbg" .\if_ole.cpp |
523 @rem This is the default rule with /I "$(IntDir)" added | 523 @rem This is the default rule with /I "$(IntDir)" added |
524 | 524 |
525 # End Custom Build | 525 # End Custom Build |
526 | 526 |
527 !ELSEIF "$(CFG)" == "Vim - Win32 Release gvim" | 527 !ELSEIF "$(CFG)" == "Vim - Win32 Release gvim" |