always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make: Fix XPRESS compilation on windows

Browse Source
This commit is contained in:
Mizux Seiha
2020-07-10 04:32:14 +02:00
parent 7e5e1279b9
commit 6b8305a492
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
makefiles/Makefile.win.mk
View File

@@ -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)

2
ortools/linear_solver/xpress_interface.cc
View File

@@ -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";