diff --git a/CMakeLists.txt b/CMakeLists.txt index 513f6f4b..0d38f4ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,10 @@ project (DirectXTex HOMEPAGE_URL "https://go.microsoft.com/fwlink/?LinkId=248926" LANGUAGES CXX) +if(DEFINED XBOX_CONSOLE_TARGET) + set(CMAKE_CXX_STANDARD_LIBRARIES "") +endif() + option(BUILD_TOOLS "Build tex command-line tools" ON) option(BUILD_SHARED_LIBS "Build DirectXTex as a shared library" OFF) @@ -238,6 +242,8 @@ if(WIN32 AND BUILD_SHARED_LIBS) target_link_libraries(${PROJECT_NAME} PRIVATE xgameplatform.lib xg_xs.lib xmem.lib) elseif(XBOX_CONSOLE_TARGET MATCHES "xboxone") target_link_libraries(${PROJECT_NAME} PRIVATE xgameplatform.lib xg_x.lib xmem.lib) + elseif(XBOX_CONSOLE_TARGET MATCHES "durango") + target_link_libraries(${PROJECT_NAME} PRIVATE kernelx.lib xg_x.lib combase.lib) endif() else() add_library(${PROJECT_NAME} ${LIBRARY_SOURCES} ${LIBRARY_HEADERS}) diff --git a/build/CompilerAndLinker.cmake b/build/CompilerAndLinker.cmake index aa634f95..69c0d138 100644 --- a/build/CompilerAndLinker.cmake +++ b/build/CompilerAndLinker.cmake @@ -200,12 +200,14 @@ if(DEFINED XBOX_CONSOLE_TARGET) message(FATAL_ERROR "Legacy Xbox One XDK required to build for Durango.") endif() list(APPEND COMPILER_DEFINES WINAPI_FAMILY=WINAPI_FAMILY_TV_TITLE _XBOX_ONE _TITLE MONOLITHIC=1) + list(APPEND LINKER_SWITCHES /NODEFAULTLIB:kernel32.lib /NODEFAULTLIB:ole32.lib /NODEFAULTLIB:oldnames.lib) else() CHECK_INCLUDE_FILE_CXX(gxdk.h GXDK_HEADER) if(NOT GXDK_HEADER) message(FATAL_ERROR "Microsoft GDK with Xbox Extensions required to build for Xbox. See https://aka.ms/gdkx") endif() list(APPEND COMPILER_DEFINES WINAPI_FAMILY=WINAPI_FAMILY_GAMES) + list(APPEND LINKER_SWITCHES /NODEFAULTLIB:kernel32.lib /NODEFAULTLIB:oldnames.lib) if(XBOX_CONSOLE_TARGET STREQUAL "scarlett") CHECK_INCLUDE_FILE_CXX(d3d12_xs.h D3D12XS_HEADER) if(NOT D3D12XS_HEADER) diff --git a/build/DirectXTex.rc.in b/build/DirectXTex.rc.in index 270a0384..4dacdce4 100644 --- a/build/DirectXTex.rc.in +++ b/build/DirectXTex.rc.in @@ -1,4 +1,4 @@ -#include +#include VS_VERSION_INFO VERSIONINFO FILEVERSION 1,0,0,0