Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE]

Browse source 
* Simplify the way we handle importlib targets by taking control of the importlib name.

svn path=/trunk/; revision=55764
This commit is contained in:
Amine Khaldi 2012-02-20 22:08:14 +00:00
parent d720941f1e
commit 459a045652
132 changed files with 145 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/shell/explorer/notifyhook/CMakeLists.txt
View file

@ -13,5 +13,5 @@ add_library(notifyhook SHARED ${SOURCE})
set_module_type(notifyhook win32dll)
add_importlibs(notifyhook user32 msvcrt kernel32)
add_importlib_target(notifyhook.spec)
add_importlib_target(notifyhook.spec notifyhook.dll)
add_cd_file(TARGET notifyhook DESTINATION reactos/system32 FOR all)

15
reactos/cmake/gcc.cmake
View file

@ -192,33 +192,24 @@ if(NOT ARCH MATCHES i386)
set(DECO_OPTION "-@")
endif()
function(add_importlib_target _exports_file)
function(add_importlib_target _exports_file _implib_name)
get_filename_component(_name ${_exports_file} NAME_WE)
get_filename_component(_extension ${_exports_file} EXT)
get_target_property(_suffix ${_name} SUFFIX)
if(${_suffix} STREQUAL "_suffix-NOTFOUND")
get_target_property(_type ${_name} TYPE)
if(${_type} MATCHES EXECUTABLE)
set(_suffix ".exe")
else()
set(_suffix ".dll")
endif()
endif()
if(${_extension} STREQUAL ".spec")
# Normal importlib creation
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
COMMAND native-spec2def -n=${_implib_name} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def)
# Delayed importlib creation
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a
COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
COMMAND native-spec2def -n=${_implib_name} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def)

14
reactos/cmake/msvc.cmake
View file

@ -132,22 +132,14 @@ function(set_rc_compiler)
endfunction()
# Thanks MS for creating a stupid linker
function(add_importlib_target _exports_file)
function(add_importlib_target _exports_file _implib_name)
get_filename_component(_name ${_exports_file} NAME_WE)
get_target_property(_suffix ${_name} SUFFIX)
if(${_suffix} STREQUAL "_suffix-NOTFOUND")
get_target_property(_type ${_name} TYPE)
if(${_type} MATCHES EXECUTABLE)
set(_suffix ".exe")
else()
set(_suffix ".dll")
endif()
endif()
# Generate the asm stub file and the export def file
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def
COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_name}${_suffix} -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_implib_name} -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def)
# Assemble the stub file

2
reactos/dll/directx/dinput/CMakeLists.txt
View file

@ -37,4 +37,4 @@ add_importlibs(dinput
ntdll)
add_cd_file(TARGET dinput DESTINATION reactos/system32 FOR all)
add_importlib_target(dinput.spec)
add_importlib_target(dinput.spec dinput.dll)

2
reactos/dll/directx/dinput8/CMakeLists.txt
View file

@ -32,4 +32,4 @@ add_importlibs(dinput8
add_dependencies(dinput8 psdk)
add_cd_file(TARGET dinput8 DESTINATION reactos/system32 FOR all)
add_importlib_target(dinput8.spec)
add_importlib_target(dinput8.spec dinput8.dll)

2
reactos/dll/directx/dplay/CMakeLists.txt
View file

@ -27,4 +27,4 @@ add_importlibs(dplay
add_dependencies(dplay psdk)
add_cd_file(TARGET dplay DESTINATION reactos/system32 FOR all)
add_importlib_target(dplay.spec libdplayx)
add_importlib_target(dplay.spec dplay.dll libdplayx)

2
reactos/dll/directx/dplayx/CMakeLists.txt
View file

@ -37,4 +37,4 @@ add_importlibs(dplayx
ntdll)
add_cd_file(TARGET dplayx DESTINATION reactos/system32 FOR all)
add_importlib_target(dplayx.spec)
add_importlib_target(dplayx.spec dplayx.dll)

2
reactos/dll/directx/dsound/CMakeLists.txt
View file

@ -39,4 +39,4 @@ add_importlibs(dsound
ntdll)
add_cd_file(TARGET dsound DESTINATION reactos/system32 FOR all)
add_importlib_target(dsound.spec)
add_importlib_target(dsound.spec dsound.dll)

2
reactos/dll/directx/ksuser/CMakeLists.txt
View file

@ -8,4 +8,4 @@ set_module_type(ksuser win32dll)
add_importlibs(ksuser advapi32 msvcrt kernel32 ntdll)
add_dependencies(ksuser psdk bugcodes)
add_cd_file(TARGET ksuser DESTINATION reactos/system32 FOR all)
add_importlib_target(ksuser.spec)
add_importlib_target(ksuser.spec ksuser.dll)

2
reactos/dll/directx/wine/d3d9/CMakeLists.txt
View file

@ -47,4 +47,4 @@ add_importlibs(d3d9
add_dependencies(d3d9 wineheaders)
add_pch(d3d9 d3d9_private.h)
add_cd_file(TARGET d3d9 DESTINATION reactos/system32 FOR all)
add_importlib_target(d3d9.spec)
add_importlib_target(d3d9.spec d3d9.dll)

2
reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt
View file

@ -30,4 +30,4 @@ add_importlibs(d3dx9_24
add_dependencies(d3dx9_24 wineheaders)
add_cd_file(TARGET d3dx9_24 DESTINATION reactos/system32 FOR all)
add_importlib_target(d3dx9_24.spec libd3dx9_36)
add_importlib_target(d3dx9_24.spec d3dx9_24.dll libd3dx9_36)

2
reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt
View file

@ -31,4 +31,4 @@ add_importlibs(d3dx9_25
add_dependencies(d3dx9_25 wineheaders)
add_cd_file(TARGET d3dx9_25 DESTINATION reactos/system32 FOR all)
add_importlib_target(d3dx9_25.spec libd3dx9_24 libd3dx9_36)
add_importlib_target(d3dx9_25.spec d3dx9_25.dll libd3dx9_24 libd3dx9_36)

6
reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt
View file

@ -23,9 +23,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
add_library(d3dx9_36 SHARED ${SOURCE})
set_module_type(d3dx9_36 win32dll)
target_link_libraries(d3dx9_36
wine)
target_link_libraries(d3dx9_36 wine)
add_importlibs(d3dx9_36
d3d9
@ -38,4 +36,4 @@ add_importlibs(d3dx9_36
add_dependencies(d3dx9_36 wineheaders)
add_cd_file(TARGET d3dx9_36 DESTINATION reactos/system32 FOR all)
add_importlib_target(d3dx9_36.spec)
add_importlib_target(d3dx9_36.spec d3dx9_36.dll)

2
reactos/dll/directx/wine/ddraw/CMakeLists.txt
View file

@ -54,4 +54,4 @@ add_importlibs(ddraw
add_dependencies(ddraw wineheaders)
add_pch(ddraw ddraw_private.h)
add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all)
add_importlib_target(ddraw.spec)
add_importlib_target(ddraw.spec ddraw.dll)

2
reactos/dll/directx/wine/wined3d/CMakeLists.txt
View file

@ -69,7 +69,7 @@ add_importlibs(wined3d
add_dependencies(wined3d wineheaders)
add_pch(wined3d wined3d_private.h)
add_cd_file(TARGET wined3d DESTINATION reactos/system32 FOR all)
add_importlib_target(wined3d.spec)
add_importlib_target(wined3d.spec wined3d.dll)
if(NOT MSVC)
allow_warnings(wined3d)

2
reactos/dll/ntdll/CMakeLists.txt
View file

@ -52,4 +52,4 @@ add_pch(ntdll include/ntdll.h)
add_dependencies(ntdll ntstatus asm)
add_cd_file(TARGET ntdll DESTINATION reactos/system32 NO_CAB FOR all)
add_importlib_target(def/ntdll.spec)
add_importlib_target(def/ntdll.spec ntdll.dll)

2
reactos/dll/win32/acledit/CMakeLists.txt
View file

@ -14,4 +14,4 @@ set_module_type(acledit win32dll UNICODE)
add_importlibs(acledit msvcrt kernel32 ntdll)
add_pch(acledit acleditint.h)
add_cd_file(TARGET acledit DESTINATION reactos/system32 FOR all)
add_importlib_target(acledit.spec)
add_importlib_target(acledit.spec acledit.dll)

2
reactos/dll/win32/aclui/CMakeLists.txt
View file

@ -16,7 +16,7 @@ list(APPEND SOURCE
add_library(aclui SHARED ${SOURCE})
allow_warnings(aclui)
set_module_type(aclui win32dll UNICODE)
add_importlib_target(aclui.spec)
add_importlib_target(aclui.spec aclui.dll)
add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll)
add_pch(aclui precomp.h)
add_cd_file(TARGET aclui DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/advapi32/CMakeLists.txt
View file

@ -65,4 +65,4 @@ add_pch(advapi32 advapi32.h
${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_c.h)
add_cd_file(TARGET advapi32 DESTINATION reactos/system32 FOR all)
add_importlib_target(advapi32.spec)
add_importlib_target(advapi32.spec advapi32.dll)

2
reactos/dll/win32/atl/CMakeLists.txt
View file

@ -37,7 +37,7 @@ add_importlibs(atl
kernel32
ntdll)
add_importlib_target(atl.spec)
add_importlib_target(atl.spec atl.dll)
add_dependencies(atl atl_atliface_header)
add_cd_file(TARGET atl DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/avicap32/CMakeLists.txt
View file

@ -14,4 +14,4 @@ target_link_libraries(avicap32 wine)
add_importlibs(avicap32 advapi32 user32 version msvcrt kernel32 ntdll)
add_cd_file(TARGET avicap32 DESTINATION reactos/system32 FOR all)
add_importlib_target(avicap32.spec)
add_importlib_target(avicap32.spec avicap32.dll)

2
reactos/dll/win32/avifil32/CMakeLists.txt
View file

@ -40,5 +40,5 @@ add_importlibs(avifil32
kernel32
ntdll)
add_importlib_target(avifil32.spec)
add_importlib_target(avifil32.spec avifil32.dll)
add_cd_file(TARGET avifil32 DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/batt/CMakeLists.txt
View file

@ -10,7 +10,7 @@ add_library(batt SHARED
set_module_type(batt win32dll UNICODE)
add_importlib_target(batt.spec)
add_importlib_target(batt.spec batt.dll)
add_importlibs(batt msvcrt kernel32 ntdll)

2
reactos/dll/win32/beepmidi/CMakeLists.txt
View file

@ -10,7 +10,7 @@ add_library(beepmidi SHARED ${SOURCE})
set_module_type(beepmidi win32dll ENTRYPOINT 0 UNICODE)
add_importlibs(beepmidi winmm kernel32 ntdll msvcrt)
add_importlib_target(beepmidi.spec)
add_importlib_target(beepmidi.spec beepmidi.dll)
add_dependencies(beepmidi psdk)
add_cd_file(TARGET beepmidi DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/cabinet/CMakeLists.txt
View file

@ -22,7 +22,7 @@ add_library(cabinet SHARED ${SOURCE})
set_module_type(cabinet win32dll ENTRYPOINT 0)
target_link_libraries(cabinet wine zlib)
add_importlibs(cabinet msvcrt kernel32 ntdll)
add_importlib_target(cabinet.spec)
add_importlib_target(cabinet.spec cabinet.dll)
add_pch(cabinet cabinet.h)
add_dependencies(cabinet psdk)
add_cd_file(TARGET cabinet DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/cards/CMakeLists.txt
View file

@ -16,5 +16,5 @@ add_library(cards SHARED ${SOURCE})
set_module_type(cards win32dll UNICODE)
add_importlibs(cards user32 gdi32 msvcrt kernel32)
add_importlib_target(cards.spec)
add_importlib_target(cards.spec cards.dll)
add_cd_file(TARGET cards DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/comctl32/CMakeLists.txt
View file

@ -69,4 +69,4 @@ add_importlibs(comctl32
add_pch(comctl32 comctl32.h)
add_cd_file(TARGET comctl32 DESTINATION reactos/system32 FOR all)
add_importlib_target(comctl32.spec)
add_importlib_target(comctl32.spec comctl32.dll)

2
reactos/dll/win32/comdlg32/CMakeLists.txt
View file

@ -41,4 +41,4 @@ add_importlibs(comdlg32
ntdll)
add_cd_file(TARGET comdlg32 DESTINATION reactos/system32 FOR all)
add_importlib_target(comdlg32.spec)
add_importlib_target(comdlg32.spec comdlg32.dll)

2
reactos/dll/win32/compstui/CMakeLists.txt
View file

@ -17,4 +17,4 @@ target_link_libraries(compstui wine)
add_importlibs(compstui msvcrt kernel32 ntdll)
add_cd_file(TARGET compstui DESTINATION reactos/system32 FOR all)
add_importlib_target(compstui.spec)
add_importlib_target(compstui.spec compstui.dll)

2
reactos/dll/win32/credui/CMakeLists.txt
View file

@ -20,5 +20,5 @@ set_module_type(credui win32dll)
target_link_libraries(credui wine)
add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll)
add_importlib_target(credui.spec)
add_importlib_target(credui.spec credui.dll)
add_cd_file(TARGET credui DESTINATION reactos/system32 FOR all)

11
reactos/dll/win32/crypt32/CMakeLists.txt
View file

@ -42,16 +42,9 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/crypt32.def)
add_library(crypt32 SHARED ${SOURCE})
allow_warnings(crypt32)
set_module_type(crypt32 win32dll)
target_link_libraries(crypt32
wine
${PSEH_LIB}
oldnames)
target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames)
add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all)
add_importlib_target(crypt32.spec)
add_importlib_target(crypt32.spec crypt32.dll)

10
reactos/dll/win32/cryptnet/CMakeLists.txt
View file

@ -13,12 +13,6 @@ add_library(cryptnet SHARED ${SOURCE})
set_module_type(cryptnet win32dll)
target_link_libraries(cryptnet wine)
add_delay_importlibs(cryptnet wininet)
add_importlibs(cryptnet
crypt32
msvcrt
kernel32
ntdll)
add_importlib_target(cryptnet.spec)
add_importlibs(cryptnet crypt32 msvcrt kernel32 ntdll)
add_importlib_target(cryptnet.spec cryptnet.dll)
add_cd_file(TARGET cryptnet DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/cryptui/CMakeLists.txt
View file

@ -32,5 +32,5 @@ add_importlibs(cryptui
kernel32
ntdll)
add_importlib_target(cryptui.spec)
add_importlib_target(cryptui.spec cryptui.dll)
add_cd_file(TARGET cryptui DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/dbghelp/CMakeLists.txt
View file

@ -51,5 +51,5 @@ target_link_libraries(dbghelp wine ${PSEH_LIB} oldnames)
add_delay_importlibs(dbghelp version)
add_importlibs(dbghelp psapi msvcrt kernel32 ntdll)
add_pch(dbghelp dbghelp_private.h)
add_importlib_target(dbghelp.spec)
add_importlib_target(dbghelp.spec dbghelp.dll)
add_cd_file(TARGET dbghelp DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/devmgr/CMakeLists.txt
View file

@ -31,4 +31,4 @@ add_importlibs(devmgr
add_pch(devmgr precomp.h)
add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all)
add_importlib_target(devmgr.spec)
add_importlib_target(devmgr.spec devmgr.dll)

2
reactos/dll/win32/dhcpcsvc/CMakeLists.txt
View file

@ -28,7 +28,7 @@ add_library(dhcpcsvc SHARED ${SOURCE})
set_module_type(dhcpcsvc win32dll)
add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll)
add_importlib_target(dhcpcsvc.spec)
add_importlib_target(dhcpcsvc.spec dhcpcsvc.dll)
add_pch(dhcpcsvc include/rosdhcp.h)

2
reactos/dll/win32/dnsapi/CMakeLists.txt
View file

@ -27,4 +27,4 @@ add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll)
add_pch(dnsapi dnsapi/precomp.h)
add_dependencies(dnsapi psdk)
add_cd_file(TARGET dnsapi DESTINATION reactos/system32 FOR all)
add_importlib_target(dnsapi.spec)
add_importlib_target(dnsapi.spec dnsapi.dll)

2
reactos/dll/win32/fmifs/CMakeLists.txt
View file

@ -20,4 +20,4 @@ add_importlibs(fmifs kernel32 ntdll)
add_pch(fmifs precomp.h)
add_dependencies(fmifs psdk)
add_cd_file(TARGET fmifs DESTINATION reactos/system32 FOR all)
add_importlib_target(fmifs.spec)
add_importlib_target(fmifs.spec fmifs.dll)

2
reactos/dll/win32/gdi32/CMakeLists.txt
View file

@ -56,4 +56,4 @@ target_link_libraries(gdi32
add_importlibs(gdi32 user32 advapi32 msvcrt kernel32 ntdll)
add_pch(gdi32 include/precomp.h)
add_cd_file(TARGET gdi32 DESTINATION reactos/system32 FOR all)
add_importlib_target(gdi32.spec)
add_importlib_target(gdi32.spec gdi32.dll)

2
reactos/dll/win32/gdiplus/CMakeLists.txt
View file

@ -47,7 +47,7 @@ add_importlibs(gdiplus
kernel32
ntdll)
add_importlib_target(gdiplus.spec)
add_importlib_target(gdiplus.spec gdiplus.dll)
if(ARCH MATCHES amd64)
target_link_libraries(gdiplus crt)

2
reactos/dll/win32/getuname/CMakeLists.txt
View file

@ -9,7 +9,7 @@ add_library(getuname SHARED
getuname.rc
${CMAKE_CURRENT_BINARY_DIR}/getuname.def)
add_importlib_target(getuname.spec)
add_importlib_target(getuname.spec getuname.dll)
set_module_type(getuname win32dll UNICODE)
add_importlibs(getuname msvcrt kernel32 ntdll)
add_cd_file(TARGET getuname DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/glu32/CMakeLists.txt
View file

@ -122,4 +122,4 @@ add_importlibs(glu32
ntdll)
add_cd_file(TARGET glu32 DESTINATION reactos/system32 FOR all)
add_importlib_target(glu32.spec)
add_importlib_target(glu32.spec glu32.dll)

2
reactos/dll/win32/hlink/CMakeLists.txt
View file

@ -28,5 +28,5 @@ add_importlibs(hlink
ntdll)
add_pch(hlink hlink_private.h)
add_importlib_target(hlink.spec)
add_importlib_target(hlink.spec hlink.dll)
add_cd_file(TARGET hlink DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/icmp/CMakeLists.txt
View file

@ -17,5 +17,5 @@ set_module_type(icmp win32dll)
target_link_libraries(icmp wine)
add_importlibs(icmp ws2_32 msvcrt kernel32 ntdll)
add_importlib_target(icmp.spec)
add_importlib_target(icmp.spec icmp.dll)
add_cd_file(TARGET icmp DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/imagehlp/CMakeLists.txt
View file

@ -18,6 +18,6 @@ add_library(imagehlp SHARED ${SOURCE})
set_module_type(imagehlp win32dll)
target_link_libraries(imagehlp wine)
add_importlibs(imagehlp dbghelp msvcrt kernel32 ntdll)
add_importlib_target(imagehlp.spec)
add_importlib_target(imagehlp.spec imagehlp.dll)
add_pch(imagehlp precomp.h)
add_cd_file(TARGET imagehlp DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/imm32/CMakeLists.txt
View file

@ -26,4 +26,4 @@ set_module_type(imm32 win32dll)
target_link_libraries(imm32 wine)
add_importlibs(imm32 advapi32 user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET imm32 DESTINATION reactos/system32 FOR all)
add_importlib_target(imm32.spec)
add_importlib_target(imm32.spec imm32.dll)

2
reactos/dll/win32/inetcomm/CMakeLists.txt
View file

@ -37,5 +37,5 @@ add_importlibs(inetcomm
kernel32
ntdll)
add_importlib_target(inetcomm.spec)
add_importlib_target(inetcomm.spec inetcomm.dll)
add_cd_file(TARGET inetcomm DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/iphlpapi/CMakeLists.txt
View file

@ -27,4 +27,4 @@ target_link_libraries(iphlpapi wine tdilib)
add_importlibs(iphlpapi icmp dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll)
add_pch(iphlpapi iphlpapi_private.h)
add_cd_file(TARGET iphlpapi DESTINATION reactos/system32 FOR all)
add_importlib_target(iphlpapi.spec)
add_importlib_target(iphlpapi.spec iphlpapi.dll)

2
reactos/dll/win32/kernel32/CMakeLists.txt
View file

@ -99,4 +99,4 @@ add_importlibs(kernel32 ntdll)
add_pch(kernel32 k32.h)
add_dependencies(kernel32 psdk errcodes asm)
add_cd_file(TARGET kernel32 DESTINATION reactos/system32 FOR all)
add_importlib_target(kernel32.spec)
add_importlib_target(kernel32.spec kernel32.dll)

2
reactos/dll/win32/loadperf/CMakeLists.txt
View file

@ -13,4 +13,4 @@ set_module_type(loadperf win32dll)
target_link_libraries(loadperf wine)
add_importlibs(loadperf msvcrt kernel32 ntdll)
add_cd_file(TARGET loadperf DESTINATION reactos/system32 FOR all)
add_importlib_target(loadperf.spec)
add_importlib_target(loadperf.spec loadperf.dll)

2
reactos/dll/win32/localui/CMakeLists.txt
View file

@ -16,6 +16,6 @@ add_library(localui SHARED ${SOURCE})
set_module_type(localui win32dll)
target_link_libraries(localui uuid wine)
add_importlib_target(localui.spec)
add_importlib_target(localui.spec localui.dll)
add_importlibs(localui winspool user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET localui DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/lpk/CMakeLists.txt
View file

@ -15,7 +15,7 @@ add_library(lpk SHARED ${SOURCE})
set_module_type(lpk win32dll UNICODE)
add_importlib_target(lpk.spec)
add_importlib_target(lpk.spec lpk.dll)
add_importlibs(lpk user32 usp10 msvcrt kernel32 ntdll)
add_pch(lpk ros_lpk.h)
add_cd_file(TARGET lpk DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/lsasrv/CMakeLists.txt
View file

@ -31,4 +31,4 @@ add_importlibs(lsasrv rpcrt4 msvcrt kernel32 ntdll)
add_pch(lsasrv lsasrv.h)
add_dependencies(lsasrv psdk)
add_cd_file(TARGET lsasrv DESTINATION reactos/system32 FOR all)
add_importlib_target(lsasrv.spec)
add_importlib_target(lsasrv.spec lsasrv.dll)

2
reactos/dll/win32/lz32/CMakeLists.txt
View file

@ -16,4 +16,4 @@ target_link_libraries(lz32 wine)
add_importlibs(lz32 kernel32 ntdll)
add_dependencies(lz32 psdk)
add_cd_file(TARGET lz32 DESTINATION reactos/system32 FOR all)
add_importlib_target(lz32.spec)
add_importlib_target(lz32.spec lz32.dll)

2
reactos/dll/win32/mlang/CMakeLists.txt
View file

@ -30,6 +30,6 @@ add_importlibs(mlang
kernel32
ntdll)
add_importlib_target(mlang.spec)
add_importlib_target(mlang.spec mlang.dll)
add_dependencies(mlang psdk)
add_cd_file(TARGET mlang DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/mpr/CMakeLists.txt
View file

@ -27,4 +27,4 @@ set_module_type(mpr win32dll)
target_link_libraries(mpr wine)
add_importlibs(mpr advapi32 user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET mpr DESTINATION reactos/system32 FOR all)
add_importlib_target(mpr.spec)
add_importlib_target(mpr.spec mpr.dll)

2
reactos/dll/win32/msacm32/CMakeLists.txt
View file

@ -26,6 +26,6 @@ add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll)
add_dependencies(msacm32 psdk)
add_cd_file(TARGET msacm32 DESTINATION reactos/system32 FOR all)
add_importlib_target(msacm32.spec)
add_importlib_target(msacm32.spec msacm32.dll)
add_subdirectory(msacm32.drv)

2
reactos/dll/win32/msi/CMakeLists.txt
View file

@ -98,4 +98,4 @@ add_cd_file(TARGET msi DESTINATION reactos/system32 FOR all)
endif(NOT MSVC)
add_importlib_target(msi.spec)
add_importlib_target(msi.spec msi.dll)

2
reactos/dll/win32/msimg32/CMakeLists.txt
View file

@ -14,4 +14,4 @@ set_module_type(msimg32 win32dll)
target_link_libraries(msimg32 wine)
add_importlibs(msimg32 gdi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET msimg32 DESTINATION reactos/system32 FOR all)
add_importlib_target(msimg32.spec)
add_importlib_target(msimg32.spec msimg32.dll)

2
reactos/dll/win32/msports/CMakeLists.txt
View file

@ -17,4 +17,4 @@ target_link_libraries(msports wine)
add_importlibs(msports setupapi comctl32 user32 advapi32 msvcrt kernel32 ntdll)
add_pch(msports precomp.h)
add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all)
add_importlib_target(msports.spec)
add_importlib_target(msports.spec msports.dll)

2
reactos/dll/win32/msvcrt/CMakeLists.txt
View file

@ -37,4 +37,4 @@ endif()
add_importlibs(msvcrt kernel32 ntdll)
add_pch(msvcrt precomp.h)
add_cd_file(TARGET msvcrt DESTINATION reactos/system32 FOR all)
add_importlib_target(msvcrt.spec)
add_importlib_target(msvcrt.spec msvcrt.dll)

2
reactos/dll/win32/msvfw32/CMakeLists.txt
View file

@ -24,4 +24,4 @@ target_link_libraries(msvfw32 wine)
add_importlibs(msvfw32 winmm version comctl32 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET msvfw32 DESTINATION reactos/system32 FOR all)
add_importlib_target(msvfw32.spec)
add_importlib_target(msvfw32.spec msvfw32.dll)

2
reactos/dll/win32/mswsock/CMakeLists.txt
View file

@ -17,4 +17,4 @@ set_module_type(mswsock win32dll UNICODE)
add_importlibs(mswsock ws2_32 msvcrt kernel32)
add_pch(mswsock precomp.h)
add_cd_file(TARGET mswsock DESTINATION reactos/system32 FOR all)
add_importlib_target(mswsock.spec)
add_importlib_target(mswsock.spec mswsock.dll)

2
reactos/dll/win32/netapi32/CMakeLists.txt
View file

@ -29,4 +29,4 @@ target_link_libraries(netapi32 wine)
add_importlibs(netapi32 iphlpapi ws2_32 advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET netapi32 DESTINATION reactos/system32 FOR all)
add_importlib_target(netapi32.spec)
add_importlib_target(netapi32.spec netapi32.dll)

2
reactos/dll/win32/newdev/CMakeLists.txt
View file

@ -16,4 +16,4 @@ target_link_libraries(newdev wine)
add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 msvcrt kernel32 ntdll)
add_pch(newdev newdev_private.h)
add_cd_file(TARGET newdev DESTINATION reactos/system32 FOR all)
add_importlib_target(newdev.spec)
add_importlib_target(newdev.spec newdev.dll)

2
reactos/dll/win32/ntdsapi/CMakeLists.txt
View file

@ -15,6 +15,6 @@ set_module_type(ntdsapi win32dll ENTRYPOINT 0 )
target_link_libraries(ntdsapi wine)
add_importlibs(ntdsapi user32 kernel32 ntdll)
add_importlib_target(ntdsapi.spec)
add_importlib_target(ntdsapi.spec ntdsapi.dll)
add_dependencies(ntdsapi psdk)
add_cd_file(TARGET ntdsapi DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/odbccp32/CMakeLists.txt
View file

@ -20,5 +20,5 @@ add_importlibs(odbccp32
kernel32
ntdll)
add_importlib_target(odbccp32.spec)
add_importlib_target(odbccp32.spec odbccp32.dll)
add_cd_file(TARGET odbccp32 DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/ole32/CMakeLists.txt
View file

@ -87,4 +87,4 @@ add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll)
add_dependencies(ole32 ole32idl)
add_cd_file(TARGET ole32 DESTINATION reactos/system32 FOR all)
add_importlib_target(ole32.spec)
add_importlib_target(ole32.spec ole32.dll)

2
reactos/dll/win32/oleacc/CMakeLists.txt
View file

@ -19,5 +19,5 @@ target_link_libraries(oleacc wine)
add_importlibs(oleacc user32 msvcrt kernel32 ntdll)
add_importlib_target(oleacc.spec)
add_importlib_target(oleacc.spec oleacc.dll)
add_cd_file(TARGET oleacc DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/oleaut32/CMakeLists.txt
View file

@ -65,4 +65,4 @@ target_link_libraries(oleaut32
add_delay_importlibs(oleaut32 comctl32 urlmon windowscodecs)
add_importlibs(oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET oleaut32 DESTINATION reactos/system32 FOR all)
add_importlib_target(oleaut32.spec)
add_importlib_target(oleaut32.spec oleaut32.dll)

2
reactos/dll/win32/oledlg/CMakeLists.txt
View file

@ -16,5 +16,5 @@ add_library(oledlg SHARED ${SOURCE})
set_module_type(oledlg win32dll)
target_link_libraries(oledlg wine)
add_importlibs(oledlg ole32 comdlg32 user32 advapi32 msvcrt kernel32 ntdll)
add_importlib_target(oledlg.spec)
add_importlib_target(oledlg.spec oledlg.dll)
add_cd_file(TARGET oledlg DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/opengl32/CMakeLists.txt
View file

@ -26,4 +26,4 @@ add_importlibs(opengl32
add_pch(opengl32 opengl32.h)
add_cd_file(TARGET opengl32 DESTINATION reactos/system32 FOR all)
add_importlib_target(opengl32.spec)
add_importlib_target(opengl32.spec opengl32.dll)

2
reactos/dll/win32/pdh/CMakeLists.txt
View file

@ -19,6 +19,6 @@ set_module_type(pdh win32dll ENTRYPOINT 0 )
target_link_libraries(pdh wine)
add_importlibs(pdh kernel32 ntdll msvcrt)
add_importlib_target(pdh.spec)
add_importlib_target(pdh.spec pdh.dll)
add_cd_file(TARGET pdh DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/powrprof/CMakeLists.txt
View file

@ -12,5 +12,5 @@ set_module_type(powrprof win32dll UNICODE)
target_link_libraries(powrprof wine)
add_importlibs(powrprof advapi32 user32 comctl32 msvcrt kernel32 ntdll)
add_importlib_target(powrprof.spec)
add_importlib_target(powrprof.spec powrprof.dll)
add_cd_file(TARGET powrprof DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/psapi/CMakeLists.txt
View file

@ -12,6 +12,6 @@ add_library(psapi SHARED ${SOURCE})
set_module_type(psapi win32dll)
target_link_libraries(psapi epsapi ${PSEH_LIB})
add_importlibs(psapi msvcrt kernel32 ntdll)
add_importlib_target(psapi.spec)
add_importlib_target(psapi.spec psapi.dll)
add_pch(psapi precomp.h)
add_cd_file(TARGET psapi DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/rasapi32/CMakeLists.txt
View file

@ -16,6 +16,6 @@ set_module_type(rasapi32 win32dll ENTRYPOINT 0 )
target_link_libraries(rasapi32 wine)
add_importlibs(rasapi32 kernel32 ntdll)
add_importlib_target(rasapi32.spec)
add_importlib_target(rasapi32.spec rasapi32.dll)
add_dependencies(rasapi32 psdk)
add_cd_file(TARGET rasapi32 DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/riched20/CMakeLists.txt
View file

@ -51,5 +51,5 @@ add_importlibs(riched20
ntdll)
add_pch(riched20 editor.h)
add_importlib_target(riched20.spec)
add_importlib_target(riched20.spec riched20.dll)
add_cd_file(TARGET riched20 DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/rpcrt4/CMakeLists.txt
View file

@ -49,7 +49,7 @@ target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB})
add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32)
add_importlibs(rpcrt4 msvcrt advapi32 ws2_32 kernel32 ntdll)
add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all)
add_importlib_target(rpcrt4.spec)
add_importlib_target(rpcrt4.spec rpcrt4.dll)
if(NOT MSVC)
allow_warnings(rpcrt4)

2
reactos/dll/win32/rsaenh/CMakeLists.txt
View file

@ -25,5 +25,5 @@ set_module_type(rsaenh win32dll)
target_link_libraries(rsaenh wine)
add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll)
add_pch(rsaenh tomcrypt.h)
add_importlib_target(rsaenh.spec)
add_importlib_target(rsaenh.spec rsaenh.dll)
add_cd_file(TARGET rsaenh DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/samlib/CMakeLists.txt
View file

@ -17,4 +17,4 @@ set_module_type(samlib win32dll)
add_importlibs(samlib advapi32 msvcrt kernel32 ntdll)
add_pch(samlib precomp.h)
add_cd_file(TARGET samlib DESTINATION reactos/system32 FOR all)
add_importlib_target(samlib.spec)
add_importlib_target(samlib.spec samlib.dll)

2
reactos/dll/win32/secur32/CMakeLists.txt
View file

@ -24,4 +24,4 @@ add_importlibs(secur32 advapi32 msvcrt kernel32 ntdll)
add_pch(secur32 precomp.h)
add_cd_file(TARGET secur32 DESTINATION reactos/system32 FOR all)
add_importlib_target(secur32.spec)
add_importlib_target(secur32.spec secur32.dll)

2
reactos/dll/win32/sensapi/CMakeLists.txt
View file

@ -13,5 +13,5 @@ add_library(sensapi SHARED ${SOURCE})
set_module_type(sensapi win32dll)
target_link_libraries(sensapi wine)
add_importlibs(sensapi msvcrt kernel32 ntdll)
add_importlib_target(sensapi.spec)
add_importlib_target(sensapi.spec sensapi.dll)
add_cd_file(TARGET sensapi DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/setupapi/CMakeLists.txt
View file

@ -55,4 +55,4 @@ add_importlibs(setupapi
add_pch(setupapi setupapi_private.h)
add_cd_file(TARGET setupapi DESTINATION reactos/system32 FOR all)
add_importlib_target(setupapi.spec)
add_importlib_target(setupapi.spec setupapi.dll)

2
reactos/dll/win32/sfc_os/CMakeLists.txt
View file

@ -10,6 +10,6 @@ add_library(sfc_os SHARED ${SOURCE})
set_module_type(sfc_os win32dll)
add_importlibs(sfc_os msvcrt kernel32 ntdll)
add_importlib_target(sfc_os.spec)
add_importlib_target(sfc_os.spec sfc_os.dll)
add_pch(sfc_os precomp.h)
add_cd_file(TARGET sfc_os DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/shdocvw/CMakeLists.txt
View file

@ -55,7 +55,7 @@ add_dependencies(shdocvw stdole2)
add_pch(shdocvw shdocvw.h)
add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all)
add_importlib_target(shdocvw.spec)
add_importlib_target(shdocvw.spec shdocvw.dll)
if(NOT MSVC)
allow_warnings(shdocvw)

2
reactos/dll/win32/shell32/CMakeLists.txt
View file

@ -107,4 +107,4 @@ add_dependencies(shdocvw shdocvw_v1)
add_pch(shell32 precomp.h)
add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all)
add_importlib_target(shell32.spec)
add_importlib_target(shell32.spec shell32.dll)

2
reactos/dll/win32/shlwapi/CMakeLists.txt
View file

@ -32,4 +32,4 @@ target_link_libraries(shlwapi wine uuid)
add_delay_importlibs(shlwapi userenv oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version)
add_importlibs(shlwapi user32 gdi32 advapi32 msvcrt wininet kernel32 ntdll)
add_cd_file(TARGET shlwapi DESTINATION reactos/system32 FOR all)
add_importlib_target(shlwapi.spec)
add_importlib_target(shlwapi.spec shlwapi.dll)

2
reactos/dll/win32/smdll/CMakeLists.txt
View file

@ -17,4 +17,4 @@ add_importlibs(smdll ntdll)
add_pch(smdll precomp.h)
add_dependencies(smdll psdk)
add_cd_file(TARGET smdll DESTINATION reactos/system32 FOR all)
add_importlib_target(smdll.spec)
add_importlib_target(smdll.spec smdll.dll)

2
reactos/dll/win32/snmpapi/CMakeLists.txt
View file

@ -23,4 +23,4 @@ target_link_libraries(snmpapi wine)
add_importlibs(snmpapi msvcrt kernel32 ntdll)
add_cd_file(TARGET snmpapi DESTINATION reactos/system32 FOR all)
add_importlib_target(snmpapi.spec)
add_importlib_target(snmpapi.spec snmpapi.dll)

2
reactos/dll/win32/spoolss/CMakeLists.txt
View file

@ -15,5 +15,5 @@ allow_warnings(spoolss)
set_module_type(spoolss win32dll)
target_link_libraries(spoolss wine)
add_importlibs(spoolss winspool msvcrt kernel32 ntdll)
add_importlib_target(spoolss.spec)
add_importlib_target(spoolss.spec spoolss.dll)
add_cd_file(TARGET spoolss DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/ufatx/CMakeLists.txt
View file

@ -11,6 +11,6 @@ set_module_type(ufatx win32dll ENTRYPOINT 0 )
target_link_libraries(ufatx vfatxlib)
add_importlibs(ufatx ntdll)
add_importlib_target(ufatx.spec)
add_importlib_target(ufatx.spec ufatx.dll)
add_dependencies(ufatx psdk)
add_cd_file(TARGET ufatx DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/urlmon/CMakeLists.txt
View file

@ -73,4 +73,4 @@ add_definitions(
add_pch(urlmon urlmon_main.h)
add_definitions(-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}")
add_cd_file(TARGET urlmon DESTINATION reactos/system32 FOR all)
add_importlib_target(urlmon.spec)
add_importlib_target(urlmon.spec urlmon.dll)

2
reactos/dll/win32/user32/CMakeLists.txt
View file

@ -76,4 +76,4 @@ add_delay_importlibs(user32 imm32 usp10)
add_importlibs(user32 gdi32 advapi32 msvcrt kernel32 ntdll)
add_pch(user32 include/user32.h)
add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all)
add_importlib_target(user32.spec)
add_importlib_target(user32.spec user32.dll)

2
reactos/dll/win32/userenv/CMakeLists.txt
View file

@ -27,4 +27,4 @@ add_importlibs(userenv advapi32 user32 msvcrt kernel32 ntdll)
add_pch(userenv precomp.h)
add_cd_file(TARGET userenv DESTINATION reactos/system32 FOR all)
add_importlib_target(userenv.spec)
add_importlib_target(userenv.spec userenv.dll)

2
reactos/dll/win32/usp10/CMakeLists.txt
View file

@ -25,6 +25,6 @@ set_module_type(usp10 win32dll)
target_link_libraries(usp10 wine)
add_importlibs(usp10 advapi32 user32 gdi32 msvcrt kernel32 ntdll)
add_importlib_target(usp10.spec)
add_importlib_target(usp10.spec usp10.dll)
add_cd_file(TARGET usp10 DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/uxtheme/CMakeLists.txt
View file

@ -29,4 +29,4 @@ add_delay_importlibs(uxtheme msimg32)
add_importlibs(uxtheme user32 advapi32 gdi32 msvcrt kernel32 ntdll)
add_pch(uxtheme uxthemep.h)
add_cd_file(TARGET uxtheme DESTINATION reactos/system32 FOR all)
add_importlib_target(uxtheme.spec)
add_importlib_target(uxtheme.spec uxtheme.dll)

2
reactos/dll/win32/version/CMakeLists.txt
View file

@ -19,4 +19,4 @@ target_link_libraries(version wine)
add_importlibs(version lz32 kernel32 ntdll)
add_dependencies(version psdk)
add_cd_file(TARGET version DESTINATION reactos/system32 FOR all)
add_importlib_target(version.spec)
add_importlib_target(version.spec version.dll)

2
reactos/dll/win32/windowscodecs/CMakeLists.txt
View file

@ -54,6 +54,6 @@ set_module_type(windowscodecs win32dll)
target_link_libraries(windowscodecs wine uuid)
add_importlibs(windowscodecs ole32 shlwapi advapi32 msvcrt kernel32 ntdll)
add_importlib_target(windowscodecs.spec)
add_importlib_target(windowscodecs.spec windowscodecs.dll)
add_cd_file(TARGET windowscodecs DESTINATION reactos/system32 FOR all)

2
reactos/dll/win32/winhttp/CMakeLists.txt
View file

@ -20,7 +20,7 @@ set_module_type(winhttp win32dll)
target_link_libraries(winhttp wine)
add_delay_importlibs(winhttp crypt32)
add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt advapi32 kernel32 ntdll)
add_importlib_target(winhttp.spec)
add_importlib_target(winhttp.spec winhttp.dll)
add_cd_file(TARGET winhttp DESTINATION reactos/system32 FOR all)
if(NOT MSVC)

2
reactos/dll/win32/wininet/CMakeLists.txt
View file

@ -34,7 +34,7 @@ target_link_libraries(wininet wine ${PSEH_LIB} zlib)
add_delay_importlibs(wininet secur32 crypt32)
add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 ws2_32 msvcrt kernel32 ntdll)
add_cd_file(TARGET wininet DESTINATION reactos/system32 FOR all)
add_importlib_target(wininet.spec)
add_importlib_target(wininet.spec wininet.dll)
if(NOT MSVC)
allow_warnings(wininet)

Some files were not shown because too many files have changed in this diff Show more