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

remove useless and outdated Makefile.def

Browse Source
This commit is contained in:
Laurent Perron
2016-01-12 11:15:27 -08:00
parent 49a4696390
commit 7da5cf20a0
2 changed files with 2 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -41,11 +41,8 @@ clean: clean_cc clean_java clean_python clean_csharp clean_compat
include $(OR_ROOT)makefiles/Makefile.port
OR_ROOT_FULL=$(OR_TOOLS_TOP)
# We include predefined variables
include $(OR_ROOT)makefiles/Makefile.def
# Then we overwrite the local ones if the Makefile.local file exists.
-include $(OR_ROOT)Makefile.local
# Load local variables
include $(OR_ROOT)Makefile.local
# Then include specific system commands and definitions
include $(OR_ROOT)makefiles/Makefile.$(SYSTEM)

61
makefiles/Makefile.def
View File

@@ -1,61 +0,0 @@
# Please copy this file to Makefile.local and edit to accomodate your needs.
# Python version (to be used to find include files).
UNIX_PYTHON_VER=2.7
# Where gflags is installed.
UNIX_GFLAGS_DIR=../gflags-1.6
# Swig binary.
UNIX_SWIG_BINARY=swig
# Where protocol buffers are installed
UNIX_PROTOBUF_DIR=../protobuf-2.4.1
# Where sparsehash are installed.
UNIX_SPARSEHASH_DIR=../sparsehash-1.11
# This is the root directory of the CLP installation. Please define if CLP is
# installed. If you have installed CBC, CLP_DIR can have the same value as
# CBC_DIR.
#UNIX_CLP_DIR=../cbc-2.7.4
# This is the root directory of the CBC installation. Please define if CBC is
# installed.
#UNIX_CBC_DIR=../cbc-2.7.4
# This is the root directory of glpk installation. Please define if GLPK is
# installed.
#UNIX_GLPK_DIR=../glpk-4.47
# This is the root directory of scip installation. Please define if scip is
# installed.
#UNIX_SCIP_DIR=../ziboptsuite-2.1.0/scip-2.1.0
# Linux jdk root
LINUX_JDK_ROOT=/usr/local/buildtools/java/jdk-$(PTRLENGTH)
# Include files path for java on mac os X
MAC_JDK_HEADERS=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/include
#MAC_JDK_HEADERS=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/bundle/Headers
# Please edit the following:
WINDOWS_GFLAGS_DIR=..\\gflags-1.6
WINDOWS_ZLIB_DIR=..\\zlib-1.2.5
WINDOWS_ZLIB_NAME=zlib.lib
WINDOWS_SWIG_BINARY=..\\swigwin-2.0.4\\swig.exe
WINDOWS_PROTOBUF_DIR=..\\protobuf-2.4.1
WINDOWS_SPARSEHASH_DIR=..\\sparsehash-1.11
WINDOWS_PYTHON_DIR=c:\\Python27
WINDOWS_PYTHON_LIB=c:\\Python27\\libs\\python27.lib
# This is the root directory of the CLP installation. Please define if CLP is
# installed. If you have installed CBC, CLP_DIR can have the same value as
# CBC_DIR.
#WINDOWS_CLP_DIR=..\\cbc-2.7.4
WINDOWS_CLP_PACKAGE=Clp 1.14.4
# This is the root directory of the CBC installation. Please define if CBC is
# installed.
#WINDOWS_CBC_DIR=..\\cbc-2.7.4
WINDOWS_CBC_PACKAGE=Cbc 2.7.4
# This is the root directory of the GLPK installation. Please define if GLPK is
# installed.
#WINDOWS_GLPK_DIR=..\\glpk-4.47
# This describes the python installation windows.
WINDOWS_PYTHON_INC=/Ic:\\Python27\\include
WINDOWS_PYTHON_LNK=c:\\Python27\\libs\\python27.lib
# This descrives the java installation on windows.
WINDOWS_JDK_DIR=c:\Program Files\Java\jdk1.6.0_24