a3x
/
re3
mirror of https://git.rip/DMCA_FUCKER/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes for lcs conan

This commit is contained in:
Filip Gawin 2021-01-16 01:51:48 +01:00
parent d2fac78413
commit 34942b5af3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
conanfile.py
View File

@ -5,8 +5,8 @@ import shutil
import textwrap import textwrap
class ReVCConan(ConanFile): class ReLCSConan(ConanFile):
name = "reVC" name = "reLCS"
version = "master" version = "master"
license = "???" # FIXME: https://github.com/GTAmodding/re3/issues/794 license = "???" # FIXME: https://github.com/GTAmodding/re3/issues/794
settings = "os", "arch", "compiler", "build_type" settings = "os", "arch", "compiler", "build_type"
@ -69,10 +69,10 @@ class ReVCConan(ConanFile):
raise ConanInvalidConfiguration("Only `glfw` is supported as gl3_gfxlib.") raise ConanInvalidConfiguration("Only `glfw` is supported as gl3_gfxlib.")
#if not self.options.with_opus: #if not self.options.with_opus:
# if not self.options["libsndfile"].with_external_libs: # if not self.options["libsndfile"].with_external_libs:
# raise ConanInvalidConfiguration("reVC with opus support requires a libsndfile built with external libs (=ogg/flac/opus/vorbis)") # raise ConanInvalidConfiguration("reLCS with opus support requires a libsndfile built with external libs (=ogg/flac/opus/vorbis)")
@property @property
def _reVC_audio(self): def _reLCS_audio(self):
return { return {
"miles": "MSS", "miles": "MSS",
"openal": "OAL", "openal": "OAL",
@ -111,16 +111,16 @@ class ReVCConan(ConanFile):
include("{}/conanbuildinfo.cmake") include("{}/conanbuildinfo.cmake")
conan_basic_setup(TARGETS NO_OUTPUT_DIRS) conan_basic_setup(TARGETS NO_OUTPUT_DIRS)
add_subdirectory("{}" reVC) add_subdirectory("{}" reLCS)
""").format(self.install_folder.replace("\\", "/"), """).format(self.install_folder.replace("\\", "/"),
self.source_folder.replace("\\", "/"))) self.source_folder.replace("\\", "/")))
except FileNotFoundError: except FileNotFoundError:
pass pass
cmake = CMake(self) cmake = CMake(self)
cmake.definitions["REVC_AUDIO"] = self._reVC_audio cmake.definitions["RELCS_AUDIO"] = self._reLCS_audio
cmake.definitions["REVC_WITH_OPUS"] = self.options.with_opus cmake.definitions["RELCS_WITH_OPUS"] = self.options.with_opus
cmake.definitions["REVC_INSTALL"] = True cmake.definitions["RELCS_INSTALL"] = True
cmake.definitions["REVC_VENDORED_LIBRW"] = False cmake.definitions["RELCS_VENDORED_LIBRW"] = False
env = {} env = {}
if self._os_is_playstation2: if self._os_is_playstation2:
cmake.definitions["CMAKE_TOOLCHAIN_FILE"] = self.deps_user_info["ps2dev-cmaketoolchain"].cmake_toolchain_file cmake.definitions["CMAKE_TOOLCHAIN_FILE"] = self.deps_user_info["ps2dev-cmaketoolchain"].cmake_toolchain_file