about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDannyArends2018-02-28 23:37:52 +0100
committerDannyArends2018-02-28 23:37:52 +0100
commit9b6cc6e0955d9b6acc88ee8801729ae6fcc60d8b (patch)
tree83af7515a705018dcc2cac3fa01d1c63cb037ef7
parent3b6aafaa2f320f5bad2b76bf44b08257b4972ecd (diff)
downloadpangemma-9b6cc6e0955d9b6acc88ee8801729ae6fcc60d8b.tar.gz
Makefile changes, to compile under windows
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index a1b9b76..235d1b6 100644
--- a/Makefile
+++ b/Makefile
@@ -68,9 +68,9 @@ TRAVIS_CI              =                  # used by TRAVIS for testing
 
 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
+  GSL_INCLUDE_PATH = -isystemc:/MinGW/include -LC:/MinGW/lib
+  EIGEN_INCLUDE_PATH = -isystem../eigen-git-mirror
+  OPENBLAS_INCLUDE_PATH = -isystem../OpenBLAS-v0.2.19-Win64-int32/include -L../OpenBLAS-v0.2.19-Win64-int32/lib
 else
   OPENBLAS_INCLUDE_PATH = -isystem//usr/local/opt/openblas/include
   ifeq ($(SYS), MAC)
@@ -118,7 +118,7 @@ else
 endif
 
 ifeq ($(SYS), WIN)
-  CPPFLAGS += -Duint="unsigned int" -D__CRT__NO_INLINE -D__STRING="__STRINGIFY"
+  CPPFLAGS += -Duint="unsigned int" -D__CRT__NO_INLINE -D__STRING="__STRINGIFY" -DWINDOWS -DWITH_GSLCBLAS=1
 endif
 
 ifdef SHOW_COMPILER_WARNINGS