Revert "Add debug postfix to libcef_dll_wrapper"

This reverts commit 3d51977acf because
it's incompatible with the library names created by CMake when building
CEF directly, and not via wx CMake files.
This commit is contained in:
Vadim Zeitlin 2024-01-05 03:17:43 +01:00
parent 8655d7bb95
commit 83d69a1cd9
2 changed files with 2 additions and 13 deletions

View file

@ -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)

View file

@ -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<int, wxSharedPtr<wxWebViewHistoryItem>>;