Mercurial > vim

comparison src/Make_cyg.mak @ 6110:1bff71d20262 v7.4.393

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.393 Problem: Text drawing on newer MS-Windows systems is suboptimal. Some multi-byte characters are not displayed, even though the same font in Notepad can display them. (Srinath Avadhanula) Solution: Add the 'renderoptions' option to enable Direct-X drawing. (Taro Muraoka)
author Bram Moolenaar <bram@vim.org>
date Wed, 06 Aug 2014 14:52:30 +0200
parents 805ad8488dc8
children ab71bb81b84e
comparison
equal deleted inserted replaced
6109:e21d20c8500f 6110:1bff71d20262
6 # 6 #
7 # This compiles Vim as a Windows application. If you want Vim to run as a 7 # This compiles Vim as a Windows application. If you want Vim to run as a
8 # Cygwin application use the Makefile (just like on Unix). 8 # Cygwin application use the Makefile (just like on Unix).
9 # 9 #
10 # GUI no or yes: set to yes if you want the GUI version (yes) 10 # GUI no or yes: set to yes if you want the GUI version (yes)
11 # DIRECTX no or yes: set to yes if you want use DirectWrite (no)
11 # PERL define to path to Perl dir to get Perl support (not defined) 12 # PERL define to path to Perl dir to get Perl support (not defined)
12 # PERL_VER define to version of Perl being used (56) 13 # PERL_VER define to version of Perl being used (56)
13 # DYNAMIC_PERL no or yes: set to yes to load the Perl DLL dynamically (yes) 14 # DYNAMIC_PERL no or yes: set to yes to load the Perl DLL dynamically (yes)
14 # PYTHON define to path to Python dir to get PYTHON support (not defined) 15 # PYTHON define to path to Python dir to get PYTHON support (not defined)
15 # PYTHON_VER define to version of Python being used (22) 16 # PYTHON_VER define to version of Python being used (22)
86 87
87 ifndef ARCH 88 ifndef ARCH
88 ARCH = i386 89 ARCH = i386
89 endif 90 endif
90 91
92 ifndef DIRECTX
93 DIRECTX = no
94 endif
95
91 ifndef WINVER 96 ifndef WINVER
92 WINVER = 0x0500 97 WINVER = 0x0500
93 endif 98 endif
94 99
95 ifndef CSCOPE 100 ifndef CSCOPE
468 endif 473 endif
469 474
470 endif 475 endif
471 476
472 ############################## 477 ##############################
478 ifeq (yes, $(DIRECTX))
479 # Only allow DIRECTX for a GUI build.
480 DEFINES += -DFEAT_DIRECTX -DDYNAMIC_DIRECTX
481 EXTRA_OBJS += $(OUTDIR)/gui_dwrite.o
482 EXTRA_LIBS += -ld2d1 -ldwrite
483 USE_STDCPLUS = yes
484 endif
485
486 ##############################
473 ifdef XPM 487 ifdef XPM
474 # Only allow XPM for a GUI build. 488 # Only allow XPM for a GUI build.
475 DEFINES += -DFEAT_XPM_W32 489 DEFINES += -DFEAT_XPM_W32
476 INCLUDES += -I$(XPM)/include 490 INCLUDES += -I$(XPM)/include
477 EXTRA_OBJS += $(OUTDIR)/xpm_w32.o 491 EXTRA_OBJS += $(OUTDIR)/xpm_w32.o
493 ############################## 507 ##############################
494 ifeq (yes, $(OLE)) 508 ifeq (yes, $(OLE))
495 DEFINES += -DFEAT_OLE 509 DEFINES += -DFEAT_OLE
496 EXTRA_OBJS += $(OUTDIR)/if_ole.o 510 EXTRA_OBJS += $(OUTDIR)/if_ole.o
497 EXTRA_LIBS += -loleaut32 511 EXTRA_LIBS += -loleaut32
498 ifeq (yes, $(STATIC_STDCPLUS)) 512 USE_STDCPLUS = yes
499 EXTRA_LIBS += -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
500 else
501 EXTRA_LIBS += -lstdc++
502 endif
503 endif 513 endif
504 514
505 ############################## 515 ##############################
506 ifneq (sh.exe, $(SHELL)) 516 ifneq (sh.exe, $(SHELL))
507 DEL = rm 517 DEL = rm
509 DIRSLASH = / 519 DIRSLASH = /
510 else 520 else
511 DEL = del 521 DEL = del
512 MKDIR = mkdir 522 MKDIR = mkdir
513 DIRSLASH = \\ 523 DIRSLASH = \\
524 endif
525
526 ##############################
527 ifeq (yes, $(USE_STDCPLUS))
528 ifeq (yes, $(STATIC_STDCPLUS))
529 EXTRA_LIBS += -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
530 else
531 EXTRA_LIBS += -lstdc++
532 endif
514 endif 533 endif
515 534
516 #>>>>> end of choices 535 #>>>>> end of choices
517 ########################################################################### 536 ###########################################################################
518 537
641 $(CC) -c $(CFLAGS) ex_eval.c -o $(OUTDIR)/ex_eval.o 660 $(CC) -c $(CFLAGS) ex_eval.c -o $(OUTDIR)/ex_eval.o
642 661
643 $(OUTDIR)/gui_w32.o: gui_w32.c gui_w48.c $(INCL) 662 $(OUTDIR)/gui_w32.o: gui_w32.c gui_w48.c $(INCL)
644 $(CC) -c $(CFLAGS) gui_w32.c -o $(OUTDIR)/gui_w32.o 663 $(CC) -c $(CFLAGS) gui_w32.c -o $(OUTDIR)/gui_w32.o
645 664
665 $(OUTDIR)/gui_dwrite.o: gui_dwrite.cpp $(INCL) gui_dwrite.h
666 $(CC) -c $(CFLAGS) gui_dwrite.cpp -o $(OUTDIR)/gui_dwrite.o
667
646 $(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) if_cscope.h 668 $(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) if_cscope.h
647 $(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o 669 $(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o
648 670
649 $(OUTDIR)/if_ole.o: if_ole.cpp $(INCL) 671 $(OUTDIR)/if_ole.o: if_ole.cpp $(INCL)
650 $(CC) -c $(CFLAGS) if_ole.cpp -o $(OUTDIR)/if_ole.o 672 $(CC) -c $(CFLAGS) if_ole.cpp -o $(OUTDIR)/if_ole.o