fix simd

Zilong-Li · Dec 2, 2023 · 05c9e61 · 05c9e61
1 parent 64d9cdb
commit 05c9e61
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 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} && ./configure && $(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,6 +132,9 @@ srcdir = .
 srcprefix =
 HTSPREFIX =
 
+include htslib_vars.mk
+include htscodecs.mk
+
 # Flags for SIMD code
 HTS_CFLAGS_AVX2 =
 HTS_CFLAGS_AVX512 =
@@ -144,9 +147,6 @@ 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)

diff --git a/src/htslib-1.18/htscodecs.mk b/src/htslib-1.18/htscodecs.mk
diff --git a/src/htslib-1.18/htscodecs.mk b/src/htslib-1.18/htscodecs.mk
@@ -0,0 +1 @@
+htscodecs_bundled.mk
-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} && ./configure && $(MAKE) -f Makefile.win libhts.a && cd ..)
     clean:
@@ Expand Down @@