Deps: Move build scripts/patches into own directory

This commit is contained in:
Stenzek 2024-07-04 14:52:54 +10:00
parent 69c35c9fcd
commit 82b5772d27
No known key found for this signature in database
15 changed files with 17 additions and 17 deletions

View file

@ -34,19 +34,19 @@ jobs:
path: | path: |
dep/msvc/deps-arm64 dep/msvc/deps-arm64
dep/msvc/deps-x64 dep/msvc/deps-x64
key: deps ${{ hashFiles('scripts/build-dependencies-windows-arm64.bat', 'scripts/build-dependencies-windows-x64.bat') }} key: deps ${{ hashFiles('scripts/deps/build-dependencies-windows-arm64.bat', 'scripts/deps/build-dependencies-windows-x64.bat') }}
- name: Build X64 Dependencies - name: Build X64 Dependencies
if: steps.cache-deps.outputs.cache-hit != 'true' if: steps.cache-deps.outputs.cache-hit != 'true'
env: env:
DEBUG: 0 DEBUG: 0
run: scripts/build-dependencies-windows-x64.bat run: scripts/deps/build-dependencies-windows-x64.bat
- name: Build ARM64 Dependencies - name: Build ARM64 Dependencies
if: steps.cache-deps.outputs.cache-hit != 'true' if: steps.cache-deps.outputs.cache-hit != 'true'
env: env:
DEBUG: 0 DEBUG: 0
run: scripts/build-dependencies-windows-arm64.bat run: scripts/deps/build-dependencies-windows-arm64.bat
- name: Initialize build tag - name: Initialize build tag
shell: cmd shell: cmd
@ -122,19 +122,19 @@ jobs:
path: | path: |
dep/msvc/deps-arm64 dep/msvc/deps-arm64
dep/msvc/deps-x64 dep/msvc/deps-x64
key: deps ${{ hashFiles('scripts/build-dependencies-windows-arm64.bat', 'scripts/build-dependencies-windows-x64.bat') }} key: deps ${{ hashFiles('scripts/deps/build-dependencies-windows-arm64.bat', 'scripts/deps/build-dependencies-windows-x64.bat') }}
- name: Build X64 Dependencies - name: Build X64 Dependencies
if: steps.cache-deps.outputs.cache-hit != 'true' if: steps.cache-deps.outputs.cache-hit != 'true'
env: env:
DEBUG: 0 DEBUG: 0
run: scripts/build-dependencies-windows-x64.bat run: scripts/deps/build-dependencies-windows-x64.bat
- name: Build ARM64 Dependencies - name: Build ARM64 Dependencies
if: steps.cache-deps.outputs.cache-hit != 'true' if: steps.cache-deps.outputs.cache-hit != 'true'
env: env:
DEBUG: 0 DEBUG: 0
run: scripts/build-dependencies-windows-arm64.bat run: scripts/deps/build-dependencies-windows-arm64.bat
- name: Initialize build tag - name: Initialize build tag
shell: cmd shell: cmd
@ -231,11 +231,11 @@ jobs:
uses: actions/cache@v4.0.2 uses: actions/cache@v4.0.2
with: with:
path: ~/deps path: ~/deps
key: deps ${{ hashFiles('scripts/build-dependencies-linux.sh') }} key: deps ${{ hashFiles('scripts/deps/build-dependencies-linux.sh') }}
- name: Build Dependencies - name: Build Dependencies
if: steps.cache-deps.outputs.cache-hit != 'true' if: steps.cache-deps.outputs.cache-hit != 'true'
run: scripts/build-dependencies-linux.sh "$HOME/deps" run: scripts/deps/build-dependencies-linux.sh "$HOME/deps"
- name: Initialize build tag - name: Initialize build tag
run: | run: |
@ -361,11 +361,11 @@ jobs:
uses: actions/cache@v4.0.2 uses: actions/cache@v4.0.2
with: with:
path: ~/deps path: ~/deps
key: deps-mac ${{ hashFiles('scripts/build-dependencies-mac.sh') }} key: deps-mac ${{ hashFiles('scripts/deps/build-dependencies-mac.sh') }}
- name: Build Dependencies - name: Build Dependencies
if: steps.cache-deps-mac.outputs.cache-hit != 'true' if: steps.cache-deps-mac.outputs.cache-hit != 'true'
run: scripts/build-dependencies-mac.sh "$HOME/deps" run: scripts/deps/build-dependencies-mac.sh "$HOME/deps"
- name: Initialize build tag - name: Initialize build tag
run: | run: |

View file

@ -166,7 +166,7 @@ alsa-lib-devel brotli-devel clang cmake dbus-devel egl-wayland-devel extra-cmake
#### Building #### Building
1. Clone the repository: `git clone https://github.com/stenzek/duckstation.git`, `cd duckstation`. 1. Clone the repository: `git clone https://github.com/stenzek/duckstation.git`, `cd duckstation`.
2. Build dependencies. You can save these outside of the tree if you like. This will take a while. `scripts/build-dependencies-linux.sh deps`. 2. Build dependencies. You can save these outside of the tree if you like. This will take a while. `scripts/deps/build-dependencies-linux.sh deps`.
3. Run CMake to configure the build system. Assuming a build subdirectory of `build-release`, run `cmake -B build-release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_PREFIX_PATH="$PWD/deps" -G Ninja`. If you want a release (optimized) build, include `-DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON`. 3. Run CMake to configure the build system. Assuming a build subdirectory of `build-release`, run `cmake -B build-release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_PREFIX_PATH="$PWD/deps" -G Ninja`. If you want a release (optimized) build, include `-DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON`.
4. Compile the source code. For the example above, run `ninja -C build-release` 4. Compile the source code. For the example above, run `ninja -C build-release`
5. Run the binary, located in the build directory under `./build-release/bin/duckstation-qt`. 5. Run the binary, located in the build directory under `./build-release/bin/duckstation-qt`.
@ -179,7 +179,7 @@ Requirements:
1. Clone the repository: `git clone https://github.com/stenzek/duckstation.git`. 1. Clone the repository: `git clone https://github.com/stenzek/duckstation.git`.
2. Build the dependencies. This will take a while. `scripts/build-dependencies-mac.sh deps`. 2. Build the dependencies. This will take a while. `scripts/deps/build-dependencies-mac.sh deps`.
2. Run CMake to configure the build system: `cmake -Bbuild-release -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_PREFIX_PATH="$PWD/deps"`. 2. Run CMake to configure the build system: `cmake -Bbuild-release -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_PREFIX_PATH="$PWD/deps"`.
4. Compile the source code: `cmake --build build-release --parallel`. 4. Compile the source code: `cmake --build build-release --parallel`.
5. Run the binary, located in the build directory under `bin/DuckStation.app`. 5. Run the binary, located in the build directory under `bin/DuckStation.app`.

View file

@ -22,7 +22,7 @@ if defined DEBUG (
pushd %~dp0 pushd %~dp0
set "SCRIPTDIR=%CD%" set "SCRIPTDIR=%CD%"
cd ..\dep\msvc cd ..\..\dep\msvc
mkdir deps-build mkdir deps-build
cd deps-build || goto error cd deps-build || goto error
set "BUILDDIR=%CD%" set "BUILDDIR=%CD%"

View file

@ -22,7 +22,7 @@ if defined DEBUG (
pushd %~dp0 pushd %~dp0
set "SCRIPTDIR=%CD%" set "SCRIPTDIR=%CD%"
cd ..\dep\msvc cd ..\..\dep\msvc
mkdir deps-build mkdir deps-build
cd deps-build || goto error cd deps-build || goto error
set "BUILDDIR=%CD%" set "BUILDDIR=%CD%"

View file

@ -37,7 +37,7 @@
}, },
{ {
"type": "patch", "type": "patch",
"path": "../../shaderc-changes.patch" "path": "../../deps/shaderc-changes.patch"
} }
], ],
"cleanup": [ "cleanup": [

View file

@ -28,7 +28,7 @@
}, },
{ {
"type": "patch", "type": "patch",
"path": "../../spirv-cross-changes.patch" "path": "../../deps/spirv-cross-changes.patch"
} }
], ],
"cleanup": [ "cleanup": [

View file

@ -25,7 +25,7 @@
}, },
{ {
"type": "patch", "type": "patch",
"path": "../../cpuinfo-changes.patch" "path": "../../deps/cpuinfo-changes.patch"
} }
], ],
"cleanup": [ "cleanup": [