compiles on xbox one

CMakeLists.txt

@@ -11,7 +11,11 @@ endif()
 set(SENTRY_TOOLCHAINS_DIR "${CMAKE_CURRENT_LIST_DIR}/toolchains")
 if ("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "Gaming.Xbox.Scarlett.x64")
 	include("${SENTRY_TOOLCHAINS_DIR}/xbox/CMakeGDKScarlett.cmake")
-	set(SCARLETT TRUE)
+	set(XBOX TRUE)
+endif()
+if ("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "Gaming.Xbox.XboxOne.x64")
+	include("${SENTRY_TOOLCHAINS_DIR}/xbox/CMakeGDKXboxOne.cmake")
+	set(XBOX TRUE)
 endif()
 
 #read sentry-native version
@@ -77,7 +81,7 @@ option(SENTRY_BUILD_TESTS "Build sentry-native tests" "${SENTRY_MAIN_PROJECT}")
 option(SENTRY_BUILD_EXAMPLES "Build sentry-native example(s)" "${SENTRY_MAIN_PROJECT}")
 option(SENTRY_BUILD_BENCHMARKS "Build sentry-native benchmarks" OFF)
 
-if(NOT SCARLETT)
+if(NOT XBOX)
 	option(SENTRY_LINK_PTHREAD "Link platform threads library" ON)
 	if(SENTRY_LINK_PTHREAD)
 		set(THREADS_PREFER_PTHREAD_FLAG ON)
@@ -167,7 +171,7 @@ option(SENTRY_ENABLE_INSTALL "Enable sentry installation" "${SENTRY_MAIN_PROJECT
 if(MSVC AND CMAKE_GENERATOR_TOOLSET MATCHES "_xp$")
 	message(WARNING "Crashpad is not supported for MSVC with XP toolset. Default backend was switched to 'breakpad'")
 	set(SENTRY_DEFAULT_BACKEND "breakpad")
-elseif(MSVC AND SCARLETT)
+elseif(MSVC AND XBOX)
 	set(SENTRY_DEFAULT_BACKEND "breakpad")
 elseif((APPLE AND NOT IOS) OR WIN32 OR LINUX)
 	set(SENTRY_DEFAULT_BACKEND "crashpad")
@@ -284,7 +288,7 @@ endfunction()
 # ===== sentry library =====
 
 add_library(sentry ${SENTRY_LIBRARY_TYPE} "${PROJECT_SOURCE_DIR}/vendor/mpack.c")
-if (SCARLETT)
+if (XBOX)
 	set_target_properties(sentry PROPERTIES VS_USER_PROPS gdk_build.props)
 endif()
 target_sources(sentry PRIVATE "${PROJECT_SOURCE_DIR}/include/sentry.h")
@@ -379,7 +383,7 @@ if(MSVC)
 
 	# using `/Wall` is not feasible, as it spews tons of warnings from windows headers
 	# supress C5105, introduced in VS 16.8, which breaks on the Windows SDKs own `winbase.h` header
-	if (SCARLETT)
+	if (XBOX)
 		target_compile_options(sentry PRIVATE $<BUILD_INTERFACE:/W4 /wd5105 /wd4115>)
 	else()
 		target_compile_options(sentry PRIVATE $<BUILD_INTERFACE:/W4 /wd5105>)
@@ -484,7 +488,7 @@ if(ANDROID)
 elseif(LINUX)
 	set(_SENTRY_PLATFORM_LIBS "dl" "rt")
 elseif(WIN32)
-	if (SCARLETT)
+	if (XBOX)
 		set(_SENTRY_PLATFORM_LIBS "version")
 	else()
 		set(_SENTRY_PLATFORM_LIBS "dbghelp" "shlwapi" "version")
@@ -496,7 +500,7 @@ if(SENTRY_TRANSPORT_WINHTTP)
 endif()
 
 # handle platform threads library
-if(NOT SCARLETT)
+if(NOT XBOX)
 	if(SENTRY_LINK_PTHREAD)
 		list(APPEND _SENTRY_PLATFORM_LIBS "Threads::Threads")
 	endif()
@@ -701,7 +705,7 @@ endif()
 
 if(SENTRY_BUILD_EXAMPLES)
 	add_executable(sentry_example examples/example.c)
-	if(SCARLETT)
+	if(XBOX)
 		set_target_properties(sentry_example PROPERTIES VS_USER_PROPS gdk_build.props)
 	endif()
 	target_link_libraries(sentry_example PRIVATE sentry)

include/sentry.h

@@ -36,8 +36,8 @@ extern "C" {
 /* common platform detection */
 #ifdef _WIN32
 #    define SENTRY_PLATFORM_WINDOWS
-#    ifdef _GAMING_XBOX_SCARLETT
-#        define SENTRY_PLATFORM_XBOX_SCARLETT
+#    ifdef _GAMING_XBOX_SCARLETT || _GAMING_XBOX_XBOXONE
+#        define SENTRY_PLATFORM_XBOX
 #    endif
 #elif defined(__APPLE__)
 #    include <TargetConditionals.h>
@@ -72,7 +72,7 @@ extern "C" {
 #ifndef SENTRY_SDK_NAME
 #    if defined(SENTRY_PLATFORM_ANDROID)
 #        define SENTRY_SDK_NAME "sentry.native.android"
-#    elif defined(SENTRY_PLATFORM_XBOX_SCARLETT)
+#    elif defined(SENTRY_PLATFORM_XBOX)
 #        define SENTRY_SDK_NAME "sentry.native.xbox"
 #    else
 #        define SENTRY_SDK_NAME "sentry.native"

src/modulefinder/sentry_modulefinder_windows.c

@@ -4,7 +4,7 @@
 #include "sentry_uuid.h"
 #include "sentry_value.h"
 
-#ifndef SENTRY_PLATFORM_XBOX_SCARLETT
+#ifndef SENTRY_PLATFORM_XBOX
 #    include <dbghelp.h>
 #else
 #    include <Psapi.h>
@@ -95,7 +95,7 @@ extract_pdb_info(uintptr_t module_addr, sentry_value_t module)
 static void
 load_modules(void)
 {
-#ifndef SENTRY_PLATFORM_XBOX_SCARLETT
+#ifndef SENTRY_PLATFORM_XBOX
     HANDLE snapshot
         = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, GetCurrentProcessId());
     MODULEENTRY32W module = { 0 };
@@ -167,7 +167,7 @@ load_modules(void)
     }
 
     sentry_value_freeze(g_modules);
-#endif // SENTRY_PLATFORM_XBOX_SCARLETT
+#endif // SENTRY_PLATFORM_XBOX
 }
 
 sentry_value_t

src/screenshot/sentry_screenshot_windows.c

@@ -110,7 +110,7 @@ save_bitmap(HBITMAP bitmap, const wchar_t *path)
 static void
 calculate_region(DWORD pid, HRGN region)
 {
-#ifdef SENTRY_PLATFORM_XBOX_SCARLETT
+#ifdef SENTRY_PLATFORM_XBOX
     (DWORD) pid;
     (HRGN) region;
 #else
@@ -145,13 +145,13 @@ calculate_region(DWORD pid, HRGN region)
         }
         hwnd = GetWindow(hwnd, GW_HWNDPREV);
     }
-#endif // SENTRY_PLATFORM_XBOX_SCARLETT
+#endif // SENTRY_PLATFORM_XBOX
 }
 
 bool
 sentry__screenshot_capture(const sentry_path_t *path)
 {
-#ifdef SENTRY_PLATFORM_XBOX_SCARLETT
+#ifdef SENTRY_PLATFORM_XBOX
     (sentry_path_t *)path;
     return false;
 #else
@@ -189,5 +189,5 @@ sentry__screenshot_capture(const sentry_path_t *path)
     ReleaseDC(NULL, src);
     DeleteObject(region);
     return rv;
-#endif // SENTRY_PLATFORM_XBOX_SCARLETT
+#endif // SENTRY_PLATFORM_XBOX
 }

src/sentry_core.c

@@ -226,7 +226,7 @@ sentry_init(sentry_options_t *options)
 
 #if defined(SENTRY_PLATFORM_WINDOWS)                                           \
     && (!defined(SENTRY_BUILD_SHARED)                                          \
-        || defined(SENTRY_PLATFORM_XBOX_SCARLETT))
+        || defined(SENTRY_PLATFORM_XBOX))
     // This function must be positioned so that any dependents on its cached
     // functions are invoked after it.
     sentry__init_cached_kernel32_functions();

src/sentry_os.c

@@ -12,7 +12,7 @@
 
 #ifdef SENTRY_PLATFORM_WINDOWS
 
-#    if !defined(SENTRY_PLATFORM_XBOX_SCARLETT)
+#    if !defined(SENTRY_PLATFORM_XBOX)
 #        include <stdlib.h>
 #        include <windows.h>
 #        define CURRENT_VERSION                                                \
@@ -107,7 +107,7 @@ sentry__get_windows_version(windows_version_t *win_ver)
     return 1;
 }
 
-#    endif // !defined(SENTRY_PLATFORM_XBOX_SCARLETT)
+#    endif // !defined(SENTRY_PLATFORM_XBOX)
 
 sentry_value_t
 sentry__get_os_context(void)
@@ -117,7 +117,7 @@ sentry__get_os_context(void)
         return os;
     }
 
-#    if defined(SENTRY_PLATFORM_XBOX_SCARLETT)
+#    if defined(SENTRY_PLATFORM_XBOX)
 #        pragma warning(push)
 #        pragma warning(disable : 4996)
     sentry_value_set_by_key(os, "name", sentry_value_new_string("Xbox"));
@@ -167,7 +167,7 @@ sentry__get_os_context(void)
 
     sentry_value_decref(os);
     return sentry_value_new_null();
-#    endif // defined(SENTRY_PLATFORM_XBOX_SCARLETT)
+#    endif // defined(SENTRY_PLATFORM_XBOX)
 }
 
 #    ifndef SENTRY_UNITTEST
@@ -304,7 +304,7 @@ sentry__set_default_thread_stack_guarantee(void)
 #    endif
 }
 
-#    if defined(SENTRY_BUILD_SHARED) && !defined(SENTRY_PLATFORM_XBOX_SCARLETT)
+#    if defined(SENTRY_BUILD_SHARED) && !defined(SENTRY_PLATFORM_XBOX)
 
 BOOL APIENTRY
 DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
@@ -328,7 +328,7 @@ DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
 }
 
 #    endif // defined(SENTRY_BUILD_SHARED) &&
-           // !defined(SENTRY_PLATFORM_XBOX_SCARLETT)
+           // !defined(SENTRY_PLATFORM_XBOX)
 
 void
 sentry__get_system_time(LPFILETIME filetime)

src/symbolizer/sentry_symbolizer_windows.c

@@ -12,7 +12,7 @@ bool
 sentry__symbolize(
     void *addr, void (*func)(const sentry_frame_info_t *, void *), void *data)
 {
-#ifdef SENTRY_PLATFORM_XBOX_SCARLETT
+#ifdef SENTRY_PLATFORM_XBOX
     (void)data;
     (void)func;
     (void)addr;
@@ -40,7 +40,7 @@ sentry__symbolize(
     frame_info.symbol = sym->Name;
     frame_info.object_name = mod_name;
     func(&frame_info, data);
-#endif // SENTRY_PLATFORM_XBOX_SCARLETT
+#endif // SENTRY_PLATFORM_XBOX
 
     return true;
 }

tests/fixtures/screenshot/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10)
 project(sentry_screenshot LANGUAGES C)
 
-if(WIN32 AND NOT SCARLETT)
+if(WIN32 AND NOT XBOX)
 	add_executable(sentry_screenshot screenshot_win32.c)
 	set_target_properties(sentry_screenshot PROPERTIES WIN32_EXECUTABLE TRUE)
 	target_compile_definitions(sentry_screenshot PRIVATE _UNICODE UNICODE)

tests/unit/test_symbolizer.c

@@ -30,7 +30,7 @@ asserter(const sentry_frame_info_t *info, void *data)
 
 SENTRY_TEST(symbolizer)
 {
-#if defined(SENTRY_PLATFORM_NX) || defined(SENTRY_PLATFORM_XBOX_SCARLETT)
+#if defined(SENTRY_PLATFORM_NX) || defined(SENTRY_PLATFORM_XBOX)
     return SKIP_TEST();
 #endif
     int called = 0;

tests/unit/test_unwinder.c

@@ -38,7 +38,7 @@ find_frame(const sentry_frame_info_t *info, void *data)
 
 SENTRY_TEST(unwinder)
 {
-#if defined(SENTRY_PLATFORM_NX) || defined(SENTRY_PLATFORM_XBOX_SCARLETT)
+#if defined(SENTRY_PLATFORM_NX) || defined(SENTRY_PLATFORM_XBOX)
     return SKIP_TEST();
 #endif
     void *backtrace1[MAX_FRAMES] = { 0 };