summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub8
1 files changed, 8 insertions, 0 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 5a43f571af..daf24a9855 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -213,7 +213,11 @@ OUTFLAG = -Fe
COUTFLAG = -Fo
!endif
!if !defined(CPPOUTFLAG)
+! if $(MSC_VER) < 1600
+CPPOUTFLAG = >
+! else
CPPOUTFLAG = -Fi
+! endif
!endif
!if !defined(CSRCFLAG)
CSRCFLAG = -Tc
@@ -289,7 +293,11 @@ LDSHARED_1 = @if exist $(@).manifest $(MANIFESTTOOL) -manifest $(@).manifest -ou
LDSHARED_2 = @if exist $(@).manifest @$(RM) $(@:/=\).manifest
!endif
CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS)
+!if "$(CPPOUTFLAG)" == ">"
+MJIT_HEADER_FLAGS =
+!else
MJIT_HEADER_FLAGS = -P
+!endif
MJIT_HEADER_SUFFIX =
MJIT_HEADER_ARCH =
MJIT_HEADER_INSTALL_DIR = include/$(RUBY_VERSION_NAME)/$(arch)