FEX-Emu/FEX
1
0
Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2025-02-10 00:55:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FEXCore: Disable vixl linking if vixl disasm or simulator is disabled

Browse Source 
This was mostly there, just needed to remove some extraneous headers and
only insert vixl in to the library list if the options were enabled.
This commit is contained in:
Ryan Houdek 2024-08-15 13:25:45 -07:00
parent abbd65549a
commit ef4c4f6e9b
No known key found for this signature in database
8 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FEXCore/Source/CMakeLists.txt
View File

@ -182,7 +182,11 @@ endif()
# Some defines for the softfloat library
list(APPEND DEFINES "-DSOFTFLOAT_BUILTIN_CLZ")
set (LIBS fmt::fmt vixl xxHash::xxhash FEXHeaderUtils CodeEmitter)
set (LIBS fmt::fmt xxHash::xxhash FEXHeaderUtils CodeEmitter)
if (ENABLE_VIXL_DISASSEMBLER OR ENABLE_VIXL_SIMULATOR)
list (APPEND LIBS vixl)
endif()
if (NOT MINGW_BUILD)
list (APPEND LIBS dl)

5
FEXCore/Source/Interface/Core/ArchHelpers/Arm64Emitter.h
View File

@ -4,11 +4,6 @@
#include "FEXCore/Utils/EnumUtils.h"
#include "Interface/Core/ObjectCache/Relocations.h"
#include <aarch64/assembler-aarch64.h>
#include <aarch64/constants-aarch64.h>
#include <aarch64/cpu-aarch64.h>
#include <aarch64/operands-aarch64.h>
#include <platform-vixl.h>
#ifdef VIXL_DISASSEMBLER
#include <aarch64/disasm-aarch64.h>
#endif

3
FEXCore/Source/Interface/Core/JIT/Arm64/JITClass.h
View File

@ -14,9 +14,6 @@ $end_info$
#include "Interface/IR/IntrusiveIRList.h"
#include "Interface/IR/RegisterAllocationData.h"
#include <aarch64/assembler-aarch64.h>
#include <aarch64/disasm-aarch64.h>
#include <FEXCore/Core/CoreState.h>
#include <FEXCore/IR/IR.h>
#include <FEXCore/fextl/map.h>

2
Source/Common/CMakeLists.txt
View File

@ -16,7 +16,7 @@ if (NOT MINGW_BUILD)
endif()
add_library(${NAME} STATIC ${SRCS})
target_link_libraries(${NAME} FEXCore_Base cpp-optparse tiny-json FEXHeaderUtils)
target_link_libraries(${NAME} FEXCore_Base cpp-optparse tiny-json FEXHeaderUtils vixl)
target_include_directories(${NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/External/cpp-optparse/)
target_include_directories(${NAME} PRIVATE ${CMAKE_BINARY_DIR}/generated)
target_include_directories(${NAME} PRIVATE ${CMAKE_SOURCE_DIR}/External/xbyak/)

2
Source/Common/HostFeatures.cpp
View File

@ -2,7 +2,7 @@
#include <FEXCore/Config/Config.h>
#include <FEXCore/Core/HostFeatures.h>
#include "aarch64/cpu-aarch64.h"
#include <aarch64/cpu-aarch64.h>
#ifdef _M_X86_64
#define XBYAK64

2
Source/Common/HostFeatures.h
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
#pragma once
#include <FEXCore/Core/HostFeatures.h>
#include "aarch64/cpu-aarch64.h"
#include <aarch64/cpu-aarch64.h>
namespace FEX {
FEXCore::HostFeatures FetchHostFeatures(vixl::CPUFeatures Features, bool SupportsCacheMaintenanceOps, uint64_t CTR, uint64_t MIDR);

2
Source/Windows/Common/CMakeLists.txt
View File

@ -1,7 +1,7 @@
add_library(CommonWindows STATIC CPUFeatures.cpp InvalidationTracker.cpp Logging.cpp)
add_subdirectory(CRT)
add_subdirectory(WinAPI)
target_link_libraries(CommonWindows FEXCore_Base)
target_link_libraries(CommonWindows FEXCore_Base vixl)
target_compile_options(CommonWindows PRIVATE -Wno-inconsistent-dllimport)
target_include_directories(CommonWindows PRIVATE
"${CMAKE_SOURCE_DIR}/Source/Windows/include/"

2
Source/Windows/Common/CPUFeatures.cpp
View File

@ -5,7 +5,7 @@
#include <FEXCore/fextl/fmt.h>
#include <windows.h>
#include "aarch64/cpu-aarch64.h"
#include <aarch64/cpu-aarch64.h>
#include "CPUFeatures.h"