Skip to content

Commit 20834eb

Browse files
Remove Windows mklinks (#39)
* can i just integrate install? * add include and bin flags * conflicting includes? * include openblas first? * find openblas.dll * integrate necessary?
1 parent 8db4aab commit 20834eb

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

.appveyor.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,6 @@ install:
99
- set PATH=%PATH%;c:\tools\vcpkg
1010
- set PATH=%PATH%;C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin\
1111
- vcpkg install openblas:x64-windows fftw3[core,threads]:x64-windows mpfr:x64-windows mpir:x64-windows --recurse
12-
- mklink c:\projects\fasttransforms\src\cblas.h c:\tools\vcpkg\installed\x64-windows\include\openblas\cblas.h
13-
- mklink c:\projects\fasttransforms\src\openblas_config.h c:\tools\vcpkg\installed\x64-windows\include\openblas\openblas_config.h
14-
- mklink c:\projects\fasttransforms\blas.dll c:\tools\vcpkg\installed\x64-windows\bin\openblas.dll
15-
- mklink c:\projects\fasttransforms\src\fftw3.h c:\tools\vcpkg\installed\x64-windows\include\fftw3.h
16-
- mklink c:\projects\fasttransforms\fftw3.dll c:\tools\vcpkg\installed\x64-windows\bin\fftw3.dll
17-
- mklink c:\projects\fasttransforms\src\mpfr.h c:\tools\vcpkg\installed\x64-windows\include\mpfr.h
18-
- mklink c:\projects\fasttransforms\mpfr.dll c:\tools\vcpkg\installed\x64-windows\bin\mpfr.dll
19-
- mklink c:\projects\fasttransforms\src\gmp.h c:\tools\vcpkg\installed\x64-windows\include\gmp.h
20-
- mklink c:\projects\fasttransforms\src\mpir.h c:\tools\vcpkg\installed\x64-windows\include\mpir.h
21-
- mklink c:\projects\fasttransforms\mpir.dll c:\tools\vcpkg\installed\x64-windows\bin\mpir.dll
2212
- set PATH=c:\tools\vcpkg\installed\x64-windows\bin;%PATH%
2313

2414
matrix:

Make.inc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,24 @@ else
4848
CFLAGS += -I/usr/local/opt/gmp/include
4949
LDFLAGS += -L/usr/local/opt/gmp/lib
5050
else ifeq ($(UNAME), Windows)
51+
CFLAGS += -Ic:\tools\vcpkg\installed\x64-windows\include\openblas
52+
CFLAGS += -Ic:\tools\vcpkg\installed\x64-windows\include
53+
LDFLAGS += -Lc:\tools\vcpkg\installed\x64-windows\bin
5154
LDFLAGS += -L.
5255
endif
5356
endif
5457

55-
LDLIBS += -lm -lquadmath -fopenmp -lblas -lfftw3
58+
LDLIBS += -lm -lquadmath -fopenmp -lfftw3
5659

5760
ifneq ($(FT_FFTW_WITH_COMBINED_THREADS), 1)
5861
LDLIBS += -lfftw3_threads
5962
endif
6063

6164
LDLIBS += -lmpfr
6265
ifeq ($(UNAME), Linux)
63-
LDLIBS += -lgmp
66+
LDLIBS += -lgmp -lblas
6467
else ifeq ($(UNAME), Darwin)
65-
LDLIBS += -lgmp
68+
LDLIBS += -lgmp -lblas
6669
else ifeq ($(OS), Windows_NT)
67-
LDLIBS += -lmpir
70+
LDLIBS += -lmpir -lopenblas
6871
endif

0 commit comments

Comments
 (0)