To: vim_dev@googlegroups.com

Subject: Patch 7.4.496

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.4.496

Problem:    Many lines are both in Make_cyg.mak and Make_ming.mak

Solution:   Move the common parts to one file. (Ken Takata)

Files:	    src/INSTALLpc.txt, src/Make_cyg.mak, src/Make_cyg_ming.mak,

	    src/Make_ming.mak, src/Make_mvc.mak, Filelist

*** ../vim-7.4.495/src/INSTALLpc.txt	2014-08-22 18:12:53.995244049 +0200

--- src/INSTALLpc.txt	2014-11-05 13:49:27.076811946 +0100

***************

*** 228,238 ****

      http://www.mingw.org/

  Once you have downloaded the compiler binaries, unpack them on your hard disk

  somewhere, and put them on your PATH.  If you are on Win95/98 you can edit

  your AUTOEXEC.BAT file with a line like:

!     set PATH=C:\GCC-2.95.2\BIN;%PATH%

  or on NT/2000/XP, go to the Control Panel, (Performance and Maintenance),

  System, Advanced, and edit the environment from there.

--- 228,242 ----

      http://www.mingw.org/

+ or you can use 'MinGW-w64' compiler.

+ 

+     http://mingw-w64.sourceforge.net/

+ 

  Once you have downloaded the compiler binaries, unpack them on your hard disk

  somewhere, and put them on your PATH.  If you are on Win95/98 you can edit

  your AUTOEXEC.BAT file with a line like:

!     set PATH=C:\MinGW\bin;%PATH%

  or on NT/2000/XP, go to the Control Panel, (Performance and Maintenance),

  System, Advanced, and edit the environment from there.

***************

*** 240,249 ****

  Test if gcc is on your path.  From a CMD (or COMMAND on '95/98) window:

      C:\> gcc --version

!     2.95.2

!     C:\> make --version

!     GNU Make version 3.77 (...etc...)

  Now you are ready to rock 'n' roll.  Unpack the vim sources (look on

  www.vim.org for exactly which version of the vim files you need).

--- 244,253 ----

  Test if gcc is on your path.  From a CMD (or COMMAND on '95/98) window:

      C:\> gcc --version

!     gcc (GCC) 4.8.1

!     C:\> mingw32-make --version

!     GNU Make 3.82.90 (...etc...)

  Now you are ready to rock 'n' roll.  Unpack the vim sources (look on

  www.vim.org for exactly which version of the vim files you need).

***************

*** 255,261 ****

  and you type:

!     make -f Make_ming.mak gvim.exe

  After churning for a while, you will end up with 'gvim.exe' in the 'vim\src'

  directory.

--- 259,265 ----

  and you type:

!     mingw32-make -f Make_ming.mak gvim.exe

  After churning for a while, you will end up with 'gvim.exe' in the 'vim\src'

  directory.

***************

*** 264,270 ****

  way.  If, for some reason, you want the console-mode-only version of vim (this

  is NOT recommended on Win32, especially on '95/'98!!!), you can use:

!     make -f Make_ming.mak GUI=no vim.exe

  If you are dismayed by how big the EXE is, I strongly recommend you get 'UPX'

  (also free!) and compress the file (typical compression is 50%). UPX can be

--- 268,274 ----

  way.  If, for some reason, you want the console-mode-only version of vim (this

  is NOT recommended on Win32, especially on '95/'98!!!), you can use:

!     mingw32-make -f Make_ming.mak GUI=no vim.exe

  If you are dismayed by how big the EXE is, I strongly recommend you get 'UPX'

  (also free!) and compress the file (typical compression is 50%). UPX can be

***************

*** 291,298 ****

  Use Make_cyg.mak with Cygwin's GCC. See

      http://users.skynet.be/antoine.mechelynck/vim/compile.htm

! The Cygnus one many not fully work yet.

! With Cygnus gcc you can use the Unix Makefile instead (you need to get the

  Unix archive then).  Then you get a Cygwin application (feels like Vim is

  running on Unix), while with Make_cyg.mak you get a Windows application (like

  with the other makefiles).

--- 295,301 ----

  Use Make_cyg.mak with Cygwin's GCC. See

      http://users.skynet.be/antoine.mechelynck/vim/compile.htm

! With Cygnus gcc you should use the Unix Makefile instead (you need to get the

  Unix archive then).  Then you get a Cygwin application (feels like Vim is

  running on Unix), while with Make_cyg.mak you get a Windows application (like

  with the other makefiles).

***************

*** 316,324 ****

  	http://www.mingw.org/wiki/LinuxCrossMinGW

  	http://www.libsdl.org/extras/win32/cross/README.txt

      2) Get and unpack both the Unix sources and the extra archive

!     3) in 'Make_ming.mak', set 'CROSS' to 'yes' instead of 'no'.

!        Make further changes to 'Make_ming.mak' as you wish.

!        If your cross-compiler prefix differs from the predefined value,

         set 'CROSS_COMPILE' corresponding.

      4) make -f Make_ming.mak gvim.exe

--- 319,327 ----

  	http://www.mingw.org/wiki/LinuxCrossMinGW

  	http://www.libsdl.org/extras/win32/cross/README.txt

      2) Get and unpack both the Unix sources and the extra archive

!     3) in 'Make_cyg_ming.mak', set 'CROSS' to 'yes' instead of 'no'.

!        Make further changes to 'Make_cyg_ming.mak' and 'Make_ming.mak' as you

!        wish.  If your cross-compiler prefix differs from the predefined value,

         set 'CROSS_COMPILE' corresponding.

      4) make -f Make_ming.mak gvim.exe

*** ../vim-7.4.495/src/Make_cyg.mak	2014-11-05 13:43:18.352820831 +0100

--- src/Make_cyg.mak	2014-11-05 13:49:27.076811946 +0100

***************

*** 1,754 ****

  #

! # Makefile for VIM on Win32, using Cygnus gcc

! # Updated by Dan Sharp.

! # Last Change: 2014 Aug 10

  #

  # Also read INSTALLpc.txt!

  #

  # This compiles Vim as a Windows application.  If you want Vim to run as a

  # Cygwin application use the Makefile (just like on Unix).

  #

! # GUI		no or yes: set to yes if you want the GUI version (yes)

! # DIRECTX	no or yes: set to yes if you want use DirectWrite (no)

! # PERL		define to path to Perl dir to get Perl support (not defined)

! #   PERL_VER	  define to version of Perl being used (56)

! #   DYNAMIC_PERL  no or yes: set to yes to load the Perl DLL dynamically (yes)

! # PYTHON	define to path to Python dir to get PYTHON support (not defined)

! #   PYTHON_VER	    define to version of Python being used (22)

! #   DYNAMIC_PYTHON  no or yes: use yes to load the Python DLL dynamically (yes)

! # PYTHON3	define to path to Python3 dir to get PYTHON3 support (not defined)

! #   PYTHON3_VER	    define to version of Python3 being used (22)

! #   DYNAMIC_PYTHON3  no or yes: use yes to load the Python3 DLL dynamically (yes)

! # TCL		define to path to TCL dir to get TCL support (not defined)

! #   TCL_VER	define to version of TCL being used (83)

! #   DYNAMIC_TCL no or yes: use yes to load the TCL DLL dynamically (yes)

! # RUBY		define to path to Ruby dir to get Ruby support (not defined)

! #   RUBY_VER		define to version of Ruby being used (16)

! #   RUBY_VER_LONG	same, but in format with dot. (1.6)

! #	    You must set RUBY_VER_LONG when changing RUBY_VER.

! #	    You must set RUBY_API_VER version to RUBY_VER_LONG.

! #	    Don't set ruby API version to RUBY_VER like 191.

! #   DYNAMIC_RUBY no or yes: use yes to load the Ruby DLL dynamically (yes)

! # MZSCHEME	define to path to MzScheme dir to get MZSCHEME support (not defined)

! #   MZSCHEME_VER      define to version of MzScheme being used (209_000)

! #   DYNAMIC_MZSCHEME  no or yes: use yes to load the MzScheme DLLs dynamically (yes)

! #   MZSCHEME_DLLS     path to MzScheme DLLs (libmzgc and libmzsch), for "static" build.

! #   MZSCHEME_USE_RACKET  define to use "racket" instead of "mzsch".

! # LUA	define to path to Lua dir to get Lua support (not defined)

! #   LUA_VER	    define to version of Lua being used (51)

! #   DYNAMIC_LUA  no or yes: use yes to load the Lua DLL dynamically (yes)

! # GETTEXT	no or yes: set to yes for dynamic gettext support (yes)

! # ICONV		no or yes: set to yes for dynamic iconv support (yes)

! # MBYTE		no or yes: set to yes to include multibyte support (yes)

! # IME		no or yes: set to yes to include IME support (yes)

! #   DYNAMIC_IME no or yes: set to yes to load imm32.dll dynamically (yes)

! # OLE		no or yes: set to yes to make OLE gvim (no)

! # DEBUG		no or yes: set to yes if you wish a DEBUGging build (no)

! # CPUNR		No longer supported, use ARCH.

! # ARCH		i386 through pentium4: select -march argument to compile with

! #               (i386)

! # USEDLL	no or yes: set to yes to use the Runtime library DLL (no)

! #		For USEDLL=yes the cygwin1.dll is required to run Vim.

! #		For "no" the mingw-gcc-g++ package or the mingw64-i686-gcc-g++

! #		package is required to compile Vim.  Or set CC to gcc-3 and add

! #		-L/lib/w32api to EXTRA_LIBS.

! # POSTSCRIPT	no or yes: set to yes for PostScript printing (no)

! # FEATURES	TINY, SMALL, NORMAL, BIG or HUGE (BIG)

! # WINVER	Lowest Win32 version to support.  (0x0500)

! # CSCOPE	no or yes: to include cscope interface support (yes)

! # OPTIMIZE	SPACE, SPEED, or MAXSPEED: set optimization level (MAXSPEED)

! # NETBEANS	no or yes: to include netbeans interface support (yes when GUI

! #		is yes)

! # NBDEBUG	no or yes: to include netbeans interface debugging support (no)

! # XPM		define to path to XPM dir to get XPM image support (not defined)

! #>>>>> choose options:

! ifndef GUI

! GUI=yes

! endif

! 

! ifndef FEATURES

! FEATURES = BIG

! endif

! 

! ifndef GETTEXT

! GETTEXT = yes

! endif

! 

! ifndef ICONV

! ICONV = yes

! endif

! 

! ifndef MBYTE

! MBYTE = yes

! endif

! 

! ifndef IME

! IME = yes

! endif

! 

! ifndef ARCH

! ARCH = i386

! endif

! 

! ifndef DIRECTX

! DIRECTX = no

! endif

! 

! ifndef WINVER

! WINVER = 0x0500

! endif

! 

! ifndef CSCOPE

! CSCOPE = yes

! endif

! 

! ifndef NETBEANS

! ifeq ($(GUI),yes)

! NETBEANS = yes

! endif

! endif

! 

! ifndef OPTIMIZE

! OPTIMIZE = MAXSPEED

! endif

! 

! 

! # Link against the shared version of libstdc++ by default.  Set

! # STATIC_STDCPLUS to "yes" to link against static version instead.

! ifndef STATIC_STDCPLUS

! STATIC_STDCPLUS=no

! endif

! 

! ### See feature.h for a list of optionals.

! ### Any other defines can be included here.

! 

! DEFINES = -DWIN32 -DHAVE_PATHDEF -DFEAT_$(FEATURES) \

! 	  -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER)

! ifeq ($(ARCH),x86-64)

! DEFINES+=-DMS_WIN64

! endif

! INCLUDES = -march=$(ARCH) -Iproto

! 

! #>>>>> name of the compiler and linker, name of lib directory

! ifeq (yes, $(USEDLL))

! # CROSS_COMPILE is used for the gvimext DLL.

! CROSS_COMPILE = i686-pc-mingw32-

! CC = gcc

! RC = windres

! else

! # i686-pc-mingw32-gcc, i686-w64-mingw32-gcc or gcc-3 can be used.

  CROSS_COMPILE = i686-pc-mingw32-

! CC = $(CROSS_COMPILE)gcc

! RC = $(CROSS_COMPILE)windres

! endif

! 

! ##############################

! # DYNAMIC_PERL=yes and no both work

! ##############################

! ifdef PERL

! DEFINES += -DFEAT_PERL

! INCLUDES += -I$(PERL)/lib/CORE

! EXTRA_OBJS += $(OUTDIR)/if_perl.o

! 

! ifndef DYNAMIC_PERL

! DYNAMIC_PERL = yes

! endif

! 

! ifndef PERL_VER

! PERL_VER = 56

! endif

! 

! ifeq (yes, $(DYNAMIC_PERL))

! DEFINES += -DDYNAMIC_PERL -DDYNAMIC_PERL_DLL=\"perl$(PERL_VER).dll\"

! else

! EXTRA_LIBS += -L$(PERL)/lib/CORE -lperl$(PERL_VER)

! endif

! endif

! 

! ##############################

! # DYNAMIC_PYTHON=yes works.

! # DYNAMIC_PYTHON=no does not (unresolved externals on link).

! ##############################

! ifdef PYTHON

! DEFINES += -DFEAT_PYTHON

! EXTRA_OBJS += $(OUTDIR)/if_python.o

! 

! ifndef DYNAMIC_PYTHON

! DYNAMIC_PYTHON = yes

! endif

! 

! ifndef PYTHON_VER

! PYTHON_VER = 22

! endif

! 

! ifeq (yes, $(DYNAMIC_PYTHON))

! DEFINES += -DDYNAMIC_PYTHON -DDYNAMIC_PYTHON_DLL=\"python$(PYTHON_VER).dll\"

! else

! EXTRA_LIBS += $(PYTHON)/libs/python$(PYTHON_VER).lib

! endif

! endif

! 

! ##############################

! # DYNAMIC_PYTHON3=yes works.

! # DYNAMIC_PYTHON3=no does not (unresolved externals on link).

! ##############################

! ifdef PYTHON3

! DEFINES += -DFEAT_PYTHON3

! EXTRA_OBJS += $(OUTDIR)/if_python3.o

! 

! ifndef DYNAMIC_PYTHON3

! DYNAMIC_PYTHON3 = yes

! endif

! 

! ifndef PYTHON3_VER

! PYTHON3_VER = 31

! endif

! 

! ifeq (yes, $(DYNAMIC_PYTHON3))

! DEFINES += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"python$(PYTHON3_VER).dll\"

! else

! EXTRA_LIBS += $(PYTHON3)/libs/python$(PYTHON3_VER).lib

! endif

! endif

! 

! ##############################

! # DYNAMIC_RUBY=yes works.

! # DYNAMIC_RUBY=no does not (process exits).

! ##############################

! ifdef RUBY

! 

! ifndef DYNAMIC_RUBY

! DYNAMIC_RUBY=yes

! endif

! #  Set default value

! ifndef RUBY_VER

! RUBY_VER = 16

! endif

! ifndef RUBY_VER_LONG

! RUBY_VER_LONG = 1.6

! endif

! ifndef RUBY_API_VER

! RUBY_API_VER = $(subst .,,$(RUBY_VER_LONG))

! endif

! 

! ifndef RUBY_PLATFORM

! ifeq ($(RUBY_VER), 16)

! RUBY_PLATFORM = i586-mswin32

! else

! ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32),)

! RUBY_PLATFORM = i386-mingw32

! else

! ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/x64-mingw32),)

! RUBY_PLATFORM = x64-mingw32

! else

! RUBY_PLATFORM = i386-mswin32

! endif

! endif

! endif

! endif

! 

! ifndef RUBY_INSTALL_NAME

! ifeq ($(RUBY_VER), 16)

! RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)

! else

! ifeq ($(ARCH),x86-64)

! RUBY_INSTALL_NAME = x64-msvcrt-ruby$(RUBY_API_VER)

! else

! RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER)

! endif

! endif

! endif

! 

! ifeq (19, $(word 1,$(sort 19 $(RUBY_VER))))

! RUBY_19_OR_LATER = 1

! endif

! 

! DEFINES += -DFEAT_RUBY

! ifneq ($(findstring w64-mingw32,$(CC)),)

! # A workaround for mingw-w64

! DEFINES += -DHAVE_STRUCT_TIMESPEC -DHAVE_STRUCT_TIMEZONE

! endif

! INCLUDES += -I$(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM)

! ifdef RUBY_19_OR_LATER

! INCLUDES += -I$(RUBY)/include/ruby-$(RUBY_VER_LONG) -I$(RUBY)/include/ruby-$(RUBY_VER_LONG)/$(RUBY_PLATFORM)

! endif

! EXTRA_OBJS += $(OUTDIR)/if_ruby.o

! 

! ifeq (yes, $(DYNAMIC_RUBY))

! DEFINES += -DDYNAMIC_RUBY -DDYNAMIC_RUBY_DLL=\"$(RUBY_INSTALL_NAME).dll\"

! DEFINES += -DDYNAMIC_RUBY_VER=$(RUBY_VER)

! else

! EXTRA_LIBS += $(RUBY)/lib/$(RUBY_INSTALL_NAME)

! endif

! endif

! 

! ##############################

! # DYNAMIC_MZSCHEME=yes works

! # DYNAMIC_MZSCHEME=no works too

! ##############################

! ifdef MZSCHEME

! DEFINES += -DFEAT_MZSCHEME

! INCLUDES += -I$(MZSCHEME)/include

! EXTRA_OBJS += $(OUTDIR)/if_mzsch.o

! 

! ifndef DYNAMIC_MZSCHEME

! DYNAMIC_MZSCHEME = yes

! endif

! 

! ifndef MZSCHEME_VER

! MZSCHEME_VER = 209_000

! endif

! 

! ifndef MZSCHEME_PRECISE_GC

! MZSCHEME_PRECISE_GC=no

! endif

! 

! # for version 4.x we need to generate byte-code for Scheme base

! ifndef MZSCHEME_GENERATE_BASE

! MZSCHEME_GENERATE_BASE=no

! endif

! 

! ifndef MZSCHEME_USE_RACKET

! MZSCHEME_MAIN_LIB=mzsch

! else

! MZSCHEME_MAIN_LIB=racket

! endif

! 

! ifeq (yes, $(DYNAMIC_MZSCHEME))

! DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"

! else

! ifndef MZSCHEME_DLLS

! MZSCHEME_DLLS = $(MZSCHEME)

! endif

! ifeq (yes,$(MZSCHEME_PRECISE_GC))

! MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER)

! else

! MZSCHEME_LIB = -l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)

! endif

! EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)

! endif

! ifeq (yes,$(MZSCHEME_GENERATE_BASE))

! DEFINES += -DINCLUDE_MZSCHEME_BASE

! MZ_EXTRA_DEP += mzscheme_base.c

! endif

! ifeq (yes,$(MZSCHEME_PRECISE_GC))

! DEFINES += -DMZ_PRECISE_GC

! endif

! endif

! 

! ##############################

! # DYNAMIC_TCL=yes and no both work.

! ##############################

! ifdef TCL

! DEFINES += -DFEAT_TCL

! INCLUDES += -I$(TCL)/include

! EXTRA_OBJS += $(OUTDIR)/if_tcl.o

! 

! ifndef DYNAMIC_TCL

! DYNAMIC_TCL = yes

! endif

! 

! ifndef TCL_VER

! TCL_VER = 83

! endif

! 

! ifeq (yes, $(DYNAMIC_TCL))

! DEFINES += -DDYNAMIC_TCL -DDYNAMIC_TCL_DLL=\"tcl$(TCL_VER).dll\"

! EXTRA_LIBS += $(TCL)/lib/tclstub$(TCL_VER).lib

! else

! EXTRA_LIBS += $(TCL)/lib/tcl$(TCL_VER).lib

! endif

! endif

! 

! ##############################

! # DYNAMIC_LUA=yes works.

! # DYNAMIC_LUA=no does not (unresolved externals on link).

! ##############################

! ifdef LUA

! DEFINES += -DFEAT_LUA

! INCLUDES += -I$(LUA)/include

! EXTRA_OBJS += $(OUTDIR)/if_lua.o

! 

! ifndef DYNAMIC_LUA

! DYNAMIC_LUA = yes

! endif

! 

! ifndef LUA_VER

! LUA_VER = 51

! endif

! 

! ifeq (yes, $(DYNAMIC_LUA))

! DEFINES += -DDYNAMIC_LUA -DDYNAMIC_LUA_DLL=\"lua$(LUA_VER).dll\"

! else

! EXTRA_LIBS += $(LUA)/lib/lua$(LUA_VER).lib

! endif

! endif

! 

! ##############################

! ifeq (yes, $(GETTEXT))

! DEFINES += -DDYNAMIC_GETTEXT

! endif

! 

! ##############################

! ifeq (yes, $(ICONV))

! DEFINES += -DDYNAMIC_ICONV

! endif

! 

! ##############################

! ifeq (yes, $(MBYTE))

! DEFINES += -DFEAT_MBYTE

! endif

! 

! ##############################

! ifeq (yes, $(IME))

! DEFINES += -DFEAT_MBYTE_IME

! 

! ifndef DYNAMIC_IME

! DYNAMIC_IME = yes

! endif

! 

! ifeq (yes, $(DYNAMIC_IME))

! DEFINES += -DDYNAMIC_IME

! else

! EXTRA_LIBS += -limm32

! endif

! endif

! 

! ##############################

! ifeq (yes, $(DEBUG))

! DEFINES += -DDEBUG

! INCLUDES += -g -fstack-check

! DEBUG_SUFFIX = d

! else

! 

! ifeq ($(OPTIMIZE), SIZE)

! OPTFLAG = -Os

! else

! ifeq ($(OPTIMIZE), MAXSPEED)

! OPTFLAG = -O3 -fomit-frame-pointer -freg-struct-return

! else

! OPTFLAG = -O2

! endif

! endif

! 

! # A bug in the GCC <= 3.2 optimizer can cause a crash.  The

! # following option removes the problem optimization.

! OPTFLAG += -fno-strength-reduce

! 

! INCLUDES += -s

! 

! endif

! 

! ##############################

! # USEDLL=yes will build a Cygwin32 executable that relies on cygwin1.dll.

! # USEDLL=no will build a Mingw32 executable with no extra dll dependencies.

! ##############################

! ifeq (yes, $(USEDLL))

! DEFINES += -D_MAX_PATH=256 -D__CYGWIN__

! endif

! 

! ##############################

! ifeq (yes, $(POSTSCRIPT))

! DEFINES += -DMSWINPS

! endif

! 

! ##############################

! ifeq (yes, $(CSCOPE))

! DEFINES += -DFEAT_CSCOPE

! EXTRA_OBJS += $(OUTDIR)/if_cscope.o

! endif

! 

! ##############################

! ifeq ($(GUI),yes)

! 

! ##############################

! ifeq (yes, $(NETBEANS))

! # Only allow NETBEANS for a GUI build.

! DEFINES += -DFEAT_NETBEANS_INTG

! EXTRA_OBJS += $(OUTDIR)/netbeans.o

! EXTRA_LIBS += -lwsock32

! 

! ifeq (yes, $(NBDEBUG))

! DEFINES += -DNBDEBUG

! NBDEBUG_DEP = nbdebug.h nbdebug.c

! endif

! 

! endif

! 

! ##############################

! ifeq (yes, $(DIRECTX))

! # Only allow DIRECTX for a GUI build.

! DEFINES += -DFEAT_DIRECTX -DDYNAMIC_DIRECTX

! EXTRA_OBJS += $(OUTDIR)/gui_dwrite.o

! EXTRA_LIBS += -ld2d1 -ldwrite

! USE_STDCPLUS = yes

! endif

! 

! ##############################

! ifndef XPM

! ifeq ($(ARCH),i386)

! XPM = xpm/x86

! endif

! ifeq ($(ARCH),i486)

! XPM = xpm/x86

! endif

! ifeq ($(ARCH),i586)

! XPM = xpm/x86

! endif

! ifeq ($(ARCH),i686)

! XPM = xpm/x86

! endif

! ifeq ($(ARCH),x86-64)

! XPM = xpm/x64

! endif

! endif

! ifdef XPM

! ifneq ($(XPM),no)

! # Only allow XPM for a GUI build.

! DEFINES += -DFEAT_XPM_W32

! INCLUDES += -I$(XPM)/include -I$(XPM)/../include

! EXTRA_OBJS += $(OUTDIR)/xpm_w32.o

! EXTRA_LIBS += -L$(XPM)/lib -lXpm

! endif

! endif

! 

! ##############################

! EXE = gvim$(DEBUG_SUFFIX).exe

! OUTDIR = gobj$(DEBUG_SUFFIX)

! DEFINES += -DFEAT_GUI_W32 -DFEAT_CLIPBOARD

! EXTRA_OBJS += $(OUTDIR)/gui.o $(OUTDIR)/gui_w32.o $(OUTDIR)/gui_beval.o $(OUTDIR)/os_w32exe.o

! EXTRA_LIBS += -mwindows -lcomctl32 -lversion

! else

! EXE = vim$(DEBUG_SUFFIX).exe

! OUTDIR = obj$(DEBUG_SUFFIX)

! LIBS += -luser32 -lgdi32 -lcomdlg32

! endif

! 

! ##############################

! ifeq (yes, $(OLE))

! DEFINES += -DFEAT_OLE

! EXTRA_OBJS += $(OUTDIR)/if_ole.o

! EXTRA_LIBS += -loleaut32

! USE_STDCPLUS = yes

! endif

! 

! ##############################

! ifneq (sh.exe, $(SHELL))

! DEL = rm

! MKDIR = mkdir -p

! DIRSLASH = /

! else

! DEL = del

! MKDIR = mkdir

! DIRSLASH = \\

! endif

! 

! ##############################

! ifeq (yes, $(USE_STDCPLUS))

! ifeq (yes, $(STATIC_STDCPLUS))

! EXTRA_LIBS += -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic

! else

! EXTRA_LIBS += -lstdc++

! endif

! endif

! 

! #>>>>> end of choices

! ###########################################################################

! 

! INCL = vim.h globals.h option.h keymap.h macros.h ascii.h term.h os_win32.h \

!        structs.h version.h

! 

! CFLAGS = $(OPTFLAG) $(DEFINES) $(INCLUDES)

! 

! RCFLAGS = -O coff $(DEFINES)

! 

! OBJ = \

! 	$(OUTDIR)/blowfish.o \

! 	$(OUTDIR)/buffer.o \

! 	$(OUTDIR)/charset.o \

! 	$(OUTDIR)/crypt.o \

! 	$(OUTDIR)/crypt_zip.o \

! 	$(OUTDIR)/diff.o \

! 	$(OUTDIR)/digraph.o \