retry

fdintino · Sep 24, 2023 · eb46ea8 · eb46ea8
1 parent 286a5d8
commit eb46ea8
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
@@ -38,11 +38,6 @@ def cmd_rmdir(path: str) -> str:
     return f'rmdir /S /Q "{path}"'
 
 
-def cmd_lib_combine(outfile: str, *libfiles) -> str:
-    params = " ".join(['"%s"' % f for f in libfiles])
-    return "LIB.EXE /OUT:{outfile} {params}".format(outfile=outfile, params=params)
-
-
 def cmd_nmake(
     makefile: str | None = None,
     target: str = "",
@@ -397,22 +392,16 @@ def cmd_msbuild(
             cmd_cd(".."),
             *cmds_cmake(
                 "avif",
-                "-DBUILD_SHARED_LIBS=OFF",
+                "-DBUILD_SHARED_LIBS=ON",
                 "-DAVIF_CODEC_RAV1E=ON",
                 "-DAVIF_CODEC_DAV1D=ON",
                 "-DAVIF_LOCAL_DAV1D=ON",
             ),
             cmd_nmake(),
-            cmd_lib_combine(
-                r"avif_combined.lib",
-                r"avif.lib",
-                r"ext\dav1d\build\src\libdav1d.a",
-            ),
-            cmd_copy(r"avif_combined.lib", r"avif.lib"),
             cmd_mkdir(r"{inc_dir}\avif"),
             cmd_copy(r"include\avif\avif.h", r"{inc_dir}\avif"),
         ],
-        "libs": [r"avif.lib"],
+        "bins": [r"avif.dll"],
     },
 }