From 83d69a1cd96836b9030b79232db98efed571c78e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 5 Jan 2024 03:17:43 +0100 Subject: [PATCH] Revert "Add debug postfix to libcef_dll_wrapper" This reverts commit 3d51977acf9e394d987473d40b22c63366a3a433 because it's incompatible with the library names created by CMake when building CEF directly, and not via wx CMake files. --- build/cmake/lib/webview_chromium/CMakeLists.txt | 9 +-------- samples/webview/webview.cpp | 6 +----- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/build/cmake/lib/webview_chromium/CMakeLists.txt b/build/cmake/lib/webview_chromium/CMakeLists.txt index 318c670afa..1c9e28314c 100644 --- a/build/cmake/lib/webview_chromium/CMakeLists.txt +++ b/build/cmake/lib/webview_chromium/CMakeLists.txt @@ -56,18 +56,11 @@ endif() set(USE_ATL OFF) # Disable usage of ATL in CEF set(USE_SANDBOX OFF) # Disable usage of sandbox on windows -set(lib_rls) -set(lib_dbg) -if(WIN32_MSVC_NAMING) - set(lib_dbg "d") -endif() - add_subdirectory(${CEF_ROOT} ${CEF_BUILD_DIR} EXCLUDE_FROM_ALL) set_target_properties(libcef_dll_wrapper PROPERTIES FOLDER "Third Party Libraries" COMPILE_FLAGS "-Wno-extra" - OUTPUT_NAME "libcef_dll_wrapper${lib_rls}" - OUTPUT_NAME_DEBUG "libcef_dll_wrapper${lib_dbg}" + OUTPUT_NAME "libcef_dll_wrapper" ) if(MSVC) diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp index 324e040e54..e0d08c3c17 100644 --- a/samples/webview/webview.cpp +++ b/samples/webview/webview.cpp @@ -65,14 +65,10 @@ // This sample can be built with and without wxUSE_WEBVIEW_CHROMIUM, so we // can't put the libraries in the project linker options and have to link them // from here. -#if defined(_MSC_VER) && wxUSE_WEBVIEW_CHROMIUM && !WXUSINGDLL +#if defined(_MSC_VER) && wxUSE_WEBVIEW_CHROMIUM #pragma comment(lib, "libcef") -#ifndef NDEBUG - #pragma comment(lib, "libcef_dll_wrapperd") -#else #pragma comment(lib, "libcef_dll_wrapper") #endif -#endif //We map menu items to their history items using wxMenuHistoryMap = std::map>;