diff --git a/Core/MIPS/fake/FakeJit.h b/Core/MIPS/fake/FakeJit.h index 45331028f3..ee5de35ce3 100644 --- a/Core/MIPS/fake/FakeJit.h +++ b/Core/MIPS/fake/FakeJit.h @@ -229,9 +229,6 @@ private: FakeJitOptions jo; JitState js; -// FakeRegCache gpr; -// FakeRegCacheFPU fpr; - MIPSState *mips_; int dontLogBlocks; diff --git a/Qt/Common.pro b/Qt/Common.pro index 78ae82b794..927ca5affc 100644 --- a/Qt/Common.pro +++ b/Qt/Common.pro @@ -8,9 +8,7 @@ include(Settings.pri) # CPU arm { SOURCES += $$P/Common/ArmCPUDetect.cpp \ - $$P/Common/ArmEmitter.cpp \ $$P/Common/ArmThunk.cpp - HEADERS += $$P/Common/ArmEmitter.h } i86 { SOURCES += $$P/Common/ABI.cpp \ @@ -23,7 +21,9 @@ i86 { $$P/Common/x64Analyzer.h \ $$P/Common/x64Emitter.h } -HEADERS += $$P/Common/CPUDetect.h +SOURCES += $$P/Common/ArmEmitter.cpp +HEADERS += $$P/Common/ArmEmitter.h \ + $$P/Common/CPUDetect.h win32 { SOURCES += $$P/Common/stdafx.cpp diff --git a/Qt/Core.pro b/Qt/Core.pro index 9370d08ebf..7d9f541c13 100644 --- a/Qt/Core.pro +++ b/Qt/Core.pro @@ -9,8 +9,7 @@ INCLUDEPATH += $$P/ $$P/native $$P/Core/MIPS $$P/ext/xbrz !contains(DEFINES, USING_GLES2): INCLUDEPATH += $$P/native/ext/glew arm { - SOURCES += $$P/Core/MIPS/ARM/*.cpp \ #CoreARM - $$P/ext/disarm.cpp + SOURCES += $$P/Core/MIPS/ARM/*.cpp #CoreARM HEADERS += $$P/Core/MIPS/ARM/*.h } else:i86 { @@ -21,6 +20,7 @@ else { SOURCES += $$P/Core/MIPS/fake/*.cpp HEADERS += $$P/Core/MIPS/fake/*.h } +SOURCES += $$P/ext/disarm.cpp SOURCES += $$P/Core/*.cpp \ # Core $$P/Core/Debugger/*.cpp \