Skip to content

Commit b68ca18

Browse files
committed
Fix durango
1 parent 7daacf3 commit b68ca18

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ project (DirectXTex
1515
HOMEPAGE_URL "https://go.microsoft.com/fwlink/?LinkId=248926"
1616
LANGUAGES CXX)
1717

18+
if(DEFINED XBOX_CONSOLE_TARGET)
19+
set(CMAKE_CXX_STANDARD_LIBRARIES "")
20+
endif()
21+
1822
option(BUILD_TOOLS "Build tex command-line tools" ON)
1923

2024
option(BUILD_SHARED_LIBS "Build DirectXTex as a shared library" OFF)
@@ -238,6 +242,8 @@ if(WIN32 AND BUILD_SHARED_LIBS)
238242
target_link_libraries(${PROJECT_NAME} PRIVATE xgameplatform.lib xg_xs.lib xmem.lib)
239243
elseif(XBOX_CONSOLE_TARGET MATCHES "xboxone")
240244
target_link_libraries(${PROJECT_NAME} PRIVATE xgameplatform.lib xg_x.lib xmem.lib)
245+
elseif(XBOX_CONSOLE_TARGET MATCHES "durango")
246+
target_link_libraries(${PROJECT_NAME} PRIVATE kernelx.lib xg_x.lib combase.lib)
241247
endif()
242248
else()
243249
add_library(${PROJECT_NAME} ${LIBRARY_SOURCES} ${LIBRARY_HEADERS})

build/CompilerAndLinker.cmake

+2
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,14 @@ if(DEFINED XBOX_CONSOLE_TARGET)
200200
message(FATAL_ERROR "Legacy Xbox One XDK required to build for Durango.")
201201
endif()
202202
list(APPEND COMPILER_DEFINES WINAPI_FAMILY=WINAPI_FAMILY_TV_TITLE _XBOX_ONE _TITLE MONOLITHIC=1)
203+
list(APPEND LINKER_SWITCHES /NODEFAULTLIB:kernel32.lib /NODEFAULTLIB:ole32.lib /NODEFAULTLIB:oldnames.lib)
203204
else()
204205
CHECK_INCLUDE_FILE_CXX(gxdk.h GXDK_HEADER)
205206
if(NOT GXDK_HEADER)
206207
message(FATAL_ERROR "Microsoft GDK with Xbox Extensions required to build for Xbox. See https://aka.ms/gdkx")
207208
endif()
208209
list(APPEND COMPILER_DEFINES WINAPI_FAMILY=WINAPI_FAMILY_GAMES)
210+
list(APPEND LINKER_SWITCHES /NODEFAULTLIB:kernel32.lib /NODEFAULTLIB:oldnames.lib)
209211
if(XBOX_CONSOLE_TARGET STREQUAL "scarlett")
210212
CHECK_INCLUDE_FILE_CXX(d3d12_xs.h D3D12XS_HEADER)
211213
if(NOT D3D12XS_HEADER)

build/DirectXTex.rc.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <winres.h>
1+
#include <winver.h>
22

33
VS_VERSION_INFO VERSIONINFO
44
FILEVERSION 1,0,0,0

0 commit comments

Comments
 (0)