Skip to content

S
swiftshader
Commit f0033328 by Nicolas Capens Committed by Nicolas Capens
Options

Fix version script renames

https://swiftshader-review.googlesource.com/c/SwiftShader/+/35630 renamed the version scripts with corresponding changes in CMake, but other build files were overlooked. Bug: b/139189696 Change-Id: Ib6354e0fb4f62d1e7f4d4f335d03b45ad205c87e Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/35808 Presubmit-Ready: Nicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarBen Clayton <bclayton@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com>
parent 2c99cf6b
Showing with 11 additions and 11 deletions
build/Visual Studio 15 2017 Win64/libvk_swiftshader.vcxproj
...@@ -113,7 +113,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command> ...@@ -113,7 +113,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ImportLibrary>$(SolutionDir)build/Visual Studio 15 2017 Win64/Debug/libvk_swiftshader.lib</ImportLibrary> <ImportLibrary>$(SolutionDir)build/Visual Studio 15 2017 Win64/Debug/libvk_swiftshader.lib</ImportLibrary>
<ModuleDefinitionFile>$(SolutionDir)src/Vulkan/libvk_swiftshader.def</ModuleDefinitionFile> <ModuleDefinitionFile>$(SolutionDir)src/Vulkan/vk_swiftshader.def</ModuleDefinitionFile>
<ProgramDataBaseFile>$(SolutionDir)build/Visual Studio 15 2017 Win64/Debug/libvk_swiftshader.pdb</ProgramDataBaseFile> <ProgramDataBaseFile>$(SolutionDir)build/Visual Studio 15 2017 Win64/Debug/libvk_swiftshader.pdb</ProgramDataBaseFile>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
</Link> </Link>
...@@ -180,7 +180,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command> ...@@ -180,7 +180,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<ImportLibrary>$(SolutionDir)build/Visual Studio 15 2017 Win64/Release/libvk_swiftshader.lib</ImportLibrary> <ImportLibrary>$(SolutionDir)build/Visual Studio 15 2017 Win64/Release/libvk_swiftshader.lib</ImportLibrary>
<ModuleDefinitionFile>$(SolutionDir)src/Vulkan/libvk_swiftshader.def</ModuleDefinitionFile> <ModuleDefinitionFile>$(SolutionDir)src/Vulkan/vk_swiftshader.def</ModuleDefinitionFile>
<ProgramDataBaseFile>$(SolutionDir)build/Visual Studio 15 2017 Win64/Release/libvk_swiftshader.pdb</ProgramDataBaseFile> <ProgramDataBaseFile>$(SolutionDir)build/Visual Studio 15 2017 Win64/Release/libvk_swiftshader.pdb</ProgramDataBaseFile>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
</Link> </Link>
......
src/Android.bp
...@@ -548,7 +548,7 @@ cc_defaults { ...@@ -548,7 +548,7 @@ cc_defaults {
local_include_dirs: [ "Vulkan" ], local_include_dirs: [ "Vulkan" ],
version_script: "Vulkan/libvk_swiftshader.lds", version_script: "Vulkan/vk_swiftshader.lds",
target: { target: {
android: { android: {
......
src/Vulkan/BUILD.gn
...@@ -108,7 +108,7 @@ swiftshader_shared_library("swiftshader_libvulkan") { ...@@ -108,7 +108,7 @@ swiftshader_shared_library("swiftshader_libvulkan") {
"Vulkan.rc", "Vulkan.rc",
"VulkanPlatform.h", "VulkanPlatform.h",
"libVulkan.cpp", "libVulkan.cpp",
"libvk_swiftshader.def", "vk_swiftshader.def",
"main.cpp", "main.cpp",
"resource.h", "resource.h",
] ]
...@@ -122,14 +122,14 @@ swiftshader_shared_library("swiftshader_libvulkan") { ...@@ -122,14 +122,14 @@ swiftshader_shared_library("swiftshader_libvulkan") {
ldflags = [ ldflags = [
"-Wl,-install_name,@rpath/libvk_swiftshader.dylib", "-Wl,-install_name,@rpath/libvk_swiftshader.dylib",
"-Wl,-exported_symbols_list," + "-Wl,-exported_symbols_list," +
rebase_path("libvk_swiftshader.exports", root_build_dir), rebase_path("vk_swiftshader.exports", root_build_dir),
] ]
} else if (is_linux || is_fuchsia) { } else if (is_linux || is_fuchsia) {
inputs = [ inputs = [
"libvk_swiftshader.lds", "vk_swiftshader.lds",
] ]
ldflags = [ "-Wl,--version-script=" + ldflags = [ "-Wl,--version-script=" +
rebase_path("libvk_swiftshader.lds", root_build_dir) ] rebase_path("vk_swiftshader.lds", root_build_dir) ]
} }
deps = [ deps = [
......
src/Vulkan/vulkan.vcxproj
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<Link> <Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<ModuleDefinitionFile>libvk_swiftshader.def</ModuleDefinitionFile> <ModuleDefinitionFile>vk_swiftshader.def</ModuleDefinitionFile>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
...@@ -98,7 +98,7 @@ IF EXIST "$(SolutionDir)..\deqp\build\external\vulkancts\modules\vulkan\Release" ...@@ -98,7 +98,7 @@ IF EXIST "$(SolutionDir)..\deqp\build\external\vulkancts\modules\vulkan\Release"
<DisableSpecificWarnings>4267</DisableSpecificWarnings> <DisableSpecificWarnings>4267</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<ModuleDefinitionFile>libvk_swiftshader.def</ModuleDefinitionFile> <ModuleDefinitionFile>vk_swiftshader.def</ModuleDefinitionFile>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
...@@ -292,7 +292,7 @@ IF EXIST "$(SolutionDir)..\deqp\build\external\vulkancts\modules\vulkan\Release" ...@@ -292,7 +292,7 @@ IF EXIST "$(SolutionDir)..\deqp\build\external\vulkancts\modules\vulkan\Release"
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="libvk_swiftshader.def" /> <None Include="vk_swiftshader.def" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="Vulkan.rc" /> <ResourceCompile Include="Vulkan.rc" />
......
src/Vulkan/vulkan.vcxproj.filters
...@@ -524,7 +524,7 @@ ...@@ -524,7 +524,7 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="libvk_swiftshader.def" /> <None Include="vk_swiftshader.def" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="Vulkan.rc"> <ResourceCompile Include="Vulkan.rc">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment