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

add OR_TOOLS_VERSION and use it in mac dylibs

Browse Source
This commit is contained in:
lperron@google.com
2012-01-13 10:28:29 +00:00
parent f1b4ba6704
commit 1f54ba5908
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -10,6 +10,8 @@ help:
@echo " - tests: test test_cc test_python test_java test_csharp"
@echo " - cleaning: clean cleancsharp"
OR_TOOLS_VERSION = 1.0.0
.PHONY : python cc java
cc: cplibs cpexe algorithmslibs graphlibs lplibs lpexe
java: javacp javaalgorithms javagraph javalp

4
makefiles/Makefile.unix
View File

@@ -103,7 +103,7 @@ PRE_LIB = -Wl,-rpath $(TOP) -L$(TOP) -l
POST_LIB =
endif # LINUX
ifeq ($(PLATFORM),MACOSX)
LD = ld -arch x86_64 -bundle -flat_namespace -undefined suppress -macosx_version_min 10.6
LD = ld -arch x86_64 -bundle -flat_namespace -undefined suppress -macosx_version_min 10.6 -lSystem -compatibility_version 1.0 -current_version $(OR_TOOLS_VERSION)
JNILIBEXT = jnilib
GFLAGS_LNK = -L$(UNIX_GFLAGS_DIR)/lib -lgflags
@@ -120,7 +120,7 @@ JAR_BIN = jar
PRE_LIB = -L$(TOP) -l
POST_LIB =
LIBSUFFIX = dylib
LINKCMD = ld -arch x86_64 -dylib -flat_namespace -undefined suppress -macosx_version_min 10.6
LINKCMD = ld -arch x86_64 -dylib -flat_namespace -undefined suppress -macosx_version_min 10.6 -lSystem -compatibility_version 1.0 -current_version $(OR_TOOLS_VERSION)
LINKPREFIX = -o # Need the space.
ifdef UNIX_GLPK_DIR