mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-02 17:46:22 +03:00
819ae9a55f
The basic implementation of VCPKG as a beta version. By default will be disabled. To enable needs to remove CMake cache and reconfigure with BUILD_USE_VCPKG flag to ON. The current version do not support whole list of 3rd-party, only limited. and VCPKG_ROOT reachable as a CMake or env variable Add vcpkg support for FFmpeg and Jemalloc, including configuration files and patches.
26 lines
828 B
Diff
26 lines
828 B
Diff
diff --git a/configure b/configure
|
|
index 89af70d..405680e 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -5480,15 +5480,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 x86_32 && check_ldflags -LARGEADDRESSAWARE
|
|
shlibdir_default="$bindir_default"
|
|
+ LIBPREF=""
|
|
+ LIBSUF=".lib"
|
|
SLIBPREF=""
|
|
SLIBSUF=".dll"
|
|
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
|