HAVE_DRAND48 0 on windows

Zilong-Li · Dec 3, 2023 · 37af556 · 37af556
1 parent 07eb5f5
commit 37af556
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -14,7 +14,7 @@ $(SHLIB) : HTSLIB
 # LDFLAGS=$(shell "R CMD config LDFLAGS")
 
 HTSLIB:
-	cd ${HTSLIB_DIR} && ./configure && sed -i -e 's/HAVE_AVX2 1/HAVE_AVX2 0/' -e 's/HAVE_AVX512 1/HAVE_AVX512 0/' -e 's/HAVE_POPCNT 1/HAVE_POPCNT 0/' -e 's/HAVE_SSSE3 1/HAVE_SSSE3 0/' -e '/HAVE_SSE4_1 1/HAVE_SSE4_1 0/' config.h && $(MAKE) -f Makefile.win libhts.a && cd ..
+	cd ${HTSLIB_DIR} && $(MAKE) -f Makefile.win libhts.a && cd ..
 
 
 clean:

diff --git a/src/htslib-1.18/Makefile.win b/src/htslib-1.18/Makefile.win
@@ -132,9 +132,6 @@ srcdir = .
 srcprefix =
 HTSPREFIX =
 
-include htslib_vars.mk
-include htscodecs.mk
-
 # Flags for SIMD code
 HTS_CFLAGS_AVX2 =
 HTS_CFLAGS_AVX512 =
@@ -147,6 +144,9 @@ HTS_BUILD_SSSE3 =
 HTS_BUILD_POPCNT =
 HTS_BUILD_SSE4_1 =
 
+include htslib_vars.mk
+include htscodecs.mk
+
 # If not using GNU make, you need to copy the version number from version.sh
 # into here.
 PACKAGE_VERSION := $(shell $(srcdir)/version.sh)
@@ -287,7 +287,6 @@ config.h:
 	echo '#ifndef __APPLE__' >> $@
 	echo '#define HAVE_LZMA_H 1' >> $@
 	echo '#endif' >> $@
-	echo '#define HAVE_DRAND48 1' >> $@
 	echo '#define HAVE_LIBCURL 1' >> $@
 	if [ "x$(HTS_BUILD_POPCNT)" != "x" ] && \
 	   [ "x$(HTS_BUILD_SSE4_1)" != "x" ] && \
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ $(SHLIB) : HTSLIB @@
     # LDFLAGS=$(shell "R CMD config LDFLAGS")
     HTSLIB:
-    	cd ${HTSLIB_DIR} && ./configure && sed -i -e 's/HAVE_AVX2 1/HAVE_AVX2 0/' -e 's/HAVE_AVX512 1/HAVE_AVX512 0/' -e 's/HAVE_POPCNT 1/HAVE_POPCNT 0/' -e 's/HAVE_SSSE3 1/HAVE_SSSE3 0/' -e '/HAVE_SSE4_1 1/HAVE_SSE4_1 0/' config.h && $(MAKE) -f Makefile.win libhts.a && cd ..
+    	cd ${HTSLIB_DIR} && $(MAKE) -f Makefile.win libhts.a && cd ..
     clean:
@@ Expand Down @@