Revert "re-enable DX11 on 32-bit Windows build"
This reverts commit 510bcfb56d
.
This commit is contained in:
parent
2c99bc9593
commit
338b67da9c
|
@ -760,11 +760,15 @@ endif()
|
||||||
|
|
||||||
if (WITH_RENDER_DX11)
|
if (WITH_RENDER_DX11)
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
list(APPEND GUI_SOURCES src/gui/render/renderDX11.cpp)
|
if (SUPPORT_XP)
|
||||||
list(APPEND GUI_SOURCES extern/imgui_patched/backends/imgui_impl_dx11.cpp)
|
message(FATAL_ERROR "SUPPORT_XP is on. cannot enable DirectX 11 backend.")
|
||||||
list(APPEND DEPENDENCIES_DEFINES HAVE_RENDER_DX11)
|
else()
|
||||||
list(APPEND DEPENDENCIES_LIBRARIES d3d11)
|
list(APPEND GUI_SOURCES src/gui/render/renderDX11.cpp)
|
||||||
message(STATUS "UI render backend: DirectX 11")
|
list(APPEND GUI_SOURCES extern/imgui_patched/backends/imgui_impl_dx11.cpp)
|
||||||
|
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()
|
||||||
|
|
|
@ -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" -DBUILD_SHARED_LIBS=OFF -DSUPPORT_XP=ON -DWITH_RENDER_DX11=ON .. || 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" -DBUILD_SHARED_LIBS=OFF -DSUPPORT_XP=ON -DWITH_RENDER_DX11=OFF .. || exit 1
|
||||||
make -j8 || exit 1
|
make -j8 || exit 1
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
|
|
Loading…
Reference in New Issue