solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Add debug postfix to libcef_dll_wrapper

Browse source
This commit is contained in:
Maarten Bent 2023-12-24 17:58:32 +01:00
parent 948545ba81
commit 3d51977acf
No known key found for this signature in database
GPG key ID: 58AAEE3F4A4FD070
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
build/cmake/lib/webview_chromium/CMakeLists.txt
View file

@ -56,10 +56,17 @@ 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"
OUTPUT_NAME "libcef_dll_wrapper"
OUTPUT_NAME "libcef_dll_wrapper${lib_rls}"
OUTPUT_NAME_DEBUG "libcef_dll_wrapper${lib_dbg}"
)
if(MSVC)

6
samples/webview/webview.cpp
View file

@ -65,10 +65,14 @@
// 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
#if defined(_MSC_VER) && wxUSE_WEBVIEW_CHROMIUM && !WXUSINGDLL
#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>>;