openh264: modernize #6996
Merged
openh264: modernize #6996
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
SpaceIm
reviewed
Aug 25, 2021
Comment on lines
111
to
141
| if self.settings.compiler == "Visual Studio": | ||
| env_build.flags.extend(["-nologo", "-{}".format(self.settings.compiler.runtime)]) | ||
| env_build.link_flags.insert(0, "-link") | ||
| autotools.flags.extend(["-nologo", "-{}".format(self.settings.compiler.runtime)]) | ||
| autotools.link_flags.insert(0, "-link") | ||
| if tools.Version(self.settings.compiler.version) >= "12": | ||
| autotools.flags.append("-FS") | ||
| elif self.settings.compiler in ("apple-clang",): | ||
| if self.settings.arch in ("armv8",): | ||
| autotools.link_flags.append("-arch arm64") | ||
| if self.options.shared: | ||
| env_build.fpic = True | ||
| args.extend(["{}={}".format(k, v) for k,v in env_build.vars.items()]) | ||
| autotools.fpic = True | ||
| args.extend(["{}={}".format(k, v) for k,v in autotools.vars.items()]) | ||
|
|
||
| if self.settings.compiler == "Visual Studio": | ||
| args.append("OS=msvc") | ||
| env_build.flags.append("-FS") | ||
| autotools.flags.append("-FS") | ||
| else: | ||
| if self.settings.os == "Windows": | ||
| args.append("OS=mingw_nt") | ||
| if self.settings.os == "Android": | ||
| libcxx = str(self.settings.compiler.libcxx) | ||
| stl_lib = "$(NDKROOT)/sources/cxx-stl/llvm-libc++/libs/$(APP_ABI)/lib%s " % ("c++_static.a" if libcxx == "c++_static" else "c++_shared.so") \ | ||
| stl_lib = "$(NDKROOT)/sources/cxx-stl/llvm-libc++/libs/$(APP_ABI)/lib{}".format("c++_static.a" if libcxx == "c++_static" else "c++_shared.so") \ | ||
| + "$(NDKROOT)/sources/cxx-stl/llvm-libc++/libs/$(APP_ABI)/libc++abi.a" | ||
| ndk_home = os.environ["ANDROID_NDK_HOME"] | ||
| args.extend([ | ||
| "NDKLEVEL=%s" % str(self.settings.os.api_level), | ||
| "STL_LIB=%s" % stl_lib, | ||
| "NDKLEVEL={}".format(self.settings.os.api_level), | ||
| "STL_LIB={}".format(stl_lib), | ||
| "OS=android", | ||
| "NDKROOT=%s" % ndk_home, # not NDK_ROOT here | ||
| "TARGET=%s" % self._android_target, | ||
| "NDKROOT={}".format(ndk_home), # not NDK_ROOT here | ||
| "TARGET={}".format(self._android_target), | ||
| "CCASFLAGS=$(CFLAGS) -fno-integrated-as", | ||
| ]) |
There was a problem hiding this comment.
this block is confusing, there are redundant logics.
prince-chrismc
approved these changes
Aug 28, 2021
SSE4
approved these changes
Aug 29, 2021
uilianries
approved these changes
Aug 30, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Specify library name and version: openh264/all
For conan-io/hooks#320
conan-center hook activated.