otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

re-enable DX11 on 32-bit Windows build

Browse source
This commit is contained in:
tildearrow 2023-08-21 14:30:08 -05:00
parent 94d8076a58
commit 510bcfb56d
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CMakeLists.txt
View file

@ -757,15 +757,11 @@ endif()
if (WITH_RENDER_DX11) if (WITH_RENDER_DX11)
if (WIN32) if (WIN32)
if (SUPPORT_XP) list(APPEND GUI_SOURCES src/gui/render/renderDX11.cpp)
message(FATAL_ERROR "SUPPORT_XP is on. cannot enable DirectX 11 backend.") list(APPEND GUI_SOURCES extern/imgui_patched/backends/imgui_impl_dx11.cpp)
else() list(APPEND DEPENDENCIES_DEFINES HAVE_RENDER_DX11)
list(APPEND GUI_SOURCES src/gui/render/renderDX11.cpp) list(APPEND DEPENDENCIES_LIBRARIES d3d11)
list(APPEND GUI_SOURCES extern/imgui_patched/backends/imgui_impl_dx11.cpp) message(STATUS "UI render backend: DirectX 11")
list(APPEND DEPENDENCIES_DEFINES HAVE_RENDER_DX11)
list(APPEND DEPENDENCIES_LIBRARIES d3d11)
message(STATUS "UI render backend: DirectX 11")
endif()
else() else()
message(FATAL_ERROR "DirectX 11 render backend only for Windows!") message(FATAL_ERROR "DirectX 11 render backend only for Windows!")
endif() endif()

2
scripts/release-win32.sh
View file

@ -15,7 +15,7 @@ fi
cd win32build cd win32build
# TODO: potential Arch-ism? # TODO: potential Arch-ism?
i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type -Werror" -DBUILD_SHARED_LIBS=OFF -DSUPPORT_XP=ON -DWITH_RENDER_DX11=OFF .. || exit 1 i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type -Werror" -DBUILD_SHARED_LIBS=OFF -DSUPPORT_XP=ON -DWITH_RENDER_DX11=ON .. || exit 1
make -j8 || exit 1 make -j8 || exit 1
cd .. cd ..