mirror of
https://github.com/reactos/reactos.git
synced 2026-06-20 09:32:15 +08:00
155970dca1
Someone familiar with this should do a more proper fix.
C:/ReactOS/reactos/sdk/lib/atl/atlcom.h: In instantiation of 'class ATL::CComObject<CRShellClassFactory>':
C:/ReactOS/reactos/sdk/include/reactos/shellutils.h:357:45: required from 'HRESULT ShellObjectCreatorInit(T1, const IID&, void**) [with T = CRShellClassFactory; T1 = _GUID; HRESULT = long int; IID = _GUID]'
C:/ReactOS/reactos/base/shell/rshell/misc.cpp:256:55: required from here
C:/ReactOS/reactos/base/shell/rshell/misc.cpp:210:28: error: 'virtual HRESULT CRShellClassFactory::CreateInstance(LPUNKNOWN, const IID&, void**)' was hidden [-Werror=overloaded-virtual=]
210 | virtual HRESULT WINAPI CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObject)
| ^~~~~~~~~~~~~~
In file included from C:/ReactOS/reactos/base/shell/rshell/misc.cpp:33:
C:/ReactOS/reactos/sdk/lib/atl/atlcom.h:171:27: note: by 'static HRESULT ATL::CComObject<Base>::CreateInstance(ATL::CComObject<Base>**) [with Base = CRShellClassFactory; HRESULT = long int]'
171 | static HRESULT WINAPI CreateInstance(CComObject<Base> **pp)
| ^~~~~~~~~~~~~~
53 lines
1.1 KiB
CMake
53 lines
1.1 KiB
CMake
PROJECT(SHELL)
|
|
|
|
spec2def(rshell.dll rshell.spec ADD_IMPORTLIB)
|
|
|
|
list(APPEND SOURCE
|
|
CQuickLaunchBand.cpp
|
|
misc.cpp
|
|
${CMAKE_CURRENT_BINARY_DIR}/rshell.def)
|
|
|
|
add_library(rshell MODULE ${SOURCE})
|
|
|
|
set_module_type(rshell win32dll UNICODE)
|
|
|
|
target_link_libraries(rshell
|
|
shellbars
|
|
shellmenu
|
|
shelldesktop
|
|
uuid
|
|
wine
|
|
cpprt
|
|
atl_classes)
|
|
|
|
if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
|
|
# FIXME: GCC 13+ warning, should be fixed properly
|
|
target_compile_options(rshell PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:-Wno-overloaded-virtual>")
|
|
endif()
|
|
|
|
add_importlibs(rshell
|
|
browseui
|
|
uxtheme
|
|
shlwapi
|
|
advapi32
|
|
shell32
|
|
comctl32
|
|
gdi32
|
|
ole32
|
|
user32
|
|
msvcrt
|
|
kernel32
|
|
ntdll)
|
|
|
|
add_custom_command(TARGET rshell POST_BUILD
|
|
COMMAND "${CMAKE_COMMAND}" -E copy
|
|
"$<TARGET_FILE:rshell>"
|
|
"$<TARGET_FILE_DIR:explorer>/$<TARGET_FILE_NAME:rshell>"
|
|
COMMENT "Copying to output directory")
|
|
|
|
add_custom_command(TARGET rshell POST_BUILD
|
|
COMMAND "${CMAKE_COMMAND}" -E copy
|
|
"$<TARGET_FILE:rshell>"
|
|
"$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:rshell>"
|
|
COMMENT "Copying to output directory")
|