kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Makefile.sub: static-linked-ext

Browse source 
* win32/Makefile.sub (EXTOBJS, EXTOBJS, config.h): definitions for
  static-linked-ext.  [Bug #7960]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-03-02 13:49:49 +00:00
parent b1f493dcd1
commit 2250b195a9
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Mar 2 22:49:47 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/Makefile.sub (EXTOBJS, EXTOBJS, config.h): definitions for
static-linked-ext. [Bug #7960]
Sat Mar 2 17:34:19 2013 Tanaka Akira <akr@fsij.org> Sat Mar 2 17:34:19 2013 Tanaka Akira <akr@fsij.org>
* lib/webrick/utils.rb: use Socket.tcp_server_sockets to create server * lib/webrick/utils.rb: use Socket.tcp_server_sockets to create server

8
win32/Makefile.sub
View file

@ -355,6 +355,11 @@ COMMON_MACROS = WIN32_LEAN_AND_MEAN WIN32
COMMON_HEADERS = winsock2.h ws2tcpip.h windows.h COMMON_HEADERS = winsock2.h ws2tcpip.h windows.h
!endif !endif
!if "$(EXTSTATIC)" == "static"
ENCOBJS = enc/encinit.$(OBJEXT) enc/libenc.lib enc/libtrans.lib
EXTOBJS = ext/extinit.$(OBJEXT)
!endif
arch_hdrdir = $(EXTOUT)/include/$(arch) arch_hdrdir = $(EXTOUT)/include/$(arch)
hdrdir = $(srcdir)/include hdrdir = $(srcdir)/include
VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/enc;$(srcdir)/missing;$(win_srcdir) VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/enc;$(srcdir)/missing;$(win_srcdir)
@ -677,6 +682,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
!endif !endif
#define LOAD_RELATIVE 1 #define LOAD_RELATIVE 1
#define DLEXT ".so" #define DLEXT ".so"
!if "$(EXTSTATIC)" == "static"
#define EXTSTATIC 1
!endif
#define EXECUTABLE_EXTS $(EXECUTABLE_EXTS) #define EXECUTABLE_EXTS $(EXECUTABLE_EXTS)
#define RUBY_COREDLL "$(RT)" #define RUBY_COREDLL "$(RT)"
#define LIBRUBY_SO "$(LIBRUBY_SO)" #define LIBRUBY_SO "$(LIBRUBY_SO)"