From 2b84309b10fe806e3529f5ad6f88b487a4243c9e Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 1 Aug 2023 11:02:45 +0200 Subject: [PATCH] [mingw] fix build issues on debian 12 --- cmake/FindSDL2TTF.cmake | 7 ++++++- winpr/include/winpr/error.h | 4 ++++ winpr/libwinpr/wtsapi/CMakeLists.txt | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cmake/FindSDL2TTF.cmake b/cmake/FindSDL2TTF.cmake index 26cfa060f..ccb39d447 100644 --- a/cmake/FindSDL2TTF.cmake +++ b/cmake/FindSDL2TTF.cmake @@ -161,7 +161,12 @@ IF(SDL2TTF_LIBRARY_TEMP) ENDIF(MINGW) # Set the final string here so the GUI reflects the final state. - SET(SDL2TTF_LIBRARY "${SDL2TTF_LIBRARY_TEMP};${FREETYPE_LIBRARY_TEMP}" CACHE STRING "Where the SDL2TTF Library can be found") + if(FREETYPE_LIBRARY_TEMP) + SET(SDL2TTF_LIBRARY "${SDL2TTF_LIBRARY_TEMP};${FREETYPE_LIBRARY_TEMP}" CACHE STRING "Where the SDL2TTF Library can be found") + else() + SET(SDL2TTF_LIBRARY "${SDL2TTF_LIBRARY_TEMP}" CACHE STRING "Where the SDL2TTF Library can be found") + endif() + # Set the temp variable to INTERNAL so it is not seen in the CMake GUI SET(SDL2TTF_LIBRARY_TEMP "${SDL2TTF_LIBRARY_TEMP}" CACHE INTERNAL "") SET(FREETYPE_LIBRARY_TEMP "${FREETYPE_LIBRARY_TEMP}" CACHE INTERNAL "") diff --git a/winpr/include/winpr/error.h b/winpr/include/winpr/error.h index 314ea3035..1b314b7a1 100644 --- a/winpr/include/winpr/error.h +++ b/winpr/include/winpr/error.h @@ -36,6 +36,10 @@ #define RPC_S_COOKIE_AUTH_FAILED 0x00000729 #endif +#ifndef ERROR_OPERATION_IN_PROGRESS +#define ERROR_OPERATION_IN_PROGRESS 0x00000149 +#endif + #else #ifndef NO_ERROR diff --git a/winpr/libwinpr/wtsapi/CMakeLists.txt b/winpr/libwinpr/wtsapi/CMakeLists.txt index 1d8a4034a..5d268c315 100644 --- a/winpr/libwinpr/wtsapi/CMakeLists.txt +++ b/winpr/libwinpr/wtsapi/CMakeLists.txt @@ -19,6 +19,7 @@ winpr_module_add(wtsapi.c) if(WIN32) winpr_module_add(wtsapi_win32.c wtsapi_win32.h) + winpr_library_add_private(ntdll) endif() if(BUILD_TESTING)