[前][次][番号順一覧][スレッド一覧]

ruby-changes:53669

From: samuel <ko1@a...>
Date: Wed, 21 Nov 2018 01:17:41 +0900 (JST)
Subject: [ruby-changes:53669] samuel:r65879 (trunk): Support Visual C++ (mswin)

samuel	2018-11-20 19:18:25 +0900 (Tue, 20 Nov 2018)

  New Revision: 65879

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65879

  Log:
    Support Visual C++ (mswin)

  Modified files:
    trunk/win32/Makefile.sub
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 65878)
+++ win32/Makefile.sub	(revision 65879)
@@ -289,6 +289,13 @@ MISSING = $(MISSING) acosh.obj cbrt.obj https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L289
 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/ https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L864
 !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) https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1224
 		-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: https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1411
 	@echo.>> $@
 	@echo #endif /* RUBY_MJIT_CONFIG_H */>> $@
 	@$(Q:@=: :) type $@
+
+!if defined(COROUTINE_H)
+cont.$(OBJEXT): {$(VPATH)}$(COROUTINE_H)
+!endif

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]