From 4a0a8403d28acb82838481082db7a316ae218779 Mon Sep 17 00:00:00 2001 From: Chris Piker Date: Sun, 5 Nov 2023 23:42:33 -0600 Subject: [PATCH] Adjust win11 install under conda --- buildfiles/Windows.mak | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildfiles/Windows.mak b/buildfiles/Windows.mak index 086dcc7..05d6221 100644 --- a/buildfiles/Windows.mak +++ b/buildfiles/Windows.mak @@ -14,9 +14,11 @@ TARG=das2.3 INC=/I . /I $(LIBRARY_INC) CFLAGS=$(CFLAGS) /DEBUG /DWISDOM_FILE=C:/ProgramData/fftw3/wisdom.dat $(INC) +# Deal with differences from building under anaconda ED=$(LIBRARY_LIB) !if defined(CONDA_BUILD_STATE) EXPAT_LIB=$(ED)\libexpat.lib +INSTALL_PREFIX:=$(PREFIX) !else EXPAT_LIB=$(ED)\libexpatMD.lib !endif