undef simd for windows

Zilong-Li · Dec 2, 2023 · 791a10f · 791a10f
1 parent 0906ffc
commit 791a10f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/check-release.yaml b/.github/workflows/check-release.yaml
@@ -21,6 +21,7 @@ jobs:
         config:
           - {os: macos-latest,   r: 'release'}
           - {os: windows-latest, r: 'release'}
+          - {os: ubuntu-latest,   r: 'release'}
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
 
     env:

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 && cp -f htscodecs.vcfppR htscodecs.mk && $(MAKE) -f Makefile.win libhts.a && cd ..)
+	(cd ${HTSLIB_DIR} && ./configure && cat config.flags.h >> config.h && $(MAKE) -f Makefile.win libhts.a && cd ..)
 
 
 clean:

diff --git a/src/htslib-1.18/Makefile.win b/src/htslib-1.18/Makefile.win
@@ -145,7 +145,7 @@ HTS_BUILD_POPCNT =
 HTS_BUILD_SSE4_1 =
 
 include htslib_vars.mk
-include htscodecs_bundled.mk
+include htscodecs.mk
 
 # If not using GNU make, you need to copy the version number from version.sh
 # into here.

diff --git a/src/htslib-1.18/config.flags.h b/src/htslib-1.18/config.flags.h
@@ -0,0 +1,5 @@
+#undef HAVE_POPCNT
+#undef HAVE_AVX2
+#undef HAVE_AVX512
+#undef HAVE_SSE4_1
+#undef HAVE_SSSE3
-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 && cp -f htscodecs.vcfppR htscodecs.mk && $(MAKE) -f Makefile.win libhts.a && cd ..)
+    	(cd ${HTSLIB_DIR} && ./configure && cat config.flags.h >> config.h && $(MAKE) -f Makefile.win libhts.a && cd ..)
     clean:
@@ Expand Down @@