Skip to content

Commit e5ccc85

Browse files
authored
Build fixes part 2 (#20)
* Fix Windows build using variables that no longer exist * Fix plume not finding correct SDL2
1 parent 9a6413e commit e5ccc85

3 files changed

Lines changed: 2 additions & 6 deletions

File tree

MarathonRecomp/gpu/video.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1872,10 +1872,6 @@ bool Video::CreateHostDevice(const char *sdlVideoDriver)
18721872
continue;
18731873
}
18741874
}
1875-
1876-
// Hardware resolve seems to be completely bugged on Intel D3D12 drivers.
1877-
g_hardwareResolve = (deviceDescription.vendor != RenderDeviceVendor::INTEL);
1878-
g_hardwareDepthResolve = (deviceDescription.vendor != RenderDeviceVendor::INTEL);
18791875
}
18801876

18811877
g_backend = (interfaceFunction == CreateVulkanInterfaceWrapper) ? Backend::VULKAN : Backend::D3D12;

thirdparty/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ set(SDL2MIXER_WAVPACK OFF)
1818
add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/msdf-atlas-gen")
1919
add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/nativefiledialog-extended")
2020
add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/o1heap")
21-
add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/plume")
2221
add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/SDL")
2322
add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/SDL_mixer")
23+
add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/plume")
2424

2525
if (APPLE)
2626
add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/MoltenVK")

thirdparty/plume

0 commit comments

Comments
 (0)