diff options
| author | DannyArends | 2018-03-01 15:58:04 +0100 |
|---|---|---|
| committer | DannyArends | 2018-03-01 15:58:04 +0100 |
| commit | dd3ca7014de2d8f1a2cec36cc22ff93b1e929cc4 (patch) | |
| tree | c8ab7ea1129f2f5f36d100b6274a044189e43c3b /Makefile | |
| parent | 64799368da26440c014ecfcf435f7ca3a44d8d15 (diff) | |
| download | pangemma-dd3ca7014de2d8f1a2cec36cc22ff93b1e929cc4.tar.gz | |
Early morning extra fwd slash failure, fixed in this commit
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -68,7 +68,7 @@ TRAVIS_CI = # used by TRAVIS for testing GSL_INCLUDE_PATH = ifeq ($(SYS), WIN) - GSL_INCLUDE_PATH = -isystem/c:/MinGW/include -LC:/MinGW/lib + GSL_INCLUDE_PATH = -isystemc:/MinGW/include -LC:/MinGW/lib EIGEN_INCLUDE_PATH = ../eigen-git-mirror OPENBLAS_INCLUDE_PATH = ../OpenBLAS-v0.2.19-Win64-int32/include -L../OpenBLAS-v0.2.19-Win64-int32/lib else @@ -97,13 +97,13 @@ endif ifeq ($(CPP), clang++) # macOS Homebrew settings (as used on Travis-CI) - GCC_FLAGS=-O3 -std=c++11 -stdlib=libc++ -isystem/$(OPENBLAS_INCLUDE_PATH) -isystem/$(EIGEN_INCLUDE_PATH) -Wl,-L/usr/local/opt/openblas/lib + GCC_FLAGS=-O3 -std=c++11 -stdlib=libc++ -isystem$(OPENBLAS_INCLUDE_PATH) -isystem$(EIGEN_INCLUDE_PATH) -Wl,-L/usr/local/opt/openblas/lib endif ifdef WITH_OPENBLAS OPENBLAS=1 # WITH_LAPACK = # OPENBLAS usually includes LAPACK - CPPFLAGS += -DOPENBLAS -isystem/$(OPENBLAS_INCLUDE_PATH) + CPPFLAGS += -DOPENBLAS -isystem$(OPENBLAS_INCLUDE_PATH) ifdef OPENBLAS_LEGACY # Legacy version (mostly for Travis-CI) CPPFLAGS += -DOPENBLAS_LEGACY @@ -111,10 +111,10 @@ ifdef WITH_OPENBLAS endif ifdef DEBUG - CPPFLAGS += -g $(GCC_FLAGS) $(GSL_INCLUDE_PATH) -isystem/$(EIGEN_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc + CPPFLAGS += -g $(GCC_FLAGS) $(GSL_INCLUDE_PATH) -isystem$(EIGEN_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc else # release mode - CPPFLAGS += -DNDEBUG $(GCC_FLAGS) $(GSL_INCLUDE_PATH) -isystem/$(EIGEN_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc + CPPFLAGS += -DNDEBUG $(GCC_FLAGS) $(GSL_INCLUDE_PATH) -isystem$(EIGEN_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc endif ifeq ($(SYS), WIN) |