diff --git a/makefiles/Makefile.win.mk b/makefiles/Makefile.win.mk index 7919c739f3..e0f1e77ebe 100644 --- a/makefiles/Makefile.win.mk +++ b/makefiles/Makefile.win.mk @@ -119,7 +119,7 @@ ifdef WINDOWS_CPLEX_DIR DYNAMIC_CPLEX_LNK = $(STATIC_CPLEX_LNK) endif ifdef WINDOWS_XPRESS_DIR - XPRESS_INC = /I"$(WINDOWS_XPRESS_DIR)\\include" /DUSE_XPRESS /DXPRESS_PATH="$(WINDOWS_XPRESS_DIR)" + XPRESS_INC = /I"$(WINDOWS_XPRESS_DIR)\\include" /DUSE_XPRESS /DXPRESS_PATH=\"$(WINDOWS_XPRESS_DIR)\" XPRESS_SWIG = -I"$(WINDOWS_XPRESS_DIR)/include" -DUSE_XPRESS STATIC_XPRESS_LNK = "$(WINDOWS_XPRESS_DIR)\\lib\\xprs.lib" DYNAMIC_XPRESS_LNK = $(STATIC_XPRESS_LNK) diff --git a/ortools/linear_solver/xpress_interface.cc b/ortools/linear_solver/xpress_interface.cc index 2eea66b10a..763a327a7f 100644 --- a/ortools/linear_solver/xpress_interface.cc +++ b/ortools/linear_solver/xpress_interface.cc @@ -265,7 +265,7 @@ int init_xpress_env(int xpress_oem_license_key = 0) { LOG(WARNING) << "Environment variable XPRESS undefined. Trying compile path " << "'" << STRINGIFY(XPRESS_PATH) << "'"; -#if defined(__MSC_VER) +#if defined(_MSC_VER) xpresspath = STRINGIFY(XPRESS_PATH) "\\bin"; #else // _MSC_VER xpresspath = STRINGIFY(XPRESS_PATH) "/bin";