For CMake disable dynamic recompilation for now.

This commit is contained in:
Stephanie Gawroriski
2020-11-06 20:43:59 -05:00
parent 5a86c5ccf9
commit be386ff05d
4 changed files with 40 additions and 20 deletions

View File

@@ -2,6 +2,13 @@ EMU_PATH := $(CORE_DIR)/../src
LIBRETRO_COMM_DIR := $(CORE_DIR)/libretro-common
COREDEFINES :=
INCFLAGS += -I$(CORE_DIR)/../include \
-I$(CORE_DIR)/../include/m68k \
-I$(CORE_DIR)/../include/audio \
-I$(CORE_DIR)/../include/fileLauncher \
-I$(CORE_DIR)/../include/pxa260 \
-I$(CORE_DIR)/../include/armv5te
# my first make function!!!
CHECK_ALL = $(strip $(foreach v,$(2),$(if $(findstring $(v),$(1)),$(v),)))

View File

@@ -15,7 +15,7 @@ add_library(MuCore STATIC
# Bring all the sub-modules as needed
target_link_libraries(MuCore
#MuCorePxa260Experimental
MuCorePxa260Experimental
MuCoreFileLauncher
MuCoreAudio
MuCoreM68k)

View File

@@ -13,20 +13,40 @@ add_library(MuCoreArmV5TEExperimental STATIC
mmu.c
thumb_interpreter.cpp)
if(CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
target_sources(MuCoreArmV5TEExperimental PUBLIC
translate_aarch64.cpp)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
target_sources(MuCoreArmV5TEExperimental PUBLIC
translate_arm.cpp)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(i386)")
target_sources(MuCoreArmV5TEExperimental PUBLIC
translate_x86.c)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(x86-64)|(amd64)|(AMD64)")
target_sources(MuCoreArmV5TEExperimental PUBLIC
translate_x86_64.c)
# Currently do not enable the dynamic recompiler
set(NO_TRANSLATION)
# Dynamic Recompiler not supported
if(NOT DEFINED NO_TRANSLATION)
target_compile_definitions(MuCoreArmV5TEExperimental
# Disable Dynamic Recompiler (non-portable)
PUBLIC NO_TRANSLATION=1)
else()
# Include Translators
if(CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
target_sources(MuCoreArmV5TEExperimental PUBLIC
translate_aarch64.cpp)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
target_sources(MuCoreArmV5TEExperimental PUBLIC
translate_arm.cpp)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(i386)")
target_sources(MuCoreArmV5TEExperimental PUBLIC
translate_x86.c)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(x86-64)|(amd64)|(AMD64)")
target_sources(MuCoreArmV5TEExperimental PUBLIC
translate_x86_64.c)
endif()
endif()
# Some defines are required for this to function properly
target_compile_definitions(MuCoreArmV5TEExperimental
# Enable PalmOS Support
PUBLIC EMU_SUPPORT_PALM_OS5=1
# forces the dynarec to use accurate mode and disable Nspire OS hacks
PUBLIC SUPPORT_LINUX=1)
# Windows?
if(CMAKE_SYSTEM_NAME STREQUAL Windows)
target_sources(MuCoreArmV5TEExperimental PUBLIC

View File

@@ -20,13 +20,6 @@ add_library(MuCorePxa260Experimental STATIC
target_link_libraries(MuCorePxa260Experimental
MuCoreArmV5TEExperimental)
# Some defines are required for this to function properly
target_compile_definitions(MuCorePxa260Experimental
PUBLIC EMU_SUPPORT_PALM_OS5=1
# forces the dynarec to use accurate mode and disable Nspire OS hacks
PUBLIC SUPPORT_LINUX=1)
# Includes for the project
target_include_directories(MuCorePxa260Experimental PUBLIC
"${PROJECT_BINARY_DIR}"