diff options
| author | samuel <samuel@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-20 10:18:25 +0000 |
|---|---|---|
| committer | samuel <samuel@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-20 10:18:25 +0000 |
| commit | 3ccb5b9770f86a4e59fb5f6e2f72d4b31f209b76 (patch) | |
| tree | 88eb2a32ec6671db63594ccf89765b17f1da0ff0 /win32 | |
| parent | 1fa02b8dc9003a7b5b62a1c9b40755f81fdbf3f2 (diff) | |
Support Visual C++ (mswin)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65879 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 3739d4c683..1f045934ae 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -289,6 +289,13 @@ MISSING = $(MISSING) acosh.obj cbrt.obj erf.obj nan.obj tgamma.obj MISSING = $(MISSING) explicit_bzero.obj !endif DLNOBJ = dln.obj +!if "$(ARCH)" == "x64" +MISSING = $(MISSING) coroutine/Win64/Context.obj +COROUTINE_H = coroutine/Win64/Context.h +!elseif "$(ARCH)" == "i386" +MISSING = $(MISSING) coroutine/Win32/Context.obj +COROUTINE_H = coroutine/Win32/Context.h +!endif ARFLAGS = -machine:$(MACHINE) -out: LD = $(CC) @@ -857,6 +864,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub !if "$(MACHINE)" == "x86" || "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" #define STACK_GROW_DIRECTION -1 !endif +!if defined(COROUTINE_H) +#define FIBER_USE_COROUTINE "$(COROUTINE_H)" +!endif #define DEFAULT_KCODE KCODE_NONE #define LOAD_RELATIVE 1 #define DLEXT ".so" @@ -1214,6 +1224,15 @@ $(ruby_pc): $(RBCONFIG) -output=$@ -mode=$(INSTALL_DATA_MODE) -config=rbconfig.rb \ $(srcdir)/template/ruby.pc.in +{$(srcdir)/coroutine/Win32}.asm.obj: + $(ECHO) assembling $(<:\=/) + @if not exist $(@D:/=\) md $(@D:/=\) + $(Q) $(AS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/) +{$(srcdir)/coroutine/Win64}.asm.obj: + $(ECHO) assembling $(<:\=/) + @if not exist $(@D:/=\) md $(@D:/=\) + $(Q) $(AS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/) + {$(srcdir)/enc/trans}.c.obj: $(ECHO) compiling $(<:\=/) $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/) @@ -1392,3 +1411,7 @@ mjit_config.h: @echo.>> $@ @echo #endif /* RUBY_MJIT_CONFIG_H */>> $@ @$(Q:@=: :) type $@ + +!if defined(COROUTINE_H) +cont.$(OBJEXT): {$(VPATH)}$(COROUTINE_H) +!endif |