history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-04-27 17:55:41 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

CMake: Fix incorrect library for HTTPDownloaderCurl

Browse Source
This commit is contained in:
Stenzek 2023-11-18 14:58:42 +10:00
parent ad1716e376
commit bee1f986a9
No known key found for this signature in database
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/cpu_newrec_compiler_aarch64.cpp
View File

@ -224,7 +224,7 @@ void CPU::NewRec::AArch64Compiler::GenerateBlockProtectCheck(const u8* ram_ptr,
armAsm->ldr(vtmp, MemOperand(RXARG2, offset)); armAsm->ldr(vtmp, MemOperand(RXARG2, offset));
armAsm->cmeq(dst, dst, vtmp); armAsm->cmeq(dst, dst, vtmp);
if (!first) if (!first)
armAsm->and_(dst.V16B(), dst.V16B(), vtmp.V16B()); armAsm->and_(v0.V16B(), v0.V16B(), dst.V16B());
else else
first = false; first = false;
@ -1967,6 +1967,7 @@ void CPU::NewRec::AArch64Compiler::TestInterrupts(const vixl::aarch64::WRegister
(inst + 1)->cop.cop_n)); (inst + 1)->cop.cop_n));
EmitMov(RWARG2, m_compiler_pc); EmitMov(RWARG2, m_compiler_pc);
EmitCall(reinterpret_cast<const void*>(static_cast<void (*)(u32, u32)>(&CPU::RaiseException))); EmitCall(reinterpret_cast<const void*>(static_cast<void (*)(u32, u32)>(&CPU::RaiseException)));
m_dirty_pc = false;
EndAndLinkBlock(std::nullopt, true, false); EndAndLinkBlock(std::nullopt, true, false);
} }
else else

1
src/core/cpu_newrec_compiler_riscv64.cpp
View File

@ -2223,6 +2223,7 @@ void CPU::NewRec::RISCV64Compiler::TestInterrupts(const biscuit::GPR& sr)
(inst + 1)->cop.cop_n)); (inst + 1)->cop.cop_n));
EmitMov(RARG2, m_compiler_pc); EmitMov(RARG2, m_compiler_pc);
EmitCall(reinterpret_cast<const void*>(static_cast<void (*)(u32, u32)>(&CPU::RaiseException))); EmitCall(reinterpret_cast<const void*>(static_cast<void (*)(u32, u32)>(&CPU::RaiseException)));
m_dirty_pc = false;
EndAndLinkBlock(std::nullopt, true, false); EndAndLinkBlock(std::nullopt, true, false);
} }
else else

2
src/core/cpu_recompiler_code_generator_aarch64.cpp
View File

@ -2270,7 +2270,7 @@ void CodeGenerator::EmitBlockProtectCheck(const u8* ram_ptr, const u8* shadow_pt
m_emit->ldr(vtmp, a64::MemOperand(RXARG2, offset)); m_emit->ldr(vtmp, a64::MemOperand(RXARG2, offset));
m_emit->cmeq(dst, dst, vtmp); m_emit->cmeq(dst, dst, vtmp);
if (!first) if (!first)
m_emit->and_(dst.V16B(), dst.V16B(), vtmp.V16B()); m_emit->and_(a64::v0.V16B(), a64::v0.V16B(), dst.V16B());
else else
first = false; first = false;

4
src/util/CMakeLists.txt
View File

@ -284,11 +284,11 @@ elseif(NOT ANDROID)
endif() endif()
if(NOT WIN32 AND NOT ANDROID) if(NOT WIN32 AND NOT ANDROID)
target_sources(common PRIVATE target_sources(util PRIVATE
http_downloader_curl.cpp http_downloader_curl.cpp
http_downloader_curl.h http_downloader_curl.h
) )
target_link_libraries(common PRIVATE target_link_libraries(util PRIVATE
CURL::libcurl CURL::libcurl
) )
endif() endif()