Skip to content

Fix handling of shader compiler executable by TeamCity #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
filipppavlov wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix handling of shader compiler executable by TeamCity #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4e8388
Add shader compiler executable to the list of files that get lipo'd. …
filipppavlov Jun 29, 2026
19f3ea0
Add shader compiler executable to the list of files that get lipo'd. …
filipppavlov Jun 29, 2026
ed3e507
Merge branch 'fix-tc-executables' of https://github.com/carbonengine/…
filipppavlov Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class UniversalBuild() : BuildType({
param("x64-bin-path", "bin/macOS/x64")
param("arm64-bin-path", "bin/macOS/arm64")
text("file-matchers",
"-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'",
"-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib' -m 'ShaderCompiler*:%system.teamcity.build.workingDir%/shadercompiler/bin'",
label = "lipo-build matchers",
description = """
-m '*.so:lib' to tell the tool to lipo together .so files and output the fat binaries to lib/.
Expand Down
2 changes: 1 addition & 1 deletion .teamcity/_Self.kt/buildTypes/PublishToPerforce.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Publish(perforce_publish_path: String) : BuildType({
select("eve_branch_type", "sandbox", label = "Branch type", description = "The type of branch to publish into", display = ParameterDisplay.PROMPT,
options = listOf("Sandbox" to "sandbox", "Development" to "development", "Release" to "release", "Staging" to "staging", "Stream" to ""))
param("env.TC_PERFORCE_PATH_TO_PUBLISH_INTO", "%perforce_path_to_publish_into%")
param("env.EXECUTABLE_FILENAMES_MATCH", "")
param("env.EXECUTABLE_FILENAMES_MATCH", "ShaderCompiler")

select("reverse.dep.*.env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", display = ParameterDisplay.PROMPT,
options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143"))
Expand Down