aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1322: Cygwin makefile is not nicely indented

Browse Source 
Problem:    Cygwin makefile is not nicely indented.
Solution:   Addjust spaces in preprocessor directives. (Ken Takata)
This commit is contained in:
Bram Moolenaar 2019-05-11 21:24:26 +02:00
parent a334772967
commit 6e75e0a400
2 changed files with 217 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

440
src/Make_cyg_ming.mak
View File

@ -163,17 +163,17 @@ INTLLIB=gnu_gettext
# Command definitions (depends on cross-compiling and shell) # Command definitions (depends on cross-compiling and shell)
ifeq ($(CROSS),yes) ifeq ($(CROSS),yes)
# cross-compiler prefix: # cross-compiler prefix:
ifndef CROSS_COMPILE ifndef CROSS_COMPILE
CROSS_COMPILE = i586-pc-mingw32msvc- CROSS_COMPILE = i586-pc-mingw32msvc-
endif endif
DEL = rm DEL = rm
MKDIR = mkdir -p MKDIR = mkdir -p
DIRSLASH = / DIRSLASH = /
else else
# normal (Windows) compilation: # normal (Windows) compilation:
ifndef CROSS_COMPILE ifndef CROSS_COMPILE
CROSS_COMPILE = CROSS_COMPILE =
endif endif
# About the "sh.exe" condition, as explained by Ken Takata: # About the "sh.exe" condition, as explained by Ken Takata:
# #
@ -193,15 +193,15 @@ endif
# $SHELL is set with the unix-style path (e.g. "/bin/bash"). # $SHELL is set with the unix-style path (e.g. "/bin/bash").
# In this case, unix-like commands can be used. # In this case, unix-like commands can be used.
# #
ifneq (sh.exe, $(SHELL)) ifneq (sh.exe, $(SHELL))
DEL = rm DEL = rm
MKDIR = mkdir -p MKDIR = mkdir -p
DIRSLASH = / DIRSLASH = /
else else
DEL = del DEL = del
MKDIR = mkdir MKDIR = mkdir
DIRSLASH = \\ DIRSLASH = \\
endif endif
endif endif
CC := $(CROSS_COMPILE)gcc CC := $(CROSS_COMPILE)gcc
CXX := $(CROSS_COMPILE)g++ CXX := $(CROSS_COMPILE)g++
@ -223,31 +223,31 @@ endif
# DYNAMIC_PERL=yes (to load the Perl DLL dynamically) # DYNAMIC_PERL=yes (to load the Perl DLL dynamically)
# PERL_VER=[Perl version, eg 56, 58, 510] (default is 524) # PERL_VER=[Perl version, eg 56, 58, 510] (default is 524)
ifdef PERL ifdef PERL
ifndef PERL_VER ifndef PERL_VER
PERL_VER=524 PERL_VER=524
endif endif
ifndef DYNAMIC_PERL ifndef DYNAMIC_PERL
DYNAMIC_PERL=yes DYNAMIC_PERL=yes
endif endif
# on Linux, for cross-compile, it's here: # on Linux, for cross-compile, it's here:
#PERLLIB=/home/ron/ActivePerl/lib #PERLLIB=/home/ron/ActivePerl/lib
# on NT, it's here: # on NT, it's here:
PERLEXE=$(PERL)/bin/perl PERLEXE=$(PERL)/bin/perl
PERLLIB=$(PERL)/lib PERLLIB=$(PERL)/lib
PERLLIBS=$(PERLLIB)/Core PERLLIBS=$(PERLLIB)/Core
ifeq ($(UNDER_CYGWIN),yes) ifeq ($(UNDER_CYGWIN),yes)
PERLTYPEMAP:=$(shell cygpath -m $(PERLLIB)/ExtUtils/typemap) PERLTYPEMAP:=$(shell cygpath -m $(PERLLIB)/ExtUtils/typemap)
XSUBPPTRY:=$(shell cygpath -m $(PERLLIB)/ExtUtils/xsubpp) XSUBPPTRY:=$(shell cygpath -m $(PERLLIB)/ExtUtils/xsubpp)
else else
PERLTYPEMAP=$(PERLLIB)/ExtUtils/typemap PERLTYPEMAP=$(PERLLIB)/ExtUtils/typemap
XSUBPPTRY=$(PERLLIB)/ExtUtils/xsubpp XSUBPPTRY=$(PERLLIB)/ExtUtils/xsubpp
endif endif
XSUBPP_EXISTS=$(shell $(PERLEXE) -e "print 1 unless -e '$(XSUBPPTRY)'") XSUBPP_EXISTS=$(shell $(PERLEXE) -e "print 1 unless -e '$(XSUBPPTRY)'")
ifeq "$(XSUBPP_EXISTS)" "" ifeq "$(XSUBPP_EXISTS)" ""
XSUBPP=$(PERLEXE) $(XSUBPPTRY) XSUBPP=$(PERLEXE) $(XSUBPPTRY)
else else
XSUBPP=xsubpp XSUBPP=xsubpp
endif endif
endif endif
# Lua interface: # Lua interface:
@ -257,18 +257,18 @@ endif
# DYNAMIC_LUA=yes (to load the Lua DLL dynamically) # DYNAMIC_LUA=yes (to load the Lua DLL dynamically)
# LUA_VER=[Lua version, eg 51, 52] (default is 53) # LUA_VER=[Lua version, eg 51, 52] (default is 53)
ifdef LUA ifdef LUA
ifndef DYNAMIC_LUA ifndef DYNAMIC_LUA
DYNAMIC_LUA=yes DYNAMIC_LUA=yes
endif endif
ifndef LUA_VER ifndef LUA_VER
LUA_VER=53 LUA_VER=53
endif endif
ifeq (no,$(DYNAMIC_LUA)) ifeq (no,$(DYNAMIC_LUA))
LUA_LIBDIR = $(LUA)/lib LUA_LIBDIR = $(LUA)/lib
LUA_LIB = -L$(LUA_LIBDIR) -llua LUA_LIB = -L$(LUA_LIBDIR) -llua
endif endif
endif endif
@ -280,53 +280,53 @@ endif
# C:\Program Files (x86)\Racket\lib\libracket3m_XXXXXX.dll # C:\Program Files (x86)\Racket\lib\libracket3m_XXXXXX.dll
# MZSCHEME_DEBUG=no # MZSCHEME_DEBUG=no
ifdef MZSCHEME ifdef MZSCHEME
ifndef DYNAMIC_MZSCHEME ifndef DYNAMIC_MZSCHEME
DYNAMIC_MZSCHEME=yes DYNAMIC_MZSCHEME=yes
endif endif
ifndef MZSCHEME_VER ifndef MZSCHEME_VER
MZSCHEME_VER=3m_a0solc MZSCHEME_VER=3m_a0solc
endif endif
# for version 4.x we need to generate byte-code for Scheme base # for version 4.x we need to generate byte-code for Scheme base
ifndef MZSCHEME_GENERATE_BASE ifndef MZSCHEME_GENERATE_BASE
MZSCHEME_GENERATE_BASE=no MZSCHEME_GENERATE_BASE=no
endif endif
ifneq ($(wildcard $(MZSCHEME)/lib/msvc/libmzsch$(MZSCHEME_VER).lib),) ifneq ($(wildcard $(MZSCHEME)/lib/msvc/libmzsch$(MZSCHEME_VER).lib),)
MZSCHEME_MAIN_LIB=mzsch MZSCHEME_MAIN_LIB=mzsch
else else
MZSCHEME_MAIN_LIB=racket MZSCHEME_MAIN_LIB=racket
endif endif
ifndef MZSCHEME_PRECISE_GC ifndef MZSCHEME_PRECISE_GC
MZSCHEME_PRECISE_GC=no MZSCHEME_PRECISE_GC=no
ifneq ($(wildcard $(MZSCHEME)\lib\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll),) ifneq ($(wildcard $(MZSCHEME)\lib\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll),)
ifeq ($(wildcard $(MZSCHEME)\lib\libmzgc$(MZSCHEME_VER).dll),) ifeq ($(wildcard $(MZSCHEME)\lib\libmzgc$(MZSCHEME_VER).dll),)
MZSCHEME_PRECISE_GC=yes MZSCHEME_PRECISE_GC=yes
endif endif
else else
ifneq ($(wildcard $(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib),) ifneq ($(wildcard $(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib),)
ifeq ($(wildcard $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib),) ifeq ($(wildcard $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib),)
MZSCHEME_PRECISE_GC=yes MZSCHEME_PRECISE_GC=yes
endif endif
endif endif
endif endif
endif endif
ifeq (no,$(DYNAMIC_MZSCHEME)) ifeq (no,$(DYNAMIC_MZSCHEME))
ifeq (yes,$(MZSCHEME_PRECISE_GC)) ifeq (yes,$(MZSCHEME_PRECISE_GC))
MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER) MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER)
else else
MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER) MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
endif endif
# the modern MinGW can dynamically link to dlls directly. # the modern MinGW can dynamically link to dlls directly.
# point MZSCHEME_DLLS to where you put libmzschXXXXXXX.dll and libgcXXXXXXX.dll # point MZSCHEME_DLLS to where you put libmzschXXXXXXX.dll and libgcXXXXXXX.dll
ifndef MZSCHEME_DLLS ifndef MZSCHEME_DLLS
MZSCHEME_DLLS=$(MZSCHEME) MZSCHEME_DLLS=$(MZSCHEME)
endif endif
MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)\lib MZSCHEME_LIBDIR=-L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)\lib
endif endif
endif endif
@ -335,32 +335,32 @@ endif
# DYNAMIC_PYTHON=yes (to load the Python DLL dynamically) # DYNAMIC_PYTHON=yes (to load the Python DLL dynamically)
# PYTHON_VER=[Python version, eg 22, 23, ..., 27] (default is 27) # PYTHON_VER=[Python version, eg 22, 23, ..., 27] (default is 27)
ifdef PYTHON ifdef PYTHON
ifndef DYNAMIC_PYTHON ifndef DYNAMIC_PYTHON
DYNAMIC_PYTHON=yes DYNAMIC_PYTHON=yes
endif endif
ifndef PYTHON_VER ifndef PYTHON_VER
PYTHON_VER=27 PYTHON_VER=27
endif endif
ifndef DYNAMIC_PYTHON_DLL ifndef DYNAMIC_PYTHON_DLL
DYNAMIC_PYTHON_DLL=python$(PYTHON_VER).dll DYNAMIC_PYTHON_DLL=python$(PYTHON_VER).dll
endif endif
ifdef PYTHON_HOME ifdef PYTHON_HOME
PYTHON_HOME_DEF=-DPYTHON_HOME=\"$(PYTHON_HOME)\" PYTHON_HOME_DEF=-DPYTHON_HOME=\"$(PYTHON_HOME)\"
endif endif
ifeq (no,$(DYNAMIC_PYTHON)) ifeq (no,$(DYNAMIC_PYTHON))
PYTHONLIB=-L$(PYTHON)/libs -lpython$(PYTHON_VER) PYTHONLIB=-L$(PYTHON)/libs -lpython$(PYTHON_VER)
endif endif
# my include files are in 'win32inc' on Linux, and 'include' in the standard # my include files are in 'win32inc' on Linux, and 'include' in the standard
# NT distro (ActiveState) # NT distro (ActiveState)
ifndef PYTHONINC ifndef PYTHONINC
ifeq ($(CROSS),no) ifeq ($(CROSS),no)
PYTHONINC=-I $(PYTHON)/include PYTHONINC=-I $(PYTHON)/include
else else
PYTHONINC=-I $(PYTHON)/win32inc PYTHONINC=-I $(PYTHON)/win32inc
endif endif
endif endif
endif endif
# Python3 interface: # Python3 interface:
@ -368,31 +368,31 @@ endif
# DYNAMIC_PYTHON3=yes (to load the Python3 DLL dynamically) # DYNAMIC_PYTHON3=yes (to load the Python3 DLL dynamically)
# PYTHON3_VER=[Python3 version, eg 31, 32] (default is 36) # PYTHON3_VER=[Python3 version, eg 31, 32] (default is 36)
ifdef PYTHON3 ifdef PYTHON3
ifndef DYNAMIC_PYTHON3 ifndef DYNAMIC_PYTHON3
DYNAMIC_PYTHON3=yes DYNAMIC_PYTHON3=yes
endif endif
ifndef PYTHON3_VER ifndef PYTHON3_VER
PYTHON3_VER=36 PYTHON3_VER=36
endif endif
ifndef DYNAMIC_PYTHON3_DLL ifndef DYNAMIC_PYTHON3_DLL
DYNAMIC_PYTHON3_DLL=python$(PYTHON3_VER).dll DYNAMIC_PYTHON3_DLL=python$(PYTHON3_VER).dll
endif endif
ifdef PYTHON3_HOME ifdef PYTHON3_HOME
PYTHON3_HOME_DEF=-DPYTHON3_HOME=L\"$(PYTHON3_HOME)\" PYTHON3_HOME_DEF=-DPYTHON3_HOME=L\"$(PYTHON3_HOME)\"
endif endif
ifeq (no,$(DYNAMIC_PYTHON3)) ifeq (no,$(DYNAMIC_PYTHON3))
PYTHON3LIB=-L$(PYTHON3)/libs -lpython$(PYTHON3_VER) PYTHON3LIB=-L$(PYTHON3)/libs -lpython$(PYTHON3_VER)
endif endif
ifndef PYTHON3INC ifndef PYTHON3INC
ifeq ($(CROSS),no) ifeq ($(CROSS),no)
PYTHON3INC=-I $(PYTHON3)/include PYTHON3INC=-I $(PYTHON3)/include
else else
PYTHON3INC=-I $(PYTHON3)/win32inc PYTHON3INC=-I $(PYTHON3)/win32inc
endif endif
endif endif
endif endif
# TCL interface: # TCL interface:
@ -403,18 +403,18 @@ endif
# You must set TCL_VER_LONG when you set TCL_VER. # You must set TCL_VER_LONG when you set TCL_VER.
# TCL_DLL=[TCL dll name, eg tcl86.dll] (default is tcl86.dll) # TCL_DLL=[TCL dll name, eg tcl86.dll] (default is tcl86.dll)
ifdef TCL ifdef TCL
ifndef DYNAMIC_TCL ifndef DYNAMIC_TCL
DYNAMIC_TCL=yes DYNAMIC_TCL=yes
endif endif
ifndef TCL_VER ifndef TCL_VER
TCL_VER = 86 TCL_VER = 86
endif endif
ifndef TCL_VER_LONG ifndef TCL_VER_LONG
TCL_VER_LONG = 8.6 TCL_VER_LONG = 8.6
endif endif
ifndef TCL_DLL ifndef TCL_DLL
TCL_DLL = tcl$(TCL_VER).dll TCL_DLL = tcl$(TCL_VER).dll
endif endif
TCLINC += -I$(TCL)/include TCLINC += -I$(TCL)/include
endif endif
@ -430,67 +430,63 @@ endif
# RUBY_VER=19 # RUBY_VER=19
# RUBY_API_VER_LONG=1.9.1 (not 1.9.3, because the API version is 1.9.1.) # RUBY_API_VER_LONG=1.9.1 (not 1.9.3, because the API version is 1.9.1.)
ifdef RUBY ifdef RUBY
ifndef DYNAMIC_RUBY ifndef DYNAMIC_RUBY
DYNAMIC_RUBY=yes DYNAMIC_RUBY=yes
endif endif
# Set default value # Set default value
ifndef RUBY_VER ifndef RUBY_VER
RUBY_VER = 22 RUBY_VER = 22
endif endif
ifndef RUBY_VER_LONG ifndef RUBY_VER_LONG
RUBY_VER_LONG = 2.2.0 RUBY_VER_LONG = 2.2.0
endif endif
ifndef RUBY_API_VER_LONG ifndef RUBY_API_VER_LONG
RUBY_API_VER_LONG = $(RUBY_VER_LONG) RUBY_API_VER_LONG = $(RUBY_VER_LONG)
endif endif
ifndef RUBY_API_VER ifndef RUBY_API_VER
RUBY_API_VER = $(subst .,,$(RUBY_API_VER_LONG)) RUBY_API_VER = $(subst .,,$(RUBY_API_VER_LONG))
endif endif
ifndef RUBY_PLATFORM ifndef RUBY_PLATFORM
ifeq ($(RUBY_VER), 16) ifeq ($(RUBY_VER), 16)
RUBY_PLATFORM = i586-mswin32 RUBY_PLATFORM = i586-mswin32
else else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/i386-mingw32),)
ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/i386-mingw32),)
RUBY_PLATFORM = i386-mingw32 RUBY_PLATFORM = i386-mingw32
else else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw32),)
ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/x64-mingw32),)
RUBY_PLATFORM = x64-mingw32 RUBY_PLATFORM = x64-mingw32
else else
RUBY_PLATFORM = i386-mswin32 RUBY_PLATFORM = i386-mswin32
endif endif
endif endif
endif
endif
ifndef RUBY_INSTALL_NAME ifndef RUBY_INSTALL_NAME
ifeq ($(RUBY_VER), 16) ifeq ($(RUBY_VER), 16)
RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER) RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
else else
ifndef RUBY_MSVCRT_NAME ifndef RUBY_MSVCRT_NAME
# Base name of msvcrXX.dll which is used by ruby's dll. # Base name of msvcrXX.dll which is used by ruby's dll.
RUBY_MSVCRT_NAME = msvcrt RUBY_MSVCRT_NAME = msvcrt
endif endif
ifeq ($(ARCH),x86-64) ifeq ($(ARCH),x86-64)
RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER) RUBY_INSTALL_NAME = x64-$(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
else else
RUBY_INSTALL_NAME = $(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER) RUBY_INSTALL_NAME = $(RUBY_MSVCRT_NAME)-ruby$(RUBY_API_VER)
endif endif
endif endif
endif endif
ifeq (19, $(word 1,$(sort 19 $(RUBY_VER)))) ifeq (19, $(word 1,$(sort 19 $(RUBY_VER))))
RUBY_19_OR_LATER = 1 RUBY_19_OR_LATER = 1
endif endif
ifdef RUBY_19_OR_LATER ifdef RUBY_19_OR_LATER
RUBYINC = -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM) RUBYINC = -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM)
else else
RUBYINC = -I $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM) RUBYINC = -I $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM)
endif endif
ifeq (no, $(DYNAMIC_RUBY)) ifeq (no, $(DYNAMIC_RUBY))
RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME) RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
endif endif
endif # RUBY endif # RUBY
@ -515,89 +511,87 @@ ifdef GETTEXT
DEFINES += -DHAVE_GETTEXT -DHAVE_LOCALE_H DEFINES += -DHAVE_GETTEXT -DHAVE_LOCALE_H
GETTEXTINCLUDE = $(GETTEXT)/include GETTEXTINCLUDE = $(GETTEXT)/include
GETTEXTLIB = $(INTLPATH) GETTEXTLIB = $(INTLPATH)
ifeq (yes, $(GETTEXT)) ifeq (yes, $(GETTEXT))
DEFINES += -DDYNAMIC_GETTEXT DEFINES += -DDYNAMIC_GETTEXT
else else ifdef DYNAMIC_GETTEXT
ifdef DYNAMIC_GETTEXT
DEFINES += -D$(DYNAMIC_GETTEXT) DEFINES += -D$(DYNAMIC_GETTEXT)
ifdef GETTEXT_DYNAMIC ifdef GETTEXT_DYNAMIC
DEFINES += -DGETTEXT_DYNAMIC -DGETTEXT_DLL=\"$(GETTEXT_DYNAMIC)\" DEFINES += -DGETTEXT_DYNAMIC -DGETTEXT_DLL=\"$(GETTEXT_DYNAMIC)\"
endif endif
endif endif
endif
endif endif
ifdef PERL ifdef PERL
CFLAGS += -I$(PERLLIBS) -DFEAT_PERL -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS CFLAGS += -I$(PERLLIBS) -DFEAT_PERL -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS
ifeq (yes, $(DYNAMIC_PERL)) ifeq (yes, $(DYNAMIC_PERL))
CFLAGS += -DDYNAMIC_PERL -DDYNAMIC_PERL_DLL=\"perl$(PERL_VER).dll\" CFLAGS += -DDYNAMIC_PERL -DDYNAMIC_PERL_DLL=\"perl$(PERL_VER).dll\"
EXTRA_LIBS += -L$(PERLLIBS) -lperl$(PERL_VER) EXTRA_LIBS += -L$(PERLLIBS) -lperl$(PERL_VER)
endif endif
endif endif
ifdef LUA ifdef LUA
LUA_INCDIR = $(LUA)/include LUA_INCDIR = $(LUA)/include
CFLAGS += -I$(LUA_INCDIR) -I$(LUA) -DFEAT_LUA CFLAGS += -I$(LUA_INCDIR) -I$(LUA) -DFEAT_LUA
ifeq (yes, $(DYNAMIC_LUA)) ifeq (yes, $(DYNAMIC_LUA))
CFLAGS += -DDYNAMIC_LUA -DDYNAMIC_LUA_DLL=\"lua$(LUA_VER).dll\" CFLAGS += -DDYNAMIC_LUA -DDYNAMIC_LUA_DLL=\"lua$(LUA_VER).dll\"
endif endif
endif endif
ifdef MZSCHEME ifdef MZSCHEME
ifndef MZSCHEME_COLLECTS ifndef MZSCHEME_COLLECTS
MZSCHEME_COLLECTS=$(MZSCHEME)/collects MZSCHEME_COLLECTS=$(MZSCHEME)/collects
ifeq (yes, $(UNDER_CYGWIN)) ifeq (yes, $(UNDER_CYGWIN))
MZSCHEME_COLLECTS:=$(shell cygpath -m $(MZSCHEME_COLLECTS) | sed -e 's/ /\\ /g') MZSCHEME_COLLECTS:=$(shell cygpath -m $(MZSCHEME_COLLECTS) | sed -e 's/ /\\ /g')
endif endif
endif endif
CFLAGS += -I$(MZSCHEME)/include -DFEAT_MZSCHEME -DMZSCHEME_COLLECTS=\"$(MZSCHEME_COLLECTS)\" CFLAGS += -I$(MZSCHEME)/include -DFEAT_MZSCHEME -DMZSCHEME_COLLECTS=\"$(MZSCHEME_COLLECTS)\"
ifeq (yes, $(DYNAMIC_MZSCHEME)) ifeq (yes, $(DYNAMIC_MZSCHEME))
ifeq (yes, $(MZSCHEME_PRECISE_GC)) ifeq (yes, $(MZSCHEME_PRECISE_GC))
# Precise GC does not use separate dll # Precise GC does not use separate dll
CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\"
else else
CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\" CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
endif endif
endif endif
ifeq (yes, "$(MZSCHEME_DEBUG)") ifeq (yes, "$(MZSCHEME_DEBUG)")
CFLAGS += -DMZSCHEME_FORCE_GC CFLAGS += -DMZSCHEME_FORCE_GC
endif endif
endif endif
ifdef RUBY ifdef RUBY
CFLAGS += -DFEAT_RUBY $(RUBYINC) CFLAGS += -DFEAT_RUBY $(RUBYINC)
ifeq (yes, $(DYNAMIC_RUBY)) ifeq (yes, $(DYNAMIC_RUBY))
CFLAGS += -DDYNAMIC_RUBY -DDYNAMIC_RUBY_DLL=\"$(RUBY_INSTALL_NAME).dll\" CFLAGS += -DDYNAMIC_RUBY -DDYNAMIC_RUBY_DLL=\"$(RUBY_INSTALL_NAME).dll\"
CFLAGS += -DDYNAMIC_RUBY_VER=$(RUBY_VER) CFLAGS += -DDYNAMIC_RUBY_VER=$(RUBY_VER)
endif endif
ifeq (no, $(DYNAMIC_RUBY)) ifeq (no, $(DYNAMIC_RUBY))
CFLAGS += -DRUBY_VERSION=$(RUBY_VER) CFLAGS += -DRUBY_VERSION=$(RUBY_VER)
endif endif
ifneq ($(findstring w64-mingw32,$(CC)),) ifneq ($(findstring w64-mingw32,$(CC)),)
# A workaround for MinGW-w64 # A workaround for MinGW-w64
CFLAGS += -DHAVE_STRUCT_TIMESPEC -DHAVE_STRUCT_TIMEZONE CFLAGS += -DHAVE_STRUCT_TIMESPEC -DHAVE_STRUCT_TIMEZONE
endif endif
endif endif
ifdef PYTHON ifdef PYTHON
CFLAGS += -DFEAT_PYTHON CFLAGS += -DFEAT_PYTHON
ifeq (yes, $(DYNAMIC_PYTHON)) ifeq (yes, $(DYNAMIC_PYTHON))
CFLAGS += -DDYNAMIC_PYTHON -DDYNAMIC_PYTHON_DLL=\"$(DYNAMIC_PYTHON_DLL)\" CFLAGS += -DDYNAMIC_PYTHON -DDYNAMIC_PYTHON_DLL=\"$(DYNAMIC_PYTHON_DLL)\"
endif endif
endif endif
ifdef PYTHON3 ifdef PYTHON3
CFLAGS += -DFEAT_PYTHON3 CFLAGS += -DFEAT_PYTHON3
ifeq (yes, $(DYNAMIC_PYTHON3)) ifeq (yes, $(DYNAMIC_PYTHON3))
CFLAGS += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"$(DYNAMIC_PYTHON3_DLL)\" CFLAGS += -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"$(DYNAMIC_PYTHON3_DLL)\"
endif endif
endif endif
ifdef TCL ifdef TCL
CFLAGS += -DFEAT_TCL $(TCLINC) CFLAGS += -DFEAT_TCL $(TCLINC)
ifeq (yes, $(DYNAMIC_TCL)) ifeq (yes, $(DYNAMIC_TCL))
CFLAGS += -DDYNAMIC_TCL -DDYNAMIC_TCL_DLL=\"$(TCL_DLL)\" -DDYNAMIC_TCL_VER=\"$(TCL_VER_LONG)\" CFLAGS += -DDYNAMIC_TCL -DDYNAMIC_TCL_DLL=\"$(TCL_DLL)\" -DDYNAMIC_TCL_VER=\"$(TCL_VER_LONG)\"
endif endif
endif endif
ifeq ($(POSTSCRIPT),yes) ifeq ($(POSTSCRIPT),yes)
@ -614,15 +608,15 @@ endif
ifeq ($(NETBEANS),yes) ifeq ($(NETBEANS),yes)
# Only allow NETBEANS for a GUI build. # Only allow NETBEANS for a GUI build.
ifeq (yes, $(GUI)) ifeq (yes, $(GUI))
DEFINES += -DFEAT_NETBEANS_INTG DEFINES += -DFEAT_NETBEANS_INTG
ifeq ($(NBDEBUG), yes) ifeq ($(NBDEBUG), yes)
DEFINES += -DNBDEBUG DEFINES += -DNBDEBUG
NBDEBUG_INCL = nbdebug.h NBDEBUG_INCL = nbdebug.h
NBDEBUG_SRC = nbdebug.c NBDEBUG_SRC = nbdebug.c
endif endif
endif endif
endif endif
ifeq ($(CHANNEL),yes) ifeq ($(CHANNEL),yes)
@ -642,39 +636,39 @@ endif
# DirectWrite (DirectX) # DirectWrite (DirectX)
ifeq ($(DIRECTX),yes) ifeq ($(DIRECTX),yes)
# Only allow DirectWrite for a GUI build. # Only allow DirectWrite for a GUI build.
ifeq (yes, $(GUI)) ifeq (yes, $(GUI))
DEFINES += -DFEAT_DIRECTX -DDYNAMIC_DIRECTX DEFINES += -DFEAT_DIRECTX -DDYNAMIC_DIRECTX
ifneq ($(COLOR_EMOJI),no) ifneq ($(COLOR_EMOJI),no)
DEFINES += -DFEAT_DIRECTX_COLOR_EMOJI DEFINES += -DFEAT_DIRECTX_COLOR_EMOJI
endif endif
endif endif
endif endif
# Only allow XPM for a GUI build. # Only allow XPM for a GUI build.
ifeq (yes, $(GUI)) ifeq (yes, $(GUI))
ifndef XPM ifndef XPM
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)
XPM = xpm/x86 XPM = xpm/x86
endif endif
ifeq ($(ARCH),i486) ifeq ($(ARCH),i486)
XPM = xpm/x86 XPM = xpm/x86
endif endif
ifeq ($(ARCH),i586) ifeq ($(ARCH),i586)
XPM = xpm/x86 XPM = xpm/x86
endif endif
ifeq ($(ARCH),i686) ifeq ($(ARCH),i686)
XPM = xpm/x86 XPM = xpm/x86
endif endif
ifeq ($(ARCH),x86-64) ifeq ($(ARCH),x86-64)
XPM = xpm/x64 XPM = xpm/x64
endif endif
endif endif
ifdef XPM ifdef XPM
ifneq ($(XPM),no) ifneq ($(XPM),no)
CFLAGS += -DFEAT_XPM_W32 -I $(XPM)/include -I $(XPM)/../include CFLAGS += -DFEAT_XPM_W32 -I $(XPM)/include -I $(XPM)/../include
endif endif
endif endif
endif endif
@ -682,16 +676,14 @@ ifeq ($(DEBUG),yes)
CFLAGS += -g -fstack-check CFLAGS += -g -fstack-check
DEBUG_SUFFIX=d DEBUG_SUFFIX=d
else else
ifeq ($(OPTIMIZE), SIZE) ifeq ($(OPTIMIZE), SIZE)
CFLAGS += -Os CFLAGS += -Os
else else ifeq ($(OPTIMIZE), MAXSPEED)
ifeq ($(OPTIMIZE), MAXSPEED)
CFLAGS += -O3 CFLAGS += -O3
CFLAGS += -fomit-frame-pointer -freg-struct-return CFLAGS += -fomit-frame-pointer -freg-struct-return
else # SPEED else # SPEED
CFLAGS += -O2 CFLAGS += -O2
endif endif
endif
LFLAGS += -s LFLAGS += -s
endif endif
@ -785,13 +777,13 @@ endif
ifdef MZSCHEME ifdef MZSCHEME
OBJ += $(OUTDIR)/if_mzsch.o OBJ += $(OUTDIR)/if_mzsch.o
MZSCHEME_INCL = if_mzsch.h MZSCHEME_INCL = if_mzsch.h
ifeq (yes,$(MZSCHEME_GENERATE_BASE)) ifeq (yes,$(MZSCHEME_GENERATE_BASE))
CFLAGS += -DINCLUDE_MZSCHEME_BASE CFLAGS += -DINCLUDE_MZSCHEME_BASE
MZ_EXTRA_DEP += mzscheme_base.c MZ_EXTRA_DEP += mzscheme_base.c
endif endif
ifeq (yes,$(MZSCHEME_PRECISE_GC)) ifeq (yes,$(MZSCHEME_PRECISE_GC))
CFLAGS += -DMZ_PRECISE_GC CFLAGS += -DMZ_PRECISE_GC
endif endif
endif endif
ifdef PYTHON ifdef PYTHON
OBJ += $(OUTDIR)/if_python.o OBJ += $(OUTDIR)/if_python.o
@ -810,17 +802,15 @@ OBJ += $(OUTDIR)/if_cscope.o
endif endif
ifeq ($(NETBEANS),yes) ifeq ($(NETBEANS),yes)
ifneq ($(CHANNEL),yes) ifneq ($(CHANNEL),yes)
# Cannot use Netbeans without CHANNEL # Cannot use Netbeans without CHANNEL
NETBEANS=no NETBEANS=no
else else ifneq (yes, $(GUI))
ifneq (yes, $(GUI))
# Cannot use Netbeans without GUI. # Cannot use Netbeans without GUI.
NETBEANS=no NETBEANS=no
else else
OBJ += $(OUTDIR)/netbeans.o OBJ += $(OUTDIR)/netbeans.o
endif endif
endif
endif endif
ifeq ($(CHANNEL),yes) ifeq ($(CHANNEL),yes)
@ -830,19 +820,19 @@ endif
ifeq ($(DIRECTX),yes) ifeq ($(DIRECTX),yes)
# Only allow DIRECTX for a GUI build. # Only allow DIRECTX for a GUI build.
ifeq (yes, $(GUI)) ifeq (yes, $(GUI))
OBJ += $(OUTDIR)/gui_dwrite.o OBJ += $(OUTDIR)/gui_dwrite.o
LIB += -ld2d1 -ldwrite LIB += -ld2d1 -ldwrite
USE_STDCPLUS = yes USE_STDCPLUS = yes
endif endif
endif endif
ifneq ($(XPM),no) ifneq ($(XPM),no)
# Only allow XPM for a GUI build. # Only allow XPM for a GUI build.
ifeq (yes, $(GUI)) ifeq (yes, $(GUI))
OBJ += $(OUTDIR)/xpm_w32.o OBJ += $(OUTDIR)/xpm_w32.o
# You'll need libXpm.a from http://gnuwin32.sf.net # You'll need libXpm.a from http://gnuwin32.sf.net
LIB += -L$(XPM)/lib -lXpm LIB += -L$(XPM)/lib -lXpm
endif endif
endif endif
ifeq ($(TERMINAL),yes) ifeq ($(TERMINAL),yes)
@ -915,32 +905,32 @@ MAIN_TARGET = $(TARGET)
endif endif
ifdef GETTEXT ifdef GETTEXT
ifneq (yes, $(GETTEXT)) ifneq (yes, $(GETTEXT))
CFLAGS += -I$(GETTEXTINCLUDE) CFLAGS += -I$(GETTEXTINCLUDE)
ifndef STATIC_GETTEXT ifndef STATIC_GETTEXT
LIB += -L$(GETTEXTLIB) -l$(INTLLIB) LIB += -L$(GETTEXTLIB) -l$(INTLLIB)
ifeq (USE_SAFE_GETTEXT_DLL, $(DYNAMIC_GETTEXT)) ifeq (USE_SAFE_GETTEXT_DLL, $(DYNAMIC_GETTEXT))
OBJ+=$(SAFE_GETTEXT_DLL_OBJ) OBJ+=$(SAFE_GETTEXT_DLL_OBJ)
endif endif
else else
LIB += -L$(GETTEXTLIB) -lintl LIB += -L$(GETTEXTLIB) -lintl
endif endif
endif endif
endif endif
ifdef PERL ifdef PERL
ifeq (no, $(DYNAMIC_PERL)) ifeq (no, $(DYNAMIC_PERL))
LIB += -L$(PERLLIBS) -lperl$(PERL_VER) LIB += -L$(PERLLIBS) -lperl$(PERL_VER)
endif endif
endif endif
ifdef TCL ifdef TCL
LIB += -L$(TCL)/lib LIB += -L$(TCL)/lib
ifeq (yes, $(DYNAMIC_TCL)) ifeq (yes, $(DYNAMIC_TCL))
LIB += -ltclstub$(TCL_VER) LIB += -ltclstub$(TCL_VER)
else else
LIB += -ltcl$(TCL_VER) LIB += -ltcl$(TCL_VER)
endif endif
endif endif
ifeq (yes, $(OLE)) ifeq (yes, $(OLE))
@ -951,35 +941,35 @@ endif
ifeq (yes, $(IME)) ifeq (yes, $(IME))
DEFINES += -DFEAT_MBYTE_IME DEFINES += -DFEAT_MBYTE_IME
ifeq (yes, $(DYNAMIC_IME)) ifeq (yes, $(DYNAMIC_IME))
DEFINES += -DDYNAMIC_IME DEFINES += -DDYNAMIC_IME
else else
LIB += -limm32 LIB += -limm32
endif endif
endif endif
ifdef ICONV ifdef ICONV
ifneq (yes, $(ICONV)) ifneq (yes, $(ICONV))
LIB += -L$(ICONV) LIB += -L$(ICONV)
CFLAGS += -I$(ICONV) CFLAGS += -I$(ICONV)
endif endif
DEFINES+=-DDYNAMIC_ICONV DEFINES+=-DDYNAMIC_ICONV
endif endif
ifeq (yes, $(USE_STDCPLUS)) ifeq (yes, $(USE_STDCPLUS))
LINK = $(CXX) LINK = $(CXX)
ifeq (yes, $(STATIC_STDCPLUS)) ifeq (yes, $(STATIC_STDCPLUS))
#LIB += -static-libstdc++ -static-libgcc #LIB += -static-libstdc++ -static-libgcc
LIB += -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic LIB += -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
endif endif
else else
LINK = $(CC) LINK = $(CC)
endif endif
ifeq (yes, $(STATIC_WINPTHREAD)) ifeq (yes, $(STATIC_WINPTHREAD))
ifeq (yes, $(HAS_GCC_EH)) ifeq (yes, $(HAS_GCC_EH))
LIB += -lgcc_eh LIB += -lgcc_eh
endif endif
LIB += -Wl,-Bstatic -lwinpthread -Wl,-Bdynamic LIB += -Wl,-Bstatic -lwinpthread -Wl,-Bdynamic
endif endif

2
src/version.c
View File

@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1322,
/**/ /**/
1321, 1321,
/**/ /**/