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

Fixup CoreFoundation

Browse Source
This commit is contained in:
Corentin Le Molgat
2019-03-20 08:01:58 +01:00
parent e39a0f298f
commit 967e3d1178
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
makefiles/Makefile.unix.mk
View File

@@ -233,6 +233,7 @@ ifeq ($(PLATFORM),MACOSX)
PRE_LIB = -L$(OR_ROOT)lib -l
POST_LIB =
LINK_FLAGS = \
-framework CoreFoundation \
-Wl,-rpath,@loader_path \
-Wl,-rpath,@loader_path/../lib \
-Wl,-rpath,@loader_path/../dependencies/install/lib
@@ -254,7 +255,7 @@ DEPENDENCIES_INC = -I$(INC_DIR) -I$(GEN_DIR) \
CFLAGS = $(DEBUG) $(DEPENDENCIES_INC)
JNIFLAGS = $(JNIDEBUG) $(DEPENDENCIES_INC)
LDFLAGS += $(ZLIB_LNK) $(SYS_LNK) $(LINK_FLAGS)
DEPENDENCIES_LNK = -framework CoreFoundation $(GLPK_LNK) $(SCIP_LNK) $(GUROBI_LNK) $(CPLEX_LNK)
DEPENDENCIES_LNK = $(GLPK_LNK) $(SCIP_LNK) $(GUROBI_LNK) $(CPLEX_LNK)
OR_TOOLS_LNK =
OR_TOOLS_LDFLAGS = $(ZLIB_LNK) $(SYS_LNK) $(LINK_FLAGS)