mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-04 06:29:17 +08:00
1b4d69f302
* [amd-amf] Update to 1.4.29 * [ffnvcodec] Update to 11.1.5.2 * [mfx-dispatch] Fix pkgconfig * [ffmpeg] Update to 6.0 * update versions * [amd-amd] Fix merge * Update ffmpeg.json * ffmpeg: Remove libpng dependency. Ffmpeg doesnt have a libpng dependency. All thats needed for png support is zlib which has its own option already * Update ffmpeg.json * [ignition-common3] patch for ffmpeg3 * [freerdp] Update to 2.11.1 * Revert "Merge pull request #1 from autoantwort/ffmpeg" This reverts commitb52416c67d, reversing changes made to8fdd44e901. * Update ffmpeg.json * Update ffmpeg.json --------- Co-authored-by: Leander Schulten <Leander.Schulten@rwth-aachen.de>
26 lines
826 B
Diff
26 lines
826 B
Diff
diff --git a/configure b/configure
|
|
index 34c2adb..1c8008a 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -5631,15 +5631,17 @@ case $target_os in
|
|
;;
|
|
win32|win64)
|
|
disable symver
|
|
- if enabled shared; then
|
|
+# if enabled shared; then
|
|
# Link to the import library instead of the normal static library
|
|
# for shared libs.
|
|
LD_LIB='%.lib'
|
|
# Cannot build both shared and static libs with MSVC or icl.
|
|
- disable static
|
|
- fi
|
|
+# disable static
|
|
+# fi
|
|
! enabled small && test_cmd $windres --version && enable gnu_windres
|
|
enabled x86_32 && check_ldflags -LARGEADDRESSAWARE
|
|
shlibdir_default="$bindir_default"
|
|
+ LIBPREF=""
|
|
+ LIBSUF=".lib"
|
|
SLIBPREF=""
|
|
SLIBSUF=".dll"
|