mirror of
https://github.com/reactos/reactos.git
synced 2025-08-06 15:03:00 +00:00
[3RDPARTY] Link to oldnames for stricmp/wcsicmp
This commit is contained in:
parent
a3bab12b50
commit
1de09c477c
48 changed files with 80 additions and 51 deletions
|
@ -13,7 +13,7 @@ add_executable(cscript ${SOURCE} rsrc.rc)
|
|||
add_idl_headers(cscript_idlheader ihost.idl)
|
||||
add_typelib(ihost.idl)
|
||||
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ihost.tlb)
|
||||
target_link_libraries(cscript uuid wine)
|
||||
target_link_libraries(cscript uuid wine oldnames)
|
||||
set_module_type(cscript win32cui UNICODE)
|
||||
add_delay_importlibs(cscript shlwapi)
|
||||
add_importlibs(cscript shell32 oleaut32 ole32 advapi32 user32 msvcrt kernel32 ntdll)
|
||||
|
|
|
@ -5,6 +5,6 @@ add_definitions(-D_WIN32_WINNT=0x600)
|
|||
add_definitions(-D__WINESRC__)
|
||||
add_executable(reg add.c copy.c delete.c export.c import.c query.c reg.c reg.rc)
|
||||
set_module_type(reg win32cui UNICODE)
|
||||
target_link_libraries(reg wine)
|
||||
target_link_libraries(reg wine oldnames)
|
||||
add_importlibs(reg advapi32 advapi32_vista user32 msvcrt kernel32 ntdll)
|
||||
add_cd_file(TARGET reg DESTINATION reactos/system32 FOR all)
|
||||
|
|
|
@ -11,7 +11,7 @@ add_executable(wscript ${SOURCE} rsrc.rc)
|
|||
add_idl_headers(wscript_idlheader ihost.idl)
|
||||
add_typelib(ihost.idl)
|
||||
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ihost.tlb)
|
||||
target_link_libraries(wscript uuid wine)
|
||||
target_link_libraries(wscript uuid wine oldnames)
|
||||
set_module_type(wscript win32gui UNICODE)
|
||||
add_delay_importlibs(wscript shlwapi)
|
||||
add_importlibs(wscript shell32 oleaut32 ole32 user32 advapi32 msvcrt kernel32 ntdll)
|
||||
|
|
|
@ -27,12 +27,7 @@ set_target_cpp_properties(telnet WITH_EXCEPTIONS)
|
|||
|
||||
if (MSVC)
|
||||
# C4838: conversion from 'int' to 'SHORT' requires a narrowing conversion
|
||||
# C4996: 'strnicmp': Deprecated POSIX name, Try _strnicmp instead!
|
||||
target_compile_options(telnet PRIVATE /wd4838 /wd4996)
|
||||
endif()
|
||||
|
||||
if (NOT MSVC)
|
||||
target_compile_definitions(telnet PRIVATE _CRT_NONSTDC_NO_DEPRECATE)
|
||||
target_compile_options(telnet PRIVATE /wd4838)
|
||||
endif()
|
||||
|
||||
if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
|
||||
|
|
|
@ -4,8 +4,8 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
|
|||
add_definitions(
|
||||
-D__WINESRC__
|
||||
-D__ROS_LONG64__
|
||||
-Dfileno=_fileno
|
||||
-Disatty=_isatty)
|
||||
-Dstrcasecmp=_stricmp
|
||||
)
|
||||
|
||||
list(APPEND SOURCE
|
||||
callback.c
|
||||
|
@ -27,7 +27,7 @@ add_executable(winhlp32
|
|||
rsrc.rc)
|
||||
|
||||
set_module_type(winhlp32 win32gui)
|
||||
target_link_libraries(winhlp32 wine)
|
||||
target_link_libraries(winhlp32 wine oldnames)
|
||||
add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll)
|
||||
add_pch(winhlp32 precomp.h "${PCH_SKIP_SOURCE}")
|
||||
add_cd_file(TARGET winhlp32 DESTINATION reactos FOR all)
|
||||
|
|
|
@ -56,6 +56,8 @@ else()
|
|||
target_compile_options(nfsd PRIVATE "-w")
|
||||
endif()
|
||||
|
||||
target_link_libraries(nfsd oldnames)
|
||||
|
||||
set_module_type(nfsd win32cui)
|
||||
add_importlibs(nfsd advapi32 iphlpapi kernel32_vista libtirpc msvcrt shell32 ws2_32 wldap32 kernel32 ntdll)
|
||||
add_pch(nfsd precomp.h SOURCE)
|
||||
|
|
|
@ -4,6 +4,8 @@ set_module_type(tftpd win32cui)
|
|||
add_importlibs(tftpd advapi32 ws2_32 iphlpapi msvcrt kernel32)
|
||||
add_cd_file(TARGET tftpd DESTINATION reactos/system32 FOR all)
|
||||
|
||||
add_definitions(-Dstrcasecmp=_stricmp)
|
||||
|
||||
if (MSVC)
|
||||
# Disable warning C4267: 'initializing': conversion from 'size_t' to 'unsigned short', possible loss of data
|
||||
target_compile_options(tftpd PRIVATE /wd4267)
|
||||
|
|
|
@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
|
|||
|
||||
add_executable(format format.c format.rc)
|
||||
set_module_type(format win32cui UNICODE)
|
||||
target_link_libraries(format conutils ${PSEH_LIB})
|
||||
target_link_libraries(format conutils ${PSEH_LIB} oldnames)
|
||||
add_importlibs(format fmifs msvcrt kernel32 ntdll)
|
||||
set_target_properties(format PROPERTIES SUFFIX ".com")
|
||||
add_cd_file(TARGET format DESTINATION reactos/system32 FOR all)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue