Merge pull request #37 from meepingsnesroms/devel

Please work now
This commit is contained in:
meepingsnesroms
2018-12-08 16:25:39 +00:00
committed by GitHub
5 changed files with 5 additions and 4 deletions

View File

@@ -144,6 +144,7 @@ ifeq ($(platform),ios-arm64)
else
CC = cc -arch armv7 -isysroot $(IOSSDK)
EMU_OPTIMIZE_FOR_ARM = 1
EMU_NEW_ASM_SYNTAX = 1
endif
LD = armv7-apple-darwin11-ld

View File

@@ -86,7 +86,7 @@ INCLUDEPATH += $$PWD/qt-common/include
# only use with ARMv4<->7, ARMv8 is its own architecture
optimize_for_arm{
DEFINES += EMU_OPTIMIZE_FOR_ARM
SOURCES += ../../src/m68k/cyclone/CycloneClang.S
SOURCES += ../../src/m68k/cyclone/CycloneNew.S
}else{
SOURCES += ../../src/m68k/musashi/m68kcpu.c \
../../src/m68k/musashi/m68kdasm.c \

View File

@@ -15,10 +15,10 @@ EMU_SOURCES_C := $(EMU_PATH)/emulator.c \
#only use with ARMv4<->7, ARMv8 is its own architecture
ifeq ($(EMU_OPTIMIZE_FOR_ARM), 1)
EMU_DEFINES += -DEMU_OPTIMIZE_FOR_ARM
ifeq ($(EMU_COMPILER_CLANG), 1)
EMU_SOURCES_ASM += $(EMU_PATH)/m68k/cyclone/CycloneClang.S
ifeq ($(EMU_NEW_ASM_SYNTAX), 1)
EMU_SOURCES_ASM += $(EMU_PATH)/m68k/cyclone/CycloneNew.S
else
EMU_SOURCES_ASM += $(EMU_PATH)/m68k/cyclone/CycloneGcc.S
EMU_SOURCES_ASM += $(EMU_PATH)/m68k/cyclone/CycloneOld.S
endif
else
EMU_SOURCES_C += $(EMU_PATH)/m68k/musashi/m68kops.c \