Mercurial > vim

comparison src/Make_mvc.mak @ 17131:be5a5cfc991a v8.1.1565

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1565: MS-Windows: no sound support commit https://github.com/vim/vim/commit/9b283523f2f75b45feef902b8713808e883d9c19 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jun 17 22:19:33 2019 +0200 patch 8.1.1565: MS-Windows: no sound support Problem: MS-Windows: no sound support. Solution: Add sound support for MS-Windows. (Yasuhiro Matsumoto, Ken Takata, closes #4522)
author Bram Moolenaar <Bram@vim.org>
date Mon, 17 Jun 2019 22:30:06 +0200
parents cd9c0973e7ae
children bbd454d155a9
comparison
equal deleted inserted replaced
17130:808ed7403f4f 17131:be5a5cfc991a
36 # IME support: IME=yes (requires GUI=yes) 36 # IME support: IME=yes (requires GUI=yes)
37 # DYNAMIC_IME=[yes or no] (to load the imm32.dll dynamically, default 37 # DYNAMIC_IME=[yes or no] (to load the imm32.dll dynamically, default
38 # is yes) 38 # is yes)
39 # Global IME support: GIME=yes (requires GUI=yes) 39 # Global IME support: GIME=yes (requires GUI=yes)
40 # 40 #
41 # Terminal support: TERMINAL=yes (default is yes) 41 # Terminal support: TERMINAL=yes (default is yes)
42 #
43 # Sound support: SOUND=yes (default is yes)
42 # 44 #
43 # DLL support (EXPERIMENTAL): VIMDLL=yes (default is no) 45 # DLL support (EXPERIMENTAL): VIMDLL=yes (default is no)
44 # Creates vim{32,64}.dll, and stub gvim.exe and vim.exe. 46 # Creates vim{32,64}.dll, and stub gvim.exe and vim.exe.
45 # The shared codes between the GUI and the console are built into 47 # The shared codes between the GUI and the console are built into
46 # the DLL. This reduces the total file size and memory usage. 48 # the DLL. This reduces the total file size and memory usage.
377 libvterm/include/vterm.h \ 379 libvterm/include/vterm.h \
378 libvterm/include/vterm_keycodes.h \ 380 libvterm/include/vterm_keycodes.h \
379 libvterm/src/rect.h \ 381 libvterm/src/rect.h \
380 libvterm/src/utf8.h \ 382 libvterm/src/utf8.h \
381 libvterm/src/vterm_internal.h 383 libvterm/src/vterm_internal.h
384 !endif
385
386 !ifndef SOUND
387 ! if "$(FEATURES)"=="HUGE" || "$(FEATURES)"=="BIG"
388 SOUND = yes
389 ! else
390 SOUND = no
391 ! endif
382 !endif 392 !endif
383 393
384 !ifndef NETBEANS 394 !ifndef NETBEANS
385 NETBEANS = $(GUI) 395 NETBEANS = $(GUI)
386 !endif 396 !endif
452 ! endif 462 ! endif
453 XPM_INC = -I $(XPM)\include -I $(XPM)\..\include 463 XPM_INC = -I $(XPM)\include -I $(XPM)\..\include
454 ! endif 464 ! endif
455 !endif # GUI 465 !endif # GUI
456 466
467 !if "$(SOUND)" == "yes"
468 SOUND_PRO = proto/sound.pro
469 SOUND_OBJ = $(OBJDIR)/sound.obj
470 SOUND_DEFS = -DFEAT_SOUND
471 SOUND_LIB = winmm.lib
472 !endif
473
457 !if "$(CHANNEL)" == "yes" 474 !if "$(CHANNEL)" == "yes"
458 CHANNEL_PRO = proto/channel.pro 475 CHANNEL_PRO = proto/channel.pro
459 CHANNEL_OBJ = $(OBJDIR)/channel.obj 476 CHANNEL_OBJ = $(OBJDIR)/channel.obj
460 CHANNEL_DEFS = -DFEAT_JOB_CHANNEL 477 CHANNEL_DEFS = -DFEAT_JOB_CHANNEL
461 478
492 # default, use these lines. 509 # default, use these lines.
493 #VIMRCLOC = somewhere 510 #VIMRCLOC = somewhere
494 #VIMRUNTIMEDIR = somewhere 511 #VIMRUNTIMEDIR = somewhere
495 512
496 CFLAGS = -c /W3 /nologo $(CVARS) -I. -Iproto -DHAVE_PATHDEF -DWIN32 \ 513 CFLAGS = -c /W3 /nologo $(CVARS) -I. -Iproto -DHAVE_PATHDEF -DWIN32 \
497 $(CSCOPE_DEFS) $(TERM_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \ 514 $(CSCOPE_DEFS) $(TERM_DEFS) $(SOUND_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \
498 $(NBDEBUG_DEFS) $(XPM_DEFS) \ 515 $(NBDEBUG_DEFS) $(XPM_DEFS) \
499 $(DEFINES) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) 516 $(DEFINES) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER)
500 517
501 #>>>>> end of choices 518 #>>>>> end of choices
502 ########################################################################### 519 ###########################################################################
1215 !ENDIF 1232 !ENDIF
1216 1233
1217 LINKARGS1 = $(linkdebug) $(conflags) 1234 LINKARGS1 = $(linkdebug) $(conflags)
1218 LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) user32.lib \ 1235 LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) user32.lib \
1219 $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \ 1236 $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \
1220 $(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB) 1237 $(TCL_LIB) $(SOUND_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB)
1221 1238
1222 # Report link time code generation progress if used. 1239 # Report link time code generation progress if used.
1223 !ifdef NODEBUG 1240 !ifdef NODEBUG
1224 ! if $(MSVC_MAJOR) >= 8 1241 ! if $(MSVC_MAJOR) >= 8
1225 ! if "$(OPTIMIZE)" != "SPACE" 1242 ! if "$(OPTIMIZE)" != "SPACE"
1251 1268
1252 !if "$(VIMDLL)" == "yes" 1269 !if "$(VIMDLL)" == "yes"
1253 1270
1254 $(VIMDLLBASE).dll: $(OUTDIR) $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ 1271 $(VIMDLLBASE).dll: $(OUTDIR) $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \
1255 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ 1272 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \
1256 $(CSCOPE_OBJ) $(TERM_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ 1273 $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \
1257 version.c version.h 1274 version.c version.h
1258 $(CC) $(CFLAGS_OUTDIR) version.c 1275 $(CC) $(CFLAGS_OUTDIR) version.c
1259 $(link) $(LINKARGS1) /dll -out:$(VIMDLLBASE).dll $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \ 1276 $(link) $(LINKARGS1) /dll -out:$(VIMDLLBASE).dll $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \
1260 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \ 1277 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \
1261 $(TCL_OBJ) $(CSCOPE_OBJ) $(TERM_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \ 1278 $(TCL_OBJ) $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \
1262 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) 1279 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2)
1263 1280
1264 $(GVIM).exe: $(OUTDIR) $(EXEOBJG) $(VIMDLLBASE).dll 1281 $(GVIM).exe: $(OUTDIR) $(EXEOBJG) $(VIMDLLBASE).dll
1265 $(link) $(LINKARGS1) /subsystem:$(SUBSYSTEM) -out:$(GVIM).exe $(EXEOBJG) $(VIMDLLBASE).lib $(LIBC) 1282 $(link) $(LINKARGS1) /subsystem:$(SUBSYSTEM) -out:$(GVIM).exe $(EXEOBJG) $(VIMDLLBASE).lib $(LIBC)
1266 if exist $(GVIM).exe.manifest mt.exe -nologo -manifest $(GVIM).exe.manifest -updateresource:$(GVIM).exe;1 1283 if exist $(GVIM).exe.manifest mt.exe -nologo -manifest $(GVIM).exe.manifest -updateresource:$(GVIM).exe;1
1271 1288
1272 !else 1289 !else
1273 1290
1274 $(VIM).exe: $(OUTDIR) $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ 1291 $(VIM).exe: $(OUTDIR) $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \
1275 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ 1292 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \
1276 $(CSCOPE_OBJ) $(TERM_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ 1293 $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \
1277 version.c version.h 1294 version.c version.h
1278 $(CC) $(CFLAGS_OUTDIR) version.c 1295 $(CC) $(CFLAGS_OUTDIR) version.c
1279 $(link) $(LINKARGS1) /subsystem:$(SUBSYSTEM) -out:$(VIM).exe $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \ 1296 $(link) $(LINKARGS1) /subsystem:$(SUBSYSTEM) -out:$(VIM).exe $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \
1280 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \ 1297 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \
1281 $(TCL_OBJ) $(CSCOPE_OBJ) $(TERM_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \ 1298 $(TCL_OBJ) $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \
1282 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) 1299 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2)
1283 if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1 1300 if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1
1284 1301
1285 !endif 1302 !endif
1286 1303
1764 proto/ui.pro \ 1781 proto/ui.pro \
1765 proto/undo.pro \ 1782 proto/undo.pro \
1766 proto/usercmd.pro \ 1783 proto/usercmd.pro \
1767 proto/userfunc.pro \ 1784 proto/userfunc.pro \
1768 proto/window.pro \ 1785 proto/window.pro \
1786 $(SOUND_PRO) \
1769 $(NETBEANS_PRO) \ 1787 $(NETBEANS_PRO) \
1770 $(CHANNEL_PRO) 1788 $(CHANNEL_PRO)
1771 1789
1772 .SUFFIXES: .cod .i 1790 .SUFFIXES: .cod .i
1773 1791