diff --git a/configure/os/CONFIG.RHEL7-x86_64.win32-x86 b/configure/os/CONFIG.RHEL7-x86_64.win32-x86 new file mode 100644 index 000000000..93b0b79bc --- /dev/null +++ b/configure/os/CONFIG.RHEL7-x86_64.win32-x86 @@ -0,0 +1,8 @@ +include $(CONFIG)/os/CONFIG.win32-x86.win32-x86 + +PATH_FILTER = $(subst /,/,$(1)) + +# Silence the tr1 namespace deprecation warnings +USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING + +MSVC_DIR = /opt/wine-msvc-2017/bin/x86/ diff --git a/configure/os/CONFIG.RHEL7-x86_64.windows-x64 b/configure/os/CONFIG.RHEL7-x86_64.windows-x64 new file mode 100644 index 000000000..8ea1a5ee5 --- /dev/null +++ b/configure/os/CONFIG.RHEL7-x86_64.windows-x64 @@ -0,0 +1,8 @@ +include $(CONFIG)/os/CONFIG.windows-x64.windows-x64 + +PATH_FILTER = $(subst /,/,$(1)) + +# Silence the tr1 namespace deprecation warnings +USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING + +MSVC_DIR = /opt/wine-msvc-2017/bin/x64/ diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index 62a3ee257..620a2c292 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -14,15 +14,15 @@ OPT_WHOLE_PROGRAM = YES #------------------------------------------------------- -WINLINK = link +WINLINK = $(MSVC_DIR)link -RCCMD = rc -l 0x409 $(INCLUDES) -fo $@ $< +RCCMD = $(MSVC_DIR)rc -l 0x409 $(INCLUDES) -fo $@ $< -ARCMD = lib -nologo -verbose -out:$@ $(LIB_OPT_LDFLAGS) $(LIBRARY_LD_OBJS) +ARCMD = $(MSVC_DIR)lib -nologo -verbose -out:$@ $(LIB_OPT_LDFLAGS) $(LIBRARY_LD_OBJS) # # Configure OS vendor C compiler -CC = cl +CC = $(MSVC_DIR)cl # Override CONFIG.gnuCommon settings for cross builds. GNU = NO @@ -75,14 +75,14 @@ STATIC_CFLAGS_YES= -MT$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS) STATIC_CFLAGS_NO= -MD$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS) -DEPICS_CALL_DLL # OS vendor c preprocessor -CPP = cl -nologo -C -E +CPP = $(MSVC_DIR)cl -nologo -C -E # Configure OS vendor C++ compiler # # -EHsc - generate code for exceptions # -GR - generate code for run time type identification # -CCC = cl -EHsc -GR +CCC = $(MSVC_DIR)cl -EHsc -GR # Other compiler flags, used for CPP, C and C++ # diff --git a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common index 70e181229..171b09dc7 100644 --- a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common +++ b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common @@ -11,3 +11,6 @@ CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64 # Build for old SL6 32 bit CROSS_COMPILER_TARGET_ARCHS += SL6-x86 + +# WINE MSVC +CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64