Mercurial > vim
comparison src/Make_mvc.mak @ 11782:112427b2de52 v8.0.0773
patch 8.0.0773: mixing 32 and 64 bit libvterm builds fails
commit https://github.com/vim/vim/commit/f80451e6fe19b3bbddc45ec047a2f95989ef3531
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jul 25 21:49:35 2017 +0200
patch 8.0.0773: mixing 32 and 64 bit libvterm builds fails
Problem: Mixing 32 and 64 bit libvterm builds fails.
Solution: Use OUTDIR. (Ken Takata)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 25 Jul 2017 22:00:05 +0200 |
parents | edf1a2a247fa |
children | 24a3bec6e317 |
comparison
equal
deleted
inserted
replaced
11781:c56c413f83a1 | 11782:112427b2de52 |
---|---|
352 CSCOPE_OBJ = $(OBJDIR)/if_cscope.obj | 352 CSCOPE_OBJ = $(OBJDIR)/if_cscope.obj |
353 CSCOPE_DEFS = -DFEAT_CSCOPE | 353 CSCOPE_DEFS = -DFEAT_CSCOPE |
354 !endif | 354 !endif |
355 | 355 |
356 !if "$(TERMINAL)" == "yes" | 356 !if "$(TERMINAL)" == "yes" |
357 TERMINAL_OBJ = $(OBJDIR)/terminal.obj | 357 TERM_OBJ = \ |
358 TERMINAL_DEFS = -DFEAT_TERMINAL | 358 $(OBJDIR)/terminal.obj \ |
359 !if $(MSVC_MAJOR) <= 11 | 359 $(OBJDIR)/term_encoding.obj \ |
360 TERMINAL_DEFS = $(TERMINAL_DEFS) /I if_perl_msvc | 360 $(OBJDIR)/term_keyboard.obj \ |
361 !endif | 361 $(OBJDIR)/term_mouse.obj \ |
362 TERMINAL_SRC = terminal.c | 362 $(OBJDIR)/term_parser.obj \ |
363 VTERM_LIB = libvterm/vterm.lib | 363 $(OBJDIR)/term_pen.obj \ |
364 $(OBJDIR)/term_screen.obj \ | |
365 $(OBJDIR)/term_state.obj \ | |
366 $(OBJDIR)/term_unicode.obj \ | |
367 $(OBJDIR)/term_vterm.obj | |
368 TERM_DEFS = -DFEAT_TERMINAL | |
369 TERM_DEPS = \ | |
370 libvterm/include/vterm.h \ | |
371 libvterm/include/vterm_keycodes.h \ | |
372 libvterm/src/rect.h \ | |
373 libvterm/src/utf8.h \ | |
374 libvterm/src/vterm_internal.h | |
364 !endif | 375 !endif |
365 | 376 |
366 !ifndef NETBEANS | 377 !ifndef NETBEANS |
367 NETBEANS = $(GUI) | 378 NETBEANS = $(GUI) |
368 !endif | 379 !endif |
468 # default, use these lines. | 479 # default, use these lines. |
469 #VIMRCLOC = somewhere | 480 #VIMRCLOC = somewhere |
470 #VIMRUNTIMEDIR = somewhere | 481 #VIMRUNTIMEDIR = somewhere |
471 | 482 |
472 CFLAGS = -c /W3 /nologo $(CVARS) -I. -Iproto -DHAVE_PATHDEF -DWIN32 \ | 483 CFLAGS = -c /W3 /nologo $(CVARS) -I. -Iproto -DHAVE_PATHDEF -DWIN32 \ |
473 $(CSCOPE_DEFS) $(TERMINAL_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \ | 484 $(CSCOPE_DEFS) $(TERM_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \ |
474 $(NBDEBUG_DEFS) $(XPM_DEFS) \ | 485 $(NBDEBUG_DEFS) $(XPM_DEFS) \ |
475 $(DEFINES) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \ | 486 $(DEFINES) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) |
476 /Fo$(OUTDIR)/ | |
477 | 487 |
478 #>>>>> end of choices | 488 #>>>>> end of choices |
479 ########################################################################### | 489 ########################################################################### |
480 | 490 |
481 DEL_TREE = rmdir /s /q | 491 DEL_TREE = rmdir /s /q |
1119 # | 1129 # |
1120 # End extra feature include | 1130 # End extra feature include |
1121 # | 1131 # |
1122 !message | 1132 !message |
1123 | 1133 |
1134 # CFLAGS with /Fo$(OUTDIR)/ | |
1135 CFLAGS_OUTDIR=$(CFLAGS) /Fo$(OUTDIR)/ | |
1136 | |
1124 conflags = /nologo /subsystem:$(SUBSYSTEM) | 1137 conflags = /nologo /subsystem:$(SUBSYSTEM) |
1125 | 1138 |
1126 PATHDEF_SRC = $(OUTDIR)\pathdef.c | 1139 PATHDEF_SRC = $(OUTDIR)\pathdef.c |
1127 | 1140 |
1128 !IF "$(MAP)" == "yes" | 1141 !IF "$(MAP)" == "yes" |
1134 !ENDIF | 1147 !ENDIF |
1135 | 1148 |
1136 LINKARGS1 = $(linkdebug) $(conflags) | 1149 LINKARGS1 = $(linkdebug) $(conflags) |
1137 LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) user32.lib \ | 1150 LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) user32.lib \ |
1138 $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \ | 1151 $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \ |
1139 $(TCL_LIB) $(NETBEANS_LIB) $(VTERM_LIB) $(XPM_LIB) $(LINK_PDB) | 1152 $(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB) |
1140 | 1153 |
1141 # Report link time code generation progress if used. | 1154 # Report link time code generation progress if used. |
1142 !ifdef NODEBUG | 1155 !ifdef NODEBUG |
1143 !if $(MSVC_MAJOR) >= 8 | 1156 !if $(MSVC_MAJOR) >= 8 |
1144 !if "$(OPTIMIZE)" != "SPACE" | 1157 !if "$(OPTIMIZE)" != "SPACE" |
1155 tee/tee.exe \ | 1168 tee/tee.exe \ |
1156 GvimExt/gvimext.dll | 1169 GvimExt/gvimext.dll |
1157 | 1170 |
1158 $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ | 1171 $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ |
1159 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ | 1172 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ |
1160 $(CSCOPE_OBJ) $(TERMINAL_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) $(VTERM_LIB) \ | 1173 $(CSCOPE_OBJ) $(TERM_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ |
1161 version.c version.h | 1174 version.c version.h |
1162 $(CC) $(CFLAGS) version.c | 1175 $(CC) $(CFLAGS_OUTDIR) version.c |
1163 $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \ | 1176 $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \ |
1164 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \ | 1177 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \ |
1165 $(TCL_OBJ) $(CSCOPE_OBJ) $(TERMINAL_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \ | 1178 $(TCL_OBJ) $(CSCOPE_OBJ) $(TERM_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \ |
1166 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) | 1179 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) |
1167 if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1 | 1180 if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1 |
1168 | 1181 |
1169 $(VIM): $(VIM).exe | 1182 $(VIM): $(VIM).exe |
1170 | 1183 |
1254 !IF "$(_NMAKE_VER)" == "" | 1267 !IF "$(_NMAKE_VER)" == "" |
1255 .c{$(OUTDIR)/}.obj: | 1268 .c{$(OUTDIR)/}.obj: |
1256 !ELSE | 1269 !ELSE |
1257 .c{$(OUTDIR)/}.obj:: | 1270 .c{$(OUTDIR)/}.obj:: |
1258 !ENDIF | 1271 !ENDIF |
1259 $(CC) $(CFLAGS) $< | 1272 $(CC) $(CFLAGS_OUTDIR) $< |
1260 | 1273 |
1261 # Create a default rule for transforming .cpp files to .obj files in $(OUTDIR) | 1274 # Create a default rule for transforming .cpp files to .obj files in $(OUTDIR) |
1262 # Batch compilation is supported by nmake 1.62 (part of VS 5.0) and later) | 1275 # Batch compilation is supported by nmake 1.62 (part of VS 5.0) and later) |
1263 !IF "$(_NMAKE_VER)" == "" | 1276 !IF "$(_NMAKE_VER)" == "" |
1264 .cpp{$(OUTDIR)/}.obj: | 1277 .cpp{$(OUTDIR)/}.obj: |
1265 !ELSE | 1278 !ELSE |
1266 .cpp{$(OUTDIR)/}.obj:: | 1279 .cpp{$(OUTDIR)/}.obj:: |
1267 !ENDIF | 1280 !ENDIF |
1268 $(CC) $(CFLAGS) $< | 1281 $(CC) $(CFLAGS_OUTDIR) $< |
1269 | 1282 |
1270 $(OUTDIR)/arabic.obj: $(OUTDIR) arabic.c $(INCL) | 1283 $(OUTDIR)/arabic.obj: $(OUTDIR) arabic.c $(INCL) |
1271 | 1284 |
1272 $(OUTDIR)/blowfish.obj: $(OUTDIR) blowfish.c $(INCL) | 1285 $(OUTDIR)/blowfish.obj: $(OUTDIR) blowfish.c $(INCL) |
1273 | 1286 |
1322 $(OUTDIR)/gui_dwrite.obj: $(OUTDIR) gui_dwrite.cpp $(INCL) $(GUI_INCL) | 1335 $(OUTDIR)/gui_dwrite.obj: $(OUTDIR) gui_dwrite.cpp $(INCL) $(GUI_INCL) |
1323 | 1336 |
1324 $(OUTDIR)/if_cscope.obj: $(OUTDIR) if_cscope.c $(INCL) | 1337 $(OUTDIR)/if_cscope.obj: $(OUTDIR) if_cscope.c $(INCL) |
1325 | 1338 |
1326 $(OUTDIR)/if_lua.obj: $(OUTDIR) if_lua.c $(INCL) | 1339 $(OUTDIR)/if_lua.obj: $(OUTDIR) if_lua.c $(INCL) |
1327 $(CC) $(CFLAGS) $(LUA_INC) if_lua.c | 1340 $(CC) $(CFLAGS_OUTDIR) $(LUA_INC) if_lua.c |
1328 | 1341 |
1329 if_perl.c : if_perl.xs typemap | 1342 if_perl.c : if_perl.xs typemap |
1330 $(XSUBPP) -prototypes -typemap $(XSUBPP_TYPEMAP) \ | 1343 $(XSUBPP) -prototypes -typemap $(XSUBPP_TYPEMAP) \ |
1331 -typemap typemap if_perl.xs > if_perl.c | 1344 -typemap typemap if_perl.xs > if_perl.c |
1332 | 1345 |
1333 $(OUTDIR)/if_perl.obj: $(OUTDIR) if_perl.c $(INCL) | 1346 $(OUTDIR)/if_perl.obj: $(OUTDIR) if_perl.c $(INCL) |
1334 $(CC) $(CFLAGS) $(PERL_INC) if_perl.c | 1347 $(CC) $(CFLAGS_OUTDIR) $(PERL_INC) if_perl.c |
1335 | 1348 |
1336 $(OUTDIR)/if_perlsfio.obj: $(OUTDIR) if_perlsfio.c $(INCL) | 1349 $(OUTDIR)/if_perlsfio.obj: $(OUTDIR) if_perlsfio.c $(INCL) |
1337 $(CC) $(CFLAGS) $(PERL_INC) if_perlsfio.c | 1350 $(CC) $(CFLAGS_OUTDIR) $(PERL_INC) if_perlsfio.c |
1338 | 1351 |
1339 $(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c if_mzsch.h $(INCL) $(MZSCHEME_EXTRA_DEP) | 1352 $(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c if_mzsch.h $(INCL) $(MZSCHEME_EXTRA_DEP) |
1340 $(CC) $(CFLAGS) if_mzsch.c \ | 1353 $(CC) $(CFLAGS_OUTDIR) if_mzsch.c \ |
1341 -DMZSCHEME_COLLECTS="\"$(MZSCHEME_COLLECTS:\=\\)\"" | 1354 -DMZSCHEME_COLLECTS="\"$(MZSCHEME_COLLECTS:\=\\)\"" |
1342 | 1355 |
1343 lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib: | 1356 lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib: |
1344 lib /DEF:"$(MZSCHEME)\lib\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).def" | 1357 lib /DEF:"$(MZSCHEME)\lib\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).def" |
1345 | 1358 |
1346 $(OUTDIR)/if_python.obj: $(OUTDIR) if_python.c if_py_both.h $(INCL) | 1359 $(OUTDIR)/if_python.obj: $(OUTDIR) if_python.c if_py_both.h $(INCL) |
1347 $(CC) $(CFLAGS) $(PYTHON_INC) if_python.c | 1360 $(CC) $(CFLAGS_OUTDIR) $(PYTHON_INC) if_python.c |
1348 | 1361 |
1349 $(OUTDIR)/if_python3.obj: $(OUTDIR) if_python3.c if_py_both.h $(INCL) | 1362 $(OUTDIR)/if_python3.obj: $(OUTDIR) if_python3.c if_py_both.h $(INCL) |
1350 $(CC) $(CFLAGS) $(PYTHON3_INC) if_python3.c | 1363 $(CC) $(CFLAGS_OUTDIR) $(PYTHON3_INC) if_python3.c |
1351 | 1364 |
1352 $(OUTDIR)/if_ole.obj: $(OUTDIR) if_ole.cpp $(INCL) if_ole.h | 1365 $(OUTDIR)/if_ole.obj: $(OUTDIR) if_ole.cpp $(INCL) if_ole.h |
1353 | 1366 |
1354 $(OUTDIR)/if_ruby.obj: $(OUTDIR) if_ruby.c $(INCL) | 1367 $(OUTDIR)/if_ruby.obj: $(OUTDIR) if_ruby.c $(INCL) |
1355 $(CC) $(CFLAGS) $(RUBY_INC) if_ruby.c | 1368 $(CC) $(CFLAGS_OUTDIR) $(RUBY_INC) if_ruby.c |
1356 | 1369 |
1357 $(OUTDIR)/if_tcl.obj: $(OUTDIR) if_tcl.c $(INCL) | 1370 $(OUTDIR)/if_tcl.obj: $(OUTDIR) if_tcl.c $(INCL) |
1358 $(CC) $(CFLAGS) $(TCL_INC) if_tcl.c | 1371 $(CC) $(CFLAGS_OUTDIR) $(TCL_INC) if_tcl.c |
1359 | 1372 |
1360 $(OUTDIR)/iscygpty.obj: $(OUTDIR) iscygpty.c $(CUI_INCL) | 1373 $(OUTDIR)/iscygpty.obj: $(OUTDIR) iscygpty.c $(CUI_INCL) |
1361 $(CC) $(CFLAGS) iscygpty.c -D_WIN32_WINNT=0x0600 -DUSE_DYNFILEID -DENABLE_STUB_IMPL | 1374 $(CC) $(CFLAGS_OUTDIR) iscygpty.c -D_WIN32_WINNT=0x0600 -DUSE_DYNFILEID -DENABLE_STUB_IMPL |
1362 | 1375 |
1363 $(OUTDIR)/json.obj: $(OUTDIR) json.c $(INCL) | 1376 $(OUTDIR)/json.obj: $(OUTDIR) json.c $(INCL) |
1364 | 1377 |
1365 $(OUTDIR)/list.obj: $(OUTDIR) list.c $(INCL) | 1378 $(OUTDIR)/list.obj: $(OUTDIR) list.c $(INCL) |
1366 | 1379 |
1394 | 1407 |
1395 $(OUTDIR)/ops.obj: $(OUTDIR) ops.c $(INCL) | 1408 $(OUTDIR)/ops.obj: $(OUTDIR) ops.c $(INCL) |
1396 | 1409 |
1397 $(OUTDIR)/os_mswin.obj: $(OUTDIR) os_mswin.c $(INCL) | 1410 $(OUTDIR)/os_mswin.obj: $(OUTDIR) os_mswin.c $(INCL) |
1398 | 1411 |
1399 $(OUTDIR)/terminal.obj: $(OUTDIR) terminal.c $(INCL) | 1412 $(OUTDIR)/terminal.obj: $(OUTDIR) terminal.c $(INCL) $(TERM_DEPS) |
1400 | 1413 |
1401 $(OUTDIR)/winclip.obj: $(OUTDIR) winclip.c $(INCL) | 1414 $(OUTDIR)/winclip.obj: $(OUTDIR) winclip.c $(INCL) |
1402 | 1415 |
1403 $(OUTDIR)/os_win32.obj: $(OUTDIR) os_win32.c $(INCL) os_win32.h | 1416 $(OUTDIR)/os_win32.obj: $(OUTDIR) os_win32.c $(INCL) os_win32.h |
1404 | 1417 |
1405 $(OUTDIR)/os_w32exe.obj: $(OUTDIR) os_w32exe.c $(INCL) | 1418 $(OUTDIR)/os_w32exe.obj: $(OUTDIR) os_w32exe.c $(INCL) |
1406 | 1419 |
1407 $(OUTDIR)/pathdef.obj: $(OUTDIR) $(PATHDEF_SRC) $(INCL) | 1420 $(OUTDIR)/pathdef.obj: $(OUTDIR) $(PATHDEF_SRC) $(INCL) |
1408 $(CC) $(CFLAGS) $(PATHDEF_SRC) | 1421 $(CC) $(CFLAGS_OUTDIR) $(PATHDEF_SRC) |
1409 | 1422 |
1410 $(OUTDIR)/popupmnu.obj: $(OUTDIR) popupmnu.c $(INCL) | 1423 $(OUTDIR)/popupmnu.obj: $(OUTDIR) popupmnu.c $(INCL) |
1411 | 1424 |
1412 $(OUTDIR)/quickfix.obj: $(OUTDIR) quickfix.c $(INCL) | 1425 $(OUTDIR)/quickfix.obj: $(OUTDIR) quickfix.c $(INCL) |
1413 | 1426 |
1436 $(OUTDIR)/userfunc.obj: $(OUTDIR) userfunc.c $(INCL) | 1449 $(OUTDIR)/userfunc.obj: $(OUTDIR) userfunc.c $(INCL) |
1437 | 1450 |
1438 $(OUTDIR)/window.obj: $(OUTDIR) window.c $(INCL) | 1451 $(OUTDIR)/window.obj: $(OUTDIR) window.c $(INCL) |
1439 | 1452 |
1440 $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c | 1453 $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c |
1441 $(CC) $(CFLAGS) $(XPM_INC) xpm_w32.c | 1454 $(CC) $(CFLAGS_OUTDIR) $(XPM_INC) xpm_w32.c |
1442 | 1455 |
1443 $(OUTDIR)/vim.res: $(OUTDIR) vim.rc gvim.exe.mnf version.h tools.bmp \ | 1456 $(OUTDIR)/vim.res: $(OUTDIR) vim.rc gvim.exe.mnf version.h tools.bmp \ |
1444 tearoff.bmp vim.ico vim_error.ico \ | 1457 tearoff.bmp vim.ico vim_error.ico \ |
1445 vim_alert.ico vim_info.ico vim_quest.ico | 1458 vim_alert.ico vim_info.ico vim_quest.ico |
1446 $(RC) /nologo /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc | 1459 $(RC) /nologo /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc |
1453 midl /nologo /error none /proxy nul dimm.idl | 1466 midl /nologo /error none /proxy nul dimm.idl |
1454 | 1467 |
1455 $(OUTDIR)/dimm_i.obj: $(OUTDIR) dimm_i.c $(INCL) | 1468 $(OUTDIR)/dimm_i.obj: $(OUTDIR) dimm_i.c $(INCL) |
1456 | 1469 |
1457 $(OUTDIR)/glbl_ime.obj: $(OUTDIR) glbl_ime.cpp dimm.h $(INCL) | 1470 $(OUTDIR)/glbl_ime.obj: $(OUTDIR) glbl_ime.cpp dimm.h $(INCL) |
1471 | |
1472 | |
1473 CCCTERM = $(CC) $(CFLAGS) -Ilibvterm/include -DINLINE="" -DVSNPRINTF=vim_vsnprintf | |
1474 $(OUTDIR)/term_encoding.obj: $(OUTDIR) libvterm/src/encoding.c $(TERM_DEPS) | |
1475 $(CCCTERM) -Fo$@ libvterm/src/encoding.c | |
1476 | |
1477 $(OUTDIR)/term_keyboard.obj: $(OUTDIR) libvterm/src/keyboard.c $(TERM_DEPS) | |
1478 $(CCCTERM) -Fo$@ libvterm/src/keyboard.c | |
1479 | |
1480 $(OUTDIR)/term_mouse.obj: $(OUTDIR) libvterm/src/mouse.c $(TERM_DEPS) | |
1481 $(CCCTERM) -Fo$@ libvterm/src/mouse.c | |
1482 | |
1483 $(OUTDIR)/term_parser.obj: $(OUTDIR) libvterm/src/parser.c $(TERM_DEPS) | |
1484 $(CCCTERM) -Fo$@ libvterm/src/parser.c | |
1485 | |
1486 $(OUTDIR)/term_pen.obj: $(OUTDIR) libvterm/src/pen.c $(TERM_DEPS) | |
1487 $(CCCTERM) -Fo$@ libvterm/src/pen.c | |
1488 | |
1489 $(OUTDIR)/term_screen.obj: $(OUTDIR) libvterm/src/screen.c $(TERM_DEPS) | |
1490 $(CCCTERM) -Fo$@ libvterm/src/screen.c | |
1491 | |
1492 $(OUTDIR)/term_state.obj: $(OUTDIR) libvterm/src/state.c $(TERM_DEPS) | |
1493 $(CCCTERM) -Fo$@ libvterm/src/state.c | |
1494 | |
1495 $(OUTDIR)/term_unicode.obj: $(OUTDIR) libvterm/src/unicode.c $(TERM_DEPS) | |
1496 $(CCCTERM) -Fo$@ libvterm/src/unicode.c | |
1497 | |
1498 $(OUTDIR)/term_vterm.obj: $(OUTDIR) libvterm/src/vterm.c $(TERM_DEPS) | |
1499 $(CCCTERM) -Fo$@ libvterm/src/vterm.c | |
1500 | |
1458 | 1501 |
1459 # $CFLAGS may contain backslashes and double quotes, escape them both. | 1502 # $CFLAGS may contain backslashes and double quotes, escape them both. |
1460 E0_CFLAGS = $(CFLAGS:\=\\) | 1503 E0_CFLAGS = $(CFLAGS:\=\\) |
1461 E_CFLAGS = $(E0_CFLAGS:"=\") | 1504 E_CFLAGS = $(E0_CFLAGS:"=\") |
1462 # ") stop the string | 1505 # ") stop the string |
1548 | 1591 |
1549 # Generate foo.i (preprocessor listing) from foo.c via "nmake foo.i" | 1592 # Generate foo.i (preprocessor listing) from foo.c via "nmake foo.i" |
1550 .c.i: | 1593 .c.i: |
1551 $(CC) $(CFLAGS) /P /C $< | 1594 $(CC) $(CFLAGS) /P /C $< |
1552 | 1595 |
1553 libvterm/vterm.lib : | |
1554 cd libvterm | |
1555 $(MAKE) /NOLOGO -f Makefile.msc "MSVC_MAJOR=$(MSVC_MAJOR)" | |
1556 cd .. | |
1557 | |
1558 # vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0: | 1596 # vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0: |