diff --git a/UWP/Armips_UWP/Armips_UWP.vcxproj b/UWP/Armips_UWP/Armips_UWP.vcxproj index a836263550..4610681d23 100644 --- a/UWP/Armips_UWP/Armips_UWP.vcxproj +++ b/UWP/Armips_UWP/Armips_UWP.vcxproj @@ -278,6 +278,12 @@ + + + + + + @@ -329,6 +335,12 @@ + + + + + + diff --git a/UWP/Armips_UWP/Armips_UWP.vcxproj.filters b/UWP/Armips_UWP/Armips_UWP.vcxproj.filters index 37d23a6b09..0ba78a266d 100644 --- a/UWP/Armips_UWP/Armips_UWP.vcxproj.filters +++ b/UWP/Armips_UWP/Armips_UWP.vcxproj.filters @@ -56,6 +56,24 @@ Archs\MIPS + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + Archs @@ -202,6 +220,24 @@ Archs\MIPS + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + Archs @@ -300,6 +336,9 @@ {bef7b4a2-b049-4d00-810c-6d8d6605c2a3} + + {bef7b4a2-b049-4d00-810c-6d8d6605c2a4} + {2ce1016b-f93c-48b9-abe5-d3fbbcd24780} diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 333733382e..8913f641e5 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -584,6 +584,12 @@ LIBARMIPS_FILES := \ $(SRC)/ext/armips/Archs/MIPS/MipsOpcodes.cpp \ $(SRC)/ext/armips/Archs/MIPS/MipsParser.cpp \ $(SRC)/ext/armips/Archs/MIPS/PsxRelocator.cpp \ + $(SRC)/ext/armips/Archs/SuperH/CShInstruction.cpp \ + $(SRC)/ext/armips/Archs/SuperH/ShElfRelocator.cpp \ + $(SRC)/ext/armips/Archs/SuperH/ShExpressionFunctions.cpp \ + $(SRC)/ext/armips/Archs/SuperH/ShOpcodes.cpp \ + $(SRC)/ext/armips/Archs/SuperH/ShParser.cpp \ + $(SRC)/ext/armips/Archs/SuperH/SuperH.cpp \ $(SRC)/ext/armips/Archs/Architecture.cpp \ $(SRC)/ext/armips/Commands/CAssemblerCommand.cpp \ $(SRC)/ext/armips/Commands/CAssemblerLabel.cpp \ diff --git a/ext/armips b/ext/armips index b4335f04fa..6719edebaa 160000 --- a/ext/armips +++ b/ext/armips @@ -1 +1 @@ -Subproject commit b4335f04fa62c1b4f7833c70fbb15505b6772274 +Subproject commit 6719edebaae03330ee5441d9b28280672edf00d5 diff --git a/ext/libarmips.vcxproj b/ext/libarmips.vcxproj index c0484e63d1..bd9f5c9911 100644 --- a/ext/libarmips.vcxproj +++ b/ext/libarmips.vcxproj @@ -502,6 +502,12 @@ + + + + + + @@ -554,6 +560,12 @@ + + + + + + diff --git a/ext/libarmips.vcxproj.filters b/ext/libarmips.vcxproj.filters index 61282421bb..4a9b54143c 100644 --- a/ext/libarmips.vcxproj.filters +++ b/ext/libarmips.vcxproj.filters @@ -31,6 +31,9 @@ {d1037c70-bb54-46fc-8b0c-a47c4ea4a252} + + {496988ff-1b2f-4046-bc02-b5ad9a1952b4} + @@ -183,6 +186,24 @@ Core + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + @@ -341,5 +362,23 @@ Core + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + + + Archs\SuperH + \ No newline at end of file