diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | win32/Makefile.sub | 3 | ||||
-rwxr-xr-x | win32/configure.bat | 10 | ||||
-rw-r--r-- | win32/setup.mak | 3 |
4 files changed, 20 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Nov 26 17:54:37 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/{configure.bat, setup.mak, Makefile.sub}: add new configure + option ``--with-ntver''. + Thu Nov 26 11:42:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * test/mkmf/base.rb: use $INCFLAGS to add -I option. [Bug#2387] diff --git a/win32/Makefile.sub b/win32/Makefile.sub index b49638f120..55651bc1ac 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -116,6 +116,9 @@ PLATFORM = mswin32 !if !defined(RT) !error RT not defined. Retry from configure pass. !endif +!ifdef NTVER +ARCHDEFS = -D_WIN32_WINNT=$(NTVER) $(ARCHDEFS) +!endif arch = $(ARCH)-$(PLATFORM) sitearch = $(ARCH)-$(RT) diff --git a/win32/configure.bat b/win32/configure.bat index 4cac13e08c..ad00266528 100755 --- a/win32/configure.bat +++ b/win32/configure.bat @@ -32,6 +32,7 @@ if "%1" == "--path" goto :path if "%1" == "--with-baseruby" goto :baseruby
if "%1" == "-h" goto :help
if "%1" == "--help" goto :help
+if "%1" == "--with-ntver" goto :ntver
echo>>confargs.tmp %1 \
shift
goto :loop
@@ -107,6 +108,12 @@ goto :loop echo>>confargs.tmp %1 \
shift
goto :loop
+:ntver
+ echo>> ~tmp~.mak "NTVER=%2" \
+ echo>>confargs.tmp %1=%2 \
+ shift
+ shift
+goto :loop
:extout
echo>> ~tmp~.mak "EXTOUT=%2" \
echo>>confargs.tmp %1=%2 \
@@ -137,7 +144,8 @@ goto :loop echo --with-baseruby=RUBY use RUBY as baseruby [ruby]
echo --with-static-linked-ext link external modules statically
echo --disable-install-doc do not install rdoc indexes during install
- echo --enable-win95 enable win95 support
+ echo --disable-win95 disable win95 support
+ echo --with-ntver=0xXXXX target NT version (shouldn't use with old SDK)
del *.tmp
del ~tmp~.mak
goto :exit
diff --git a/win32/setup.mak b/win32/setup.mak index 3216ac70e9..b6fb6acad3 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -55,6 +55,9 @@ EXTOUT = $(EXTOUT) !if defined(BASERUBY) BASERUBY = $(BASERUBY) !endif +!if defined(NTVER) +NTVER = $(NTVER) +!endif << !if !defined(BASERUBY) @for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I >> $(MAKEFILE) |