diff options
Diffstat (limited to 'wince/Makefile.sub')
| -rw-r--r-- | wince/Makefile.sub | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/wince/Makefile.sub b/wince/Makefile.sub index ffec23ad48..f8ed157f16 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -76,6 +76,10 @@ RT = msvcrt !ifndef RUBY_SO_NAME RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR) !endif +!ifndef RUBY_PLATFORM +RUBY_PLATFORM = $(ARCH)-$(OS) +!endif + !if !defined(prefix) prefix = /usr @@ -119,7 +123,7 @@ LDSHARED = $(LD) -LD XCFLAGS = LDFLAGS = -link -incremental:yes -pdb:none -MACHINE:$(MACHINE) -subsystem:$(SUBSYSTEM) DLDFLAGS = $(LDFLAGS) -dll -XLDFLAGS = -stack:$(STACK) +XLDFLAGS = -stack:$(STACK) -subsystem:$(SUBSYSTEM) SOLIBS = LIBRUBY_LDSHARED = $(LDSHARED) @@ -130,6 +134,7 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT) RUBYDEF = $(RUBY_SO_NAME).def MINIRUBY = .\minirubyce$(EXEEXT) +MINIRUBY_WIN = .\miniruby$(EXEEXT) !if !defined(STACK) STACK = 0x200000,0x10000 @@ -190,7 +195,7 @@ OBJS = array.obj \ all: ext minirubyce$(EXEEXT) rbconfig.rb \ $(LIBRUBY) $(MISCLIBS) - @miniruby$(EXEEXT) $(srcdir)/ext/extmk.rb --extstatic=$(EXTSTATIC) --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" + @$(MINIRUBY_WIN) $(srcdir)/ext/extmk.rb --extstatic=$(EXTSTATIC) --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" ext: @mkdir $@ @@ -410,9 +415,9 @@ s,@COMPILE_C@,$$(CC) $$(CFLAGS) $$(CPPFLAGS) -c -Tc$$(<:\=/),;t t s,@COMPILE_CXX@,$$(CXX) $$(CXXFLAGS) $$(CPPFLAGS) -c -Tp$$(<:\=/),;t t s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: .%s.%s:,;t t s,@TRY_LINK@,$$(CC) -Feconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS) -link $$(LDFLAGS) $$(LIBPATH) $$(XLDFLAGS),;t t -s,@COMMON_LIBS@,m,;t t +s,@COMMON_LIBS@,coredll winsock,;t t s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN;t t -s,@COMMON_HEADERS@,winsock2.h windows.h,;t t +s,@COMMON_HEADERS@,winsock.h windows.h,;t t s,@EXPORT_PREFIX@, ,;t t s,@arch@,$(ARCH)-$(OS),;t t s,@sitearch@,$(ARCH)-$(RT),;t t @@ -421,6 +426,7 @@ s,@configure_args@,--with-make-prog=nmake --enable-shared $(configure_args),;t t s,@configure_input@,$$configure_input,;t t s,@srcdir@,$(srcdir),;t t s,@top_srcdir@,$(srcdir),;t t +s,@RUBY_PLATFORM@,$(RUBY_PLATFORM),;t t <<KEEP minirubyce$(EXEEXT): $(OBJS) $(MAINOBJ) $(WINMAINOBJ) dmyext.obj @@ -447,16 +453,16 @@ $(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $*.res -Fe$@ $(LDFLAGS) $(LIBRUBY_DLDFLAGS) $(RUBYDEF): $(LIBRUBY_A) minirubyce$(EXEEXT) - miniruby$(EXEEXT) $(srcdir)/wince/mkexports.rb \ + $(MINIRUBY_WIN) $(srcdir)/wince/mkexports.rb \ -output=$@ $(LIBRUBY_A) $(ARCH) {$(srcdir)/wince}.def.lib: $(AR) $(ARFLAGS)$@ -def:$< install: rbconfig.rb - miniruby$(EXEEXT) $(srcdir)/instruby.rb \ + $(MINIRUBY_WIN) $(srcdir)/instruby.rb \ "--dest-dir=$(DESTDIR)" "--make=nmake" - miniruby$(EXEEXT) $(srcdir)/ext/extmk.rb \ + $(MINIRUBY_WIN) $(srcdir)/ext/extmk.rb \ --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS) DESTDIR=$(DESTDIR)" install clean: clean-ext clean-local @@ -472,8 +478,7 @@ clean-local: @if exist *.res del *.res clean-ext: -# @-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" clean - @-miniruby$(EXEEXT) $(srcdir)/ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" clean + @-$(MINIRUBY_WIN) $(srcdir)/ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" clean distclean: distclean-ext distclean-local @@ -507,7 +512,7 @@ distclean-local: clean-local @if exist minirubyce$(EXEEXT) del minirubyce$(EXEEXT) distclean-ext: - @-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" distclean + @-$(MINIRUBY_WIN) $(srcdir)/ext/extmk.rb --make "$(MAKE)" --make-flags "-$(MFLAGS)$(MAKEFLAGS)" distclean realclean: distclean @if exist parse.c del parse.c @@ -516,13 +521,14 @@ realclean: distclean test: miniruby$(EXEEXT) @miniruby$(EXEEXT) $(srcdir)/rubytest.rb -rbconfig.rb: minirubyce$(EXEEXT) config.status - miniruby$(EXEEXT) $(srcdir)/mkconfig.rb -srcdir=$(srcdir) \ +rbconfig.rb: miniruby$(EXEEXT) config.status + $(MINIRUBY_WIN) $(srcdir)/mkconfig.rb -srcdir=$(srcdir) \ -install_name=$(RUBY_INSTALL_NAME) \ -so_name=$(RUBY_SO_NAME) rbconfig.rb + $(MINIRUBY_WIN) $(srcdir)/wince/mkconfig_wce.rb rbconfig.rb $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb - miniruby$(EXEEXT) $(srcdir)/wince/resource.rb \ + $(MINIRUBY_WIN) $(srcdir)/wince/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) \ -rubyw_name=$(RUBYW_INSTALL_NAME) \ -so_name=$(RUBY_SO_NAME) \ |