diff options
| author | DannyArends | 2018-02-28 16:07:43 +0100 |
|---|---|---|
| committer | DannyArends | 2018-02-28 16:07:43 +0100 |
| commit | 2fc39eb39792384f797bc29002a0a6b3ef2d50d3 (patch) | |
| tree | 30d30fa395842093fd248877e0c81f1365107f19 | |
| parent | f44ff52a81650cf5f2a6b1e11f0194e468756672 (diff) | |
| download | pangemma-2fc39eb39792384f797bc29002a0a6b3ef2d50d3.tar.gz | |
Windows compilation paths, and restructuring the -isystem
| -rw-r--r-- | Makefile | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/Makefile b/Makefile index 23b834f..a1b9b76 100644 --- a/Makefile +++ b/Makefile @@ -65,8 +65,20 @@ OPENBLAS_LEGACY = # Using older OpenBlas FORCE_STATIC = # Static linking of libraries GCC_FLAGS = -Wall -O3 -std=gnu++11 # extra flags -Wl,--allow-multiple-definition TRAVIS_CI = # used by TRAVIS for testing -EIGEN_INCLUDE_PATH = /usr/include/eigen3 -OPENBLAS_INCLUDE_PATH = /usr/local/opt/openblas/include + +GSL_INCLUDE_PATH = +ifeq ($(SYS), WIN) + GSL_INCLUDE_PATH = -Ic:/GnuWin32/include + EIGEN_INCLUDE_PATH = -I../eigen-git-mirror + OPENBLAS_INCLUDE_PATH = -I../OpenBLAS-v0.2.19-Win64-int32/include +else + OPENBLAS_INCLUDE_PATH = -isystem//usr/local/opt/openblas/include + ifeq ($(SYS), MAC) + EIGEN_INCLUDE_PATH = -isystem//usr/local/include/eigen3 + else + EIGEN_INCLUDE_PATH = -isystem//usr/include/eigen3 + endif +endif # -------------------------------------------------------------------- # Edit below this line with caution @@ -85,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//usr/local/include/eigen3 -Wl,-L/usr/local/opt/openblas/lib + GCC_FLAGS=-O3 -std=c++11 -stdlib=libc++ $(OPENBLAS_INCLUDE_PATH) $(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 $(OPENBLAS_INCLUDE_PATH) ifdef OPENBLAS_LEGACY # Legacy version (mostly for Travis-CI) CPPFLAGS += -DOPENBLAS_LEGACY @@ -99,10 +111,14 @@ ifdef WITH_OPENBLAS endif ifdef DEBUG - CPPFLAGS += -g $(GCC_FLAGS) -isystem/$(EIGEN_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc + CPPFLAGS += -g $(GCC_FLAGS) $(GSL_INCLUDE_PATH) $(EIGEN_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc else # release mode - CPPFLAGS += -DNDEBUG $(GCC_FLAGS) -isystem/$(EIGEN_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc + CPPFLAGS += -DNDEBUG $(GCC_FLAGS) $(GSL_INCLUDE_PATH) $(EIGEN_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc +endif + +ifeq ($(SYS), WIN) + CPPFLAGS += -Duint="unsigned int" -D__CRT__NO_INLINE -D__STRING="__STRINGIFY" endif ifdef SHOW_COMPILER_WARNINGS |