diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 11 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 7 | ||||
| -rw-r--r-- | wince/Makefile.sub | 7 | ||||
| -rw-r--r-- | wince/setup.mak | 1 |
7 files changed, 22 insertions, 23 deletions
@@ -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. + Wed Aug 3 21:59:16 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/lib/tk/variable.rb: TkVariable#trace didn't work on @@ -50,7 +59,7 @@ Mon Aug 1 01:17:40 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> Mon Aug 1 00:07:32 2005 Keiju Ishitsuka <keiju@ruby-lang.org> * lib/irb/context.rb: fix `irb --readline` option. [ruby-list:40955] - + Fri Jul 29 09:59:38 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (rb_yield_0): push yielded node instead of yielding. diff --git a/Makefile.in b/Makefile.in index d61df932c2..6612bc992e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -78,12 +78,6 @@ ARFLAGS = rcu RANLIB = @RANLIB@ OBJEXT = @OBJEXT@ - -EXTOBJS = -DLDOBJS = $(DMYEXT) - -MAINOBJ = main.$(OBJEXT) - MANTYPE = @MANTYPE@ #### End of variables diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 213d5a7826..58048e39ad 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -164,7 +164,6 @@ LIBRUBYARG = $(LIBRUBY) PREP = miniruby$(EXEEXT) -DMYOBJS = dmyext.obj OBJEXT = obj WINMAINOBJ = winmain.$(OBJEXT) @@ -408,16 +407,16 @@ $(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res $(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(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 $@ - $(AR) $(ARFLAGS) "$@" $(OBJS) dmyext.obj + $(AR) $(ARFLAGS) "$@" $(OBJS) $(DMYEXT) # $(LIBRUBY): $(LIBRUBY_SO) # implib $@ $(LIBRUBY_SO) -$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res - @echo $(EXTOBJS) - $(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(EXTOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res +$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res + @echo $(DLDOBJS) + $(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(DLDOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res $(LIBRUBY): $(LIBRUBY_SO) @@ -9,6 +9,8 @@ RBCONFIG = ./.rbconfig.time DMYEXT = dmyext.$(OBJEXT) MAINOBJ = main.$(OBJEXT) +EXTOBJS = +DLDOBJS = $(DMYEXT) OBJS = array.$(OBJEXT) \ bignum.$(OBJEXT) \ diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 7141575e9f..067f46e362 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -168,9 +168,6 @@ EXTSTATIC = OBJEXT = obj -EXTOBJS = -DLDOBJS = - WINMAINOBJ = winmain.$(OBJEXT) MINIOBJS = dmydln.$(OBJEXT) @@ -210,9 +207,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub #define HAVE_PROTOTYPES 1 #define TOKEN_PASTE(x,y) x##y #define HAVE_STDARG_PROTOTYPES 1 -#if _MSC_VER > 1100 +!if $(MSC_VER) > 1100 #define NORETURN(x) __declspec(noreturn) x -#endif +!endif #define HAVE_DECL_SYS_NERR 1 #define HAVE_LIMITS_H 1 #define HAVE_FCNTL_H 1 diff --git a/wince/Makefile.sub b/wince/Makefile.sub index 2b8dd06b1d..ae53a6b266 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -172,9 +172,6 @@ EXTSTATIC = OBJEXT = obj -EXTOBJS = -DLDOBJS = - WINMAINOBJ = wincemain.$(OBJEXT) all: $(srcdir)/wince/Makefile.sub $(srcdir)/common.mk @@ -215,9 +212,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/wince/Makefile.sub #define HAVE_PROTOTYPES 1 #define TOKEN_PASTE(x,y) x##y #define HAVE_STDARG_PROTOTYPES 1 -#if _MSC_VER > 1100 +!if $(MSC_VER) > 1100 #define NORETURN(x) __declspec(noreturn) x -#endif +!endif #define HAVE_DECL_SYS_NERR 1 #define HAVE_FCNTL_H 1 #define HAVE_SYS_UTIME_H 1 diff --git a/wince/setup.mak b/wince/setup.mak index 629ea993e4..d2dbad2317 100644 --- a/wince/setup.mak +++ b/wince/setup.mak @@ -64,6 +64,7 @@ EXTOUT = $(EXTOUT) MAJOR = RUBY_VERSION_MAJOR MINOR = RUBY_VERSION_MINOR TEENY = RUBY_VERSION_TEENY +MSC_VER = _MSC_VER << -generic-: nul |