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

* common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub: integrated

Browse source 
macro definitions.

* bcc32/Makefile.sub: LIBRUBY_SO should use DLDOBJS, not EXTOBJS.

* {win32,wince}/Makefile.sub: separate config.h for compiler versions.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-08-03 15:27:13 +00:00
parent cc3aa18111
commit a51e80459c
7 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Thu Aug 4 00:25:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub: integrated
macro definitions.
* bcc32/Makefile.sub: LIBRUBY_SO should use DLDOBJS, not EXTOBJS.
* {win32,wince}/Makefile.sub: separate config.h for compiler versions.
Thu Aug 4 00:24:59 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Aug 4 00:24:59 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c: replacing is no longer needed. * sprintf.c: replacing is no longer needed.

6
Makefile.in
View file

@ -78,12 +78,6 @@ ARFLAGS = rcu
RANLIB = @RANLIB@ RANLIB = @RANLIB@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
EXTOBJS =
DLDOBJS = $(DMYEXT)
MAINOBJ = main.$(OBJEXT)
MANTYPE = @MANTYPE@ MANTYPE = @MANTYPE@
#### End of variables #### End of variables

11
bcc32/Makefile.sub
View file

@ -168,7 +168,6 @@ LIBRUBYARG = $(LIBRUBY)
PREP = miniruby$(EXEEXT) PREP = miniruby$(EXEEXT)
DMYOBJS = dmyext.obj
OBJEXT = obj OBJEXT = obj
WINMAINOBJ = winmain.$(OBJEXT) WINMAINOBJ = winmain.$(OBJEXT)
@ -416,16 +415,16 @@ $(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
$(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res $(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
$(LD) $(LDFLAGS) $(WLDFLAGS) $(MAINOBJ) $(WINMAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBYW_INSTALL_NAME).res $(LD) $(LDFLAGS) $(WLDFLAGS) $(MAINOBJ) $(WINMAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBYW_INSTALL_NAME).res
$(LIBRUBY_A): $(OBJS) dmyext.obj $(LIBRUBY_A): $(OBJS) $(DMYEXT)
@-if exist $@ del $@ @-if exist $@ del $@
$(AR) $(ARFLAGS) "$@" $(OBJS) dmyext.obj $(AR) $(ARFLAGS) "$@" $(OBJS) $(DMYEXT)
# $(LIBRUBY): $(LIBRUBY_SO) # $(LIBRUBY): $(LIBRUBY_SO)
# implib $@ $(LIBRUBY_SO) # implib $@ $(LIBRUBY_SO)
$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
@echo $(EXTOBJS) @echo $(DLDOBJS)
$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(EXTOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res $(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(DLDOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
$(LIBRUBY): $(LIBRUBY_SO) $(LIBRUBY): $(LIBRUBY_SO)

2
common.mk
View file

@ -9,6 +9,8 @@ RBCONFIG = ./.rbconfig.time
DMYEXT = dmyext.$(OBJEXT) DMYEXT = dmyext.$(OBJEXT)
MAINOBJ = main.$(OBJEXT) MAINOBJ = main.$(OBJEXT)
EXTOBJS =
DLDOBJS = $(DMYEXT)
OBJS = array.$(OBJEXT) \ OBJS = array.$(OBJEXT) \
ascii.$(OBJEXT) \ ascii.$(OBJEXT) \

11
win32/Makefile.sub
View file

@ -172,9 +172,6 @@ EXTSTATIC =
OBJEXT = obj OBJEXT = obj
EXTOBJS =
DLDOBJS =
WINMAINOBJ = winmain.$(OBJEXT) WINMAINOBJ = winmain.$(OBJEXT)
MINIOBJS = dmydln.$(OBJEXT) MINIOBJS = dmydln.$(OBJEXT)
@ -214,13 +211,13 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub
#define HAVE_PROTOTYPES 1 #define HAVE_PROTOTYPES 1
#define TOKEN_PASTE(x,y) x##y #define TOKEN_PASTE(x,y) x##y
#define HAVE_STDARG_PROTOTYPES 1 #define HAVE_STDARG_PROTOTYPES 1
#if _MSC_VER > 1100 !if $(MSC_VER) > 1100
#define NORETURN(x) __declspec(noreturn) x #define NORETURN(x) __declspec(noreturn) x
#endif !endif
#if _MSC_VER >= 1300 !if $(MSC_VER) >= 1300
#define DEPRECATED(x) __declspec(deprecated) x #define DEPRECATED(x) __declspec(deprecated) x
#define NOINLINE(x) __declspec(noinline) x #define NOINLINE(x) __declspec(noinline) x
#endif !endif
#define HAVE_DECL_SYS_NERR 1 #define HAVE_DECL_SYS_NERR 1
#define HAVE_LIMITS_H 1 #define HAVE_LIMITS_H 1
#define HAVE_FCNTL_H 1 #define HAVE_FCNTL_H 1

11
wince/Makefile.sub
View file

@ -176,9 +176,6 @@ EXTSTATIC =
OBJEXT = obj OBJEXT = obj
EXTOBJS =
DLDOBJS =
WINMAINOBJ = wincemain.$(OBJEXT) WINMAINOBJ = wincemain.$(OBJEXT)
all: $(srcdir)/wince/Makefile.sub $(srcdir)/common.mk all: $(srcdir)/wince/Makefile.sub $(srcdir)/common.mk
@ -219,13 +216,13 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/wince/Makefile.sub
#define HAVE_PROTOTYPES 1 #define HAVE_PROTOTYPES 1
#define TOKEN_PASTE(x,y) x##y #define TOKEN_PASTE(x,y) x##y
#define HAVE_STDARG_PROTOTYPES 1 #define HAVE_STDARG_PROTOTYPES 1
#if _MSC_VER > 1100 !if $(MSC_VER) > 1100
#define NORETURN(x) __declspec(noreturn) x #define NORETURN(x) __declspec(noreturn) x
#endif !endif
#if _MSC_VER >= 1300 !if $(MSC_VER) >= 1300
#define DEPRECATED(x) __declspec(deprecated) x #define DEPRECATED(x) __declspec(deprecated) x
#define NOINLINE(x) __declspec(noinline) x #define NOINLINE(x) __declspec(noinline) x
#endif !endif
#define HAVE_DECL_SYS_NERR 1 #define HAVE_DECL_SYS_NERR 1
#define HAVE_FCNTL_H 1 #define HAVE_FCNTL_H 1
#define HAVE_SYS_UTIME_H 1 #define HAVE_SYS_UTIME_H 1

1
wince/setup.mak
View file

@ -64,6 +64,7 @@ EXTOUT = $(EXTOUT)
MAJOR = RUBY_VERSION_MAJOR MAJOR = RUBY_VERSION_MAJOR
MINOR = RUBY_VERSION_MINOR MINOR = RUBY_VERSION_MINOR
TEENY = RUBY_VERSION_TEENY TEENY = RUBY_VERSION_TEENY
MSC_VER = _MSC_VER
<< <<
-generic-: nul -generic-: nul