isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-19 22:01:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes, kinda, for NXDK. needs fixing pls :(

Browse Source
This commit is contained in:
VoxelTek 2025-07-31 12:20:24 +10:00
parent fcd88c2dd5
commit dcefd92c37
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -45,7 +45,7 @@ option(ISLE_BUILD_APP "Build isle application" ON)
option(ISLE_ASAN "Enable Address Sanitizer" OFF) option(ISLE_ASAN "Enable Address Sanitizer" OFF)
option(ISLE_UBSAN "Enable Undefined Behavior Sanitizer" OFF) option(ISLE_UBSAN "Enable Undefined Behavior Sanitizer" OFF)
option(ISLE_WERROR "Treat warnings as errors" OFF) option(ISLE_WERROR "Treat warnings as errors" OFF)
option(ISLE_DEBUG "Enable imgui debug" ON) cmake_dependent_option(ISLE_DEBUG "Enable imgui debug" ON "NOT NXDK" OFF)
cmake_dependent_option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" "${NOT_MINGW}" "WIN32;CMAKE_SIZEOF_VOID_P EQUAL 4" OFF) cmake_dependent_option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" "${NOT_MINGW}" "WIN32;CMAKE_SIZEOF_VOID_P EQUAL 4" OFF)
cmake_dependent_option(ISLE_MINIWIN "Use miniwin" ON "NOT ISLE_USE_DX5" OFF) cmake_dependent_option(ISLE_MINIWIN "Use miniwin" ON "NOT ISLE_USE_DX5" OFF)
cmake_dependent_option(ISLE_EXTENSIONS "Use extensions" ON "NOT ISLE_USE_DX5" OFF) cmake_dependent_option(ISLE_EXTENSIONS "Use extensions" ON "NOT ISLE_USE_DX5" OFF)
@ -186,7 +186,9 @@ target_include_directories(lego1 PUBLIC "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/L
target_include_directories(lego1 PUBLIC "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include>") target_include_directories(lego1 PUBLIC "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include>")
target_include_directories(lego1 PUBLIC "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include/actions>") target_include_directories(lego1 PUBLIC "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include/actions>")
target_link_libraries(lego1 PRIVATE SDL3::SDL3) target_link_libraries(lego1 PRIVATE SDL3::SDL3)
if (!NXDK) # Dunno why, but Ryzee's SDL3 doesn't like "SDL3::Headers" if (NXDK) # Dunno why, but Ryzee's SDL3 doesn't like "SDL3::Headers"
target_link_libraries(lego1 PUBLIC SDL3)
else()
target_link_libraries(lego1 PUBLIC SDL3::Headers) target_link_libraries(lego1 PUBLIC SDL3::Headers)
endif() endif()
target_link_libraries(lego1 PRIVATE $<$<BOOL:${ISLE_USE_DX5}>:DirectX5::DirectX5>) target_link_libraries(lego1 PRIVATE $<$<BOOL:${ISLE_USE_DX5}>:DirectX5::DirectX5>)

9
miniwin/CMakeLists.txt
View File

@ -111,13 +111,8 @@ target_include_directories(miniwin
) )
target_link_libraries(miniwin PUBLIC miniwin-headers) target_link_libraries(miniwin PUBLIC miniwin-headers)
if (NXDK)
target_link_libraries(miniwin PRIVATE ${NXDK_DIR}/lib/libpbkit.lib) target_link_libraries(miniwin PRIVATE SDL3::SDL3)
target_link_libraries(miniwin PRIVATE ${NXDK_DIR}/lib/libSDL3.lib)
target_include_directories(miniwin PRIVATE ${NXDK_DIR}/lib/sdl/SDL3/include)
else()
target_link_libraries(miniwin PRIVATE SDL3::SDL3)
endif()
target_compile_definitions(miniwin PUBLIC ${GRAPHICS_BACKENDS}) target_compile_definitions(miniwin PUBLIC ${GRAPHICS_BACKENDS})

2
miniwin/src/d3drm/backends/software/renderer.cpp
View File

@ -71,7 +71,7 @@ void Direct3DRMSoftwareRenderer::ClearZBuffer()
_mm_storeu_ps(&m_zBuffer[i], inf4); _mm_storeu_ps(&m_zBuffer[i], inf4);
} }
} }
#if defined(__i386__) || defined(_M_IX86) #if (defined(__i386__) || defined(_M_IX86)) && !defined(NXDK)
else if (SDL_HasMMX()) { else if (SDL_HasMMX()) {
const __m64 mm_inf = _mm_set_pi32(0x7F800000, 0x7F800000); const __m64 mm_inf = _mm_set_pi32(0x7F800000, 0x7F800000);
for (; i + 2 <= size; i += 2) { for (; i + 2 <= size; i += 2) {