AnotherFoxGuy/ror-conan-recipes
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

🔧 Use directx-sdk from conan package

Browse Source
This commit is contained in:
Edgar 2022-03-23 12:17:25 +01:00
parent e0a8ab9f5b
commit d11b528f71
No known key found for this signature in database
GPG Key ID: 17D930BB616061A5
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/conan-pkg.yml vendored
View File

@ -50,14 +50,6 @@ jobs:
if: startsWith(matrix.config.os, 'ubuntu')
run: conan profile update settings.compiler.libcxx=libstdc++11 default
- name: Install DX9 SDK
if: startsWith(matrix.config.os, 'windows')
shell: cmake -P {0}
run: |
file(MAKE_DIRECTORY $ENV{DXSDK_DIR})
file(DOWNLOAD https://cdn.anotherfoxguy.com/DirectX-SDK.zip "$ENV{TMP}/DirectX.zip" SHOW_PROGRESS)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf "$ENV{TMP}/DirectX.zip" WORKING_DIRECTORY "$ENV{DXSDK_DIR}")
- name: Enable Developer Command Prompt
uses: ilammy/msvc-dev-cmd@v1.10.0

8
ogre/1.11/conanfile.py
View File

@ -15,6 +15,9 @@ class OGREConan(ConanFile):
for req in self.conan_data["requirements"]:
self.requires(req)
if os_info.is_windows:
self.requires("directx-sdk/9.0@anotherfoxguy/stable")
def system_requirements(self):
if os_info.is_linux:
if os_info.with_apt:
@ -28,6 +31,11 @@ class OGREConan(ConanFile):
def source(self):
tools.get(**self.conan_data["sources"][self.version], strip_root=True)
tools.replace_in_file(
"CMake/Dependencies.cmake",
"find_package(DirectX)",
"find_package(DirectX9)",
)
for patch in self.conan_data["patches"][self.version]:
tools.patch(**patch)

8
ogre/1.12/conanfile.py
View File

@ -21,6 +21,9 @@ class OGREConan(ConanFile):
for req in self.conan_data["requirements"]:
self.requires(req)
if os_info.is_windows:
self.requires("directx-sdk/9.0@anotherfoxguy/stable")
def system_requirements(self):
if os_info.is_linux:
if os_info.with_apt:
@ -30,6 +33,11 @@ class OGREConan(ConanFile):
def source(self):
tools.get(**self.conan_data["sources"][self.version], strip_root=True)
tools.replace_in_file(
"CMake/Dependencies.cmake",
"find_package(DirectX)",
"find_package(DirectX9)",
)
for patch in self.conan_data["patches"][self.version]:
tools.patch(**patch)