Skip to content

Commit 4583394

Browse files
committed
fix linking?
1 parent 2256329 commit 4583394

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,4 @@ add_executable(
4545
if(UNIX)
4646
find_package(Threads)
4747
target_link_libraries(${RP_PLAT} ${CMAKE_THREAD_LIBS_INIT})
48-
elseif(WIN32)
49-
target_link_options(${RP_PLAT} PRIVATE /FORCE:MULTIPLE)
5048
endif()

src/third_party/capstone/MathExtras.h

+9
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,20 @@
1717
#ifndef CS_LLVM_SUPPORT_MATHEXTRAS_H
1818
#define CS_LLVM_SUPPORT_MATHEXTRAS_H
1919

20+
// XXX: On Windows MSVC 19.43.34808 I get those and I don't know how to fix that (other than disabling the below macros):
21+
// ```
22+
// 2>AArch64InstPrinter.obj : warning LNK4006: _get_vlen already defined in AArch64Disassembler.obj; second definition ignored
23+
// 2>AArch64InstPrinter.obj : warning LNK4006: __check_arch_support already defined in AArch64Disassembler.obj; second definition ignored
24+
// 2>AArch64InstPrinter.obj : warning LNK4006: __check_isa_avx10_512 already defined in AArch64Disassembler.obj; second definition ignored
25+
// 2>AArch64InstPrinter.obj : warning LNK4006: __check_isa_support already defined in AArch64Disassembler.obj; second definition ignored
26+
// ```
27+
#if 0
2028
#if defined(_WIN32_WCE) && (_WIN32_WCE < 0x800)
2129
#include "windowsce/intrin.h"
2230
#elif defined(_MSC_VER)
2331
#include <intrin.h>
2432
#endif
33+
#endif
2534

2635
#ifndef __cplusplus
2736
#if defined (WIN32) || defined (WIN64) || defined (_WIN32) || defined (_WIN64)

0 commit comments

Comments
 (0)