Skip to content

Commit

Permalink
Remove Windows mklinks (#39)
Browse files Browse the repository at this point in the history
* can i just integrate install?

* add include and bin flags

* conflicting includes?

* include openblas first?

* find openblas.dll

* integrate necessary?
  • Loading branch information
MikaelSlevinsky authored Nov 5, 2019
1 parent 8db4aab commit 20834eb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 14 deletions.
10 changes: 0 additions & 10 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,6 @@ install:
- set PATH=%PATH%;c:\tools\vcpkg
- set PATH=%PATH%;C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin\
- vcpkg install openblas:x64-windows fftw3[core,threads]:x64-windows mpfr:x64-windows mpir:x64-windows --recurse
- mklink c:\projects\fasttransforms\src\cblas.h c:\tools\vcpkg\installed\x64-windows\include\openblas\cblas.h
- mklink c:\projects\fasttransforms\src\openblas_config.h c:\tools\vcpkg\installed\x64-windows\include\openblas\openblas_config.h
- mklink c:\projects\fasttransforms\blas.dll c:\tools\vcpkg\installed\x64-windows\bin\openblas.dll
- mklink c:\projects\fasttransforms\src\fftw3.h c:\tools\vcpkg\installed\x64-windows\include\fftw3.h
- mklink c:\projects\fasttransforms\fftw3.dll c:\tools\vcpkg\installed\x64-windows\bin\fftw3.dll
- mklink c:\projects\fasttransforms\src\mpfr.h c:\tools\vcpkg\installed\x64-windows\include\mpfr.h
- mklink c:\projects\fasttransforms\mpfr.dll c:\tools\vcpkg\installed\x64-windows\bin\mpfr.dll
- mklink c:\projects\fasttransforms\src\gmp.h c:\tools\vcpkg\installed\x64-windows\include\gmp.h
- mklink c:\projects\fasttransforms\src\mpir.h c:\tools\vcpkg\installed\x64-windows\include\mpir.h
- mklink c:\projects\fasttransforms\mpir.dll c:\tools\vcpkg\installed\x64-windows\bin\mpir.dll
- set PATH=c:\tools\vcpkg\installed\x64-windows\bin;%PATH%

matrix:
Expand Down
11 changes: 7 additions & 4 deletions Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,24 @@ else
CFLAGS += -I/usr/local/opt/gmp/include
LDFLAGS += -L/usr/local/opt/gmp/lib
else ifeq ($(UNAME), Windows)
CFLAGS += -Ic:\tools\vcpkg\installed\x64-windows\include\openblas
CFLAGS += -Ic:\tools\vcpkg\installed\x64-windows\include
LDFLAGS += -Lc:\tools\vcpkg\installed\x64-windows\bin
LDFLAGS += -L.
endif
endif

LDLIBS += -lm -lquadmath -fopenmp -lblas -lfftw3
LDLIBS += -lm -lquadmath -fopenmp -lfftw3

ifneq ($(FT_FFTW_WITH_COMBINED_THREADS), 1)
LDLIBS += -lfftw3_threads
endif

LDLIBS += -lmpfr
ifeq ($(UNAME), Linux)
LDLIBS += -lgmp
LDLIBS += -lgmp -lblas
else ifeq ($(UNAME), Darwin)
LDLIBS += -lgmp
LDLIBS += -lgmp -lblas
else ifeq ($(OS), Windows_NT)
LDLIBS += -lmpir
LDLIBS += -lmpir -lopenblas
endif

0 comments on commit 20834eb

Please sign in to comment.