archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) ce20367a0e: [Backport #20500]

Browse source 
Define `incflags` also on mswin
This commit is contained in:
nagachika 2024-10-20 14:21:15 +09:00
parent 2fbae07c42
commit e55b1af257
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
version.h
View file

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 5 #define RUBY_VERSION_TEENY 5
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 231 #define RUBY_PATCHLEVEL 232
#include "ruby/version.h" #include "ruby/version.h"
#include "ruby/internal/abi.h" #include "ruby/internal/abi.h"

4
win32/Makefile.sub
View file

@ -158,6 +158,9 @@ OPTFLAGS = -O2b2xg-
OPTFLAGS = -O2sy- OPTFLAGS = -O2sy-
!endif !endif
!endif !endif
!if !defined(incflags)
incflags =
!endif
!if !defined(PLATFORM) !if !defined(PLATFORM)
PLATFORM = mswin32 PLATFORM = mswin32
!endif !endif
@ -970,6 +973,7 @@ s,@WERRORFLAG@,$(WERRORFLAG),;t t
s,@DEFS@,$(DEFS),;t t s,@DEFS@,$(DEFS),;t t
s,@CPPFLAGS@,$(CPPFLAGS),;t t s,@CPPFLAGS@,$(CPPFLAGS),;t t
s,@CXXFLAGS@,$(CXXFLAGS),;t t s,@CXXFLAGS@,$(CXXFLAGS),;t t
s,@incflags@,$(incflags),;t t
s,@FFLAGS@,$(FFLAGS),;t t s,@FFLAGS@,$(FFLAGS),;t t
s,@LDFLAGS@,$(LDFLAGS),;t t s,@LDFLAGS@,$(LDFLAGS),;t t
s,@LIBS@,user32.lib,;t t s,@LIBS@,user32.lib,;t t