Mercurial > vim

comparison src/Make_mvc.mak @ 27432:b63028cbe307 v8.2.4244

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4244: MS-Windows: warning from MSVC on debug build Commit: https://github.com/vim/vim/commit/14cbf77845624e4bfc28a65a5debb81864cba2cf Author: K.Takata <kentkt@csc.jp> Date: Fri Jan 28 18:54:13 2022 +0000 patch 8.2.4244: MS-Windows: warning from MSVC on debug build Problem: MS-Windows: warning from MSVC on debug build. Solution: Adjust "/opt"o options. Remove unused variables. Make variables uppercase for consistency. (Ken Takata, closes #9647)
author Bram Moolenaar <Bram@vim.org>
date Fri, 28 Jan 2022 20:00:04 +0100
parents 83bd6e25d0b6
children 4050f0554902
comparison
equal deleted inserted replaced
27431:d58f736a0429 27432:b63028cbe307
250 !else 250 !else
251 ! undef NODEBUG 251 ! undef NODEBUG
252 MAKEFLAGS_GVIMEXT = DEBUG=yes 252 MAKEFLAGS_GVIMEXT = DEBUG=yes
253 !endif 253 !endif
254 254
255 link = link 255 LINK = link
256 256
257 # Check VC version. 257 # Check VC version.
258 !if [echo MSVCVER=_MSC_VER> msvcver.c && $(CC) /EP msvcver.c > msvcver.~ 2> nul] 258 !if [echo MSVCVER=_MSC_VER> msvcver.c && $(CC) /EP msvcver.c > msvcver.~ 2> nul]
259 ! message *** ERROR 259 ! message *** ERROR
260 ! message Cannot run Visual C to determine its version. Make sure cl.exe is in your PATH. 260 ! message Cannot run Visual C to determine its version. Make sure cl.exe is in your PATH.
1258 !message 1258 !message
1259 1259
1260 # CFLAGS with /Fo$(OUTDIR)/ 1260 # CFLAGS with /Fo$(OUTDIR)/
1261 CFLAGS_OUTDIR=$(CFLAGS) /Fo$(OUTDIR)/ 1261 CFLAGS_OUTDIR=$(CFLAGS) /Fo$(OUTDIR)/
1262 1262
1263 # Add /opt:ref to remove unreferenced functions and data even when /DEBUG is
1264 # added.
1265 conflags = /nologo /opt:ref
1266
1267 PATHDEF_SRC = $(OUTDIR)\pathdef.c 1263 PATHDEF_SRC = $(OUTDIR)\pathdef.c
1268 1264
1269 !IF "$(MAP)" == "yes" 1265 LINKARGS1 = /nologo
1270 # "/map" is for debugging
1271 conflags = $(conflags) /map
1272 !ELSEIF "$(MAP)" == "lines"
1273 # "/mapinfo:lines" is for debugging, only works for VC6 and later
1274 conflags = $(conflags) /map /mapinfo:lines
1275 !ENDIF
1276
1277 LINKARGS1 = $(linkdebug) $(conflags)
1278 LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) \ 1266 LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) \
1279 $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \ 1267 $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \
1280 $(TCL_LIB) $(SOUND_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(SOD_LIB) $(LINK_PDB) 1268 $(TCL_LIB) $(SOUND_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(SOD_LIB) $(LINK_PDB)
1269
1270 !ifdef NODEBUG
1271 # Add /opt:ref to remove unreferenced functions and data even when /DEBUG is
1272 # added.
1273 LINKARGS1 = $(LINKARGS1) /opt:ref
1274 !else
1275 LINKARGS1 = $(LINKARGS1) /opt:noref /opt:noicf
1276 !endif
1277
1278 !if "$(MAP)" == "yes"
1279 # "/map" is for debugging
1280 LINKARGS1 = $(LINKARGS1) /map
1281 !elseif "$(MAP)" == "lines"
1282 # "/mapinfo:lines" is for debugging, only works for VC6 and later
1283 LINKARGS1 = $(LINKARGS1) /map /mapinfo:lines
1284 !endif
1281 1285
1282 # Enable link time code generation if needed. 1286 # Enable link time code generation if needed.
1283 !ifdef NODEBUG 1287 !ifdef NODEBUG
1284 ! if "$(OPTIMIZE)" != "SPACE" 1288 ! if "$(OPTIMIZE)" != "SPACE"
1285 ! if "$(CI)" == "true" || "$(CI)" == "True" 1289 ! if "$(CI)" == "true" || "$(CI)" == "True"
1315 xxd/xxd.exe \ 1319 xxd/xxd.exe \
1316 tee/tee.exe \ 1320 tee/tee.exe \
1317 GvimExt/gvimext.dll 1321 GvimExt/gvimext.dll
1318 1322
1319 # To get around the command line limit: Make use of nmake's response files to 1323 # To get around the command line limit: Make use of nmake's response files to
1320 # capture the arguments for $(link) in a file using the @<<ARGS<< syntax. 1324 # capture the arguments for $(LINK) in a file using the @<<ARGS<< syntax.
1321 1325
1322 !if "$(VIMDLL)" == "yes" 1326 !if "$(VIMDLL)" == "yes"
1323 1327
1324 $(VIMDLLBASE).dll: $(OUTDIR) $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ 1328 $(VIMDLLBASE).dll: $(OUTDIR) $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \
1325 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ 1329 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \
1326 $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ 1330 $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \
1327 version.c version.h 1331 version.c version.h
1328 $(CC) $(CFLAGS_OUTDIR) version.c 1332 $(CC) $(CFLAGS_OUTDIR) version.c
1329 $(link) @<< 1333 $(LINK) @<<
1330 $(LINKARGS1) /dll -out:$(VIMDLLBASE).dll $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) 1334 $(LINKARGS1) /dll -out:$(VIMDLLBASE).dll $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ)
1331 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) 1335 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ)
1332 $(TCL_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) 1336 $(TCL_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ)
1333 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) 1337 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2)
1334 << 1338 <<
1335 1339
1336 $(GVIM).exe: $(OUTDIR) $(EXEOBJG) $(VIMDLLBASE).dll 1340 $(GVIM).exe: $(OUTDIR) $(EXEOBJG) $(VIMDLLBASE).dll
1337 $(link) $(LINKARGS1) /subsystem:$(SUBSYSTEM) -out:$(GVIM).exe $(EXEOBJG) $(VIMDLLBASE).lib $(LIBC) 1341 $(LINK) $(LINKARGS1) /subsystem:$(SUBSYSTEM) -out:$(GVIM).exe $(EXEOBJG) $(VIMDLLBASE).lib $(LIBC)
1338 if exist $(GVIM).exe.manifest mt.exe -nologo -manifest $(GVIM).exe.manifest -updateresource:$(GVIM).exe;1 1342 if exist $(GVIM).exe.manifest mt.exe -nologo -manifest $(GVIM).exe.manifest -updateresource:$(GVIM).exe;1
1339 1343
1340 $(VIM).exe: $(OUTDIR) $(EXEOBJC) $(VIMDLLBASE).dll 1344 $(VIM).exe: $(OUTDIR) $(EXEOBJC) $(VIMDLLBASE).dll
1341 $(link) $(LINKARGS1) /subsystem:$(SUBSYSTEM_CON) -out:$(VIM).exe $(EXEOBJC) $(VIMDLLBASE).lib $(LIBC) 1345 $(LINK) $(LINKARGS1) /subsystem:$(SUBSYSTEM_CON) -out:$(VIM).exe $(EXEOBJC) $(VIMDLLBASE).lib $(LIBC)
1342 if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1 1346 if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1
1343 1347
1344 !else 1348 !else
1345 1349
1346 $(VIM).exe: $(OUTDIR) $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ 1350 $(VIM).exe: $(OUTDIR) $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \
1347 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ 1351 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \
1348 $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ 1352 $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \
1349 version.c version.h 1353 version.c version.h
1350 $(CC) $(CFLAGS_OUTDIR) version.c 1354 $(CC) $(CFLAGS_OUTDIR) version.c
1351 $(link) @<< 1355 $(LINK) @<<
1352 $(LINKARGS1) /subsystem:$(SUBSYSTEM) -out:$(VIM).exe $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) 1356 $(LINKARGS1) /subsystem:$(SUBSYSTEM) -out:$(VIM).exe $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ)
1353 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) 1357 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ)
1354 $(TCL_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) 1358 $(TCL_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ)
1355 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) 1359 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2)
1356 << 1360 <<
1411 - if exist $(VIM).ncb del $(VIM).ncb 1415 - if exist $(VIM).ncb del $(VIM).ncb
1412 !if "$(VIMDLL)" == "yes" 1416 !if "$(VIMDLL)" == "yes"
1413 - if exist $(GVIM).exe del $(GVIM).exe 1417 - if exist $(GVIM).exe del $(GVIM).exe
1414 - if exist $(GVIM).map del $(GVIM).map 1418 - if exist $(GVIM).map del $(GVIM).map
1415 - if exist $(VIMDLLBASE).dll del $(VIMDLLBASE).dll 1419 - if exist $(VIMDLLBASE).dll del $(VIMDLLBASE).dll
1420 - if exist $(VIMDLLBASE).ilk del $(VIMDLLBASE).ilk
1416 - if exist $(VIMDLLBASE).lib del $(VIMDLLBASE).lib 1421 - if exist $(VIMDLLBASE).lib del $(VIMDLLBASE).lib
1417 - if exist $(VIMDLLBASE).exp del $(VIMDLLBASE).exp 1422 - if exist $(VIMDLLBASE).exp del $(VIMDLLBASE).exp
1418 - if exist $(VIMDLLBASE).pdb del $(VIMDLLBASE).pdb 1423 - if exist $(VIMDLLBASE).pdb del $(VIMDLLBASE).pdb
1419 - if exist $(VIMDLLBASE).map del $(VIMDLLBASE).map 1424 - if exist $(VIMDLLBASE).map del $(VIMDLLBASE).map
1420 !endif 1425 !endif
1893 @echo /* pathdef.c */ > $(PATHDEF_SRC) 1898 @echo /* pathdef.c */ > $(PATHDEF_SRC)
1894 @echo #include "vim.h" >> $(PATHDEF_SRC) 1899 @echo #include "vim.h" >> $(PATHDEF_SRC)
1895 @echo char_u *default_vim_dir = (char_u *)"$(VIMRCLOC:\=\\)"; >> $(PATHDEF_SRC) 1900 @echo char_u *default_vim_dir = (char_u *)"$(VIMRCLOC:\=\\)"; >> $(PATHDEF_SRC)
1896 @echo char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR:\=\\)"; >> $(PATHDEF_SRC) 1901 @echo char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR:\=\\)"; >> $(PATHDEF_SRC)
1897 @echo char_u *all_cflags = (char_u *)"$(CC:\=\\) $(E_CFLAGS)"; >> $(PATHDEF_SRC) 1902 @echo char_u *all_cflags = (char_u *)"$(CC:\=\\) $(E_CFLAGS)"; >> $(PATHDEF_SRC)
1898 @echo char_u *all_lflags = (char_u *)"$(link:\=\\) $(LINKARGS1:\=\\) $(E_LINKARGS2)"; >> $(PATHDEF_SRC) 1903 @echo char_u *all_lflags = (char_u *)"$(LINK:\=\\) $(LINKARGS1:\=\\) $(E_LINKARGS2)"; >> $(PATHDEF_SRC)
1899 @echo char_u *compiled_user = (char_u *)"$(USERNAME)"; >> $(PATHDEF_SRC) 1904 @echo char_u *compiled_user = (char_u *)"$(USERNAME)"; >> $(PATHDEF_SRC)
1900 @echo char_u *compiled_sys = (char_u *)"$(USERDOMAIN)"; >> $(PATHDEF_SRC) 1905 @echo char_u *compiled_sys = (char_u *)"$(USERDOMAIN)"; >> $(PATHDEF_SRC)
1901 1906
1902 # End Custom Build 1907 # End Custom Build
1903 proto.h: \ 1908 proto.h: \