diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | cygwin/GNUmakefile.in | 2 | ||||
| -rw-r--r-- | version.h | 10 |
3 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Thu Jan 1 08:29:55 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * cygwin/GNUmakefile.in (EXTOBJS): override to add resource files + always. [ruby-core:67153] [Bug #10657] + Wed Dec 31 15:26:46 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (f_kwrest, new_args_tail_gen): unnamed rest keyword and diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 5bd414d786..768a1b6b7f 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -33,7 +33,7 @@ WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT) -include uncommon.mk SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS) -EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT) +override EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT) RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc RUBYDEF = $(DLL_BASE_NAME).def @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.0" -#define RUBY_RELEASE_DATE "2014-12-31" -#define RUBY_PATCHLEVEL 4 +#define RUBY_RELEASE_DATE "2015-01-01" +#define RUBY_PATCHLEVEL 5 -#define RUBY_RELEASE_YEAR 2014 -#define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_YEAR 2015 +#define RUBY_RELEASE_MONTH 1 +#define RUBY_RELEASE_DAY 1 #include "ruby/version.h" |