summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorJemma Issroff <jemmaissroff@gmail.com>2023-06-20 11:48:12 -0400
committerTakashi Kokubun <takashikkbn@gmail.com>2023-06-21 11:25:39 -0700
commitd53e1f42ff183af96832f6ede8e54afff6c8082f (patch)
tree3676be356b3548ce2dcb713acda4eb25a158670d /win32
parent03f1a6c4c57c469e8fb5858cf9676b6479f4610d (diff)
[Feature #19741] Add yarp to builds
Add yarp to common.mk and windows builds to enable us to run yarp correctly with CI.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/7964
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub11
1 files changed, 11 insertions, 0 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 7b56e43511..9f03280fa2 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -514,6 +514,8 @@ VCSUP = rem
!endif
ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc
+YARP_BUILD_DIR = $(MAKEDIR)/yarp
+
MESSAGE_BEGIN = @(for %I in (
MESSAGE_END = ) do @echo.%~I)
ECHO_BEGIN = @echo.
@@ -1278,6 +1280,15 @@ $(ruby_pc): $(RBCONFIG)
$(ECHO) assembling $(<:\=/)
$(Q) $(AS) $(ASFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/)
+{$(srcdir)/yarp}.c.obj:
+ $(ECHO) compiling $(<:\=/)
+ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
+{$(srcdir)/yarp/enc}.c.obj:
+ $(ECHO) compiling $(<:\=/)
+ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
+{$(srcdir)/yarp/util}.c.obj:
+ $(ECHO) compiling $(<:\=/)
+ $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)
{$(srcdir)/enc/trans}.c.obj:
$(ECHO) compiling $(<:\=/)
$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(<:\=/)