[前][次][番号順一覧][スレッド一覧]

ruby-changes:14117

From: usa <ko1@a...>
Date: Thu, 26 Nov 2009 17:55:49 +0900 (JST)
Subject: [ruby-changes:14117] Ruby:r25931 (trunk): * win32/{configure.bat, setup.mak, Makefile.sub}: add new configure

usa	2009-11-26 17:55:34 +0900 (Thu, 26 Nov 2009)

  New Revision: 25931

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25931

  Log:
    * win32/{configure.bat, setup.mak, Makefile.sub}: add new configure
      option ``--with-ntver''.

  Modified files:
    trunk/ChangeLog
    trunk/win32/Makefile.sub
    trunk/win32/configure.bat
    trunk/win32/setup.mak

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25930)
+++ ChangeLog	(revision 25931)
@@ -1,3 +1,8 @@
+Thu Nov 26 17:54:37 2009  NAKAMURA Usaku  <usa@r...>
+
+	* win32/{configure.bat, setup.mak, Makefile.sub}: add new configure
+	  option ``--with-ntver''.
+
 Thu Nov 26 11:42:22 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/mkmf/base.rb: use $INCFLAGS to add -I option.  [Bug#2387]
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 25930)
+++ win32/Makefile.sub	(revision 25931)
@@ -116,6 +116,9 @@
 !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)
Index: win32/configure.bat
===================================================================
--- win32/configure.bat	(revision 25930)
+++ win32/configure.bat	(revision 25931)
@@ -32,6 +32,7 @@
 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 @@
   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 @@
   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
Index: win32/setup.mak
===================================================================
--- win32/setup.mak	(revision 25930)
+++ win32/setup.mak	(revision 25931)
@@ -55,6 +55,9 @@
 !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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]