Build armips in libretro builds (requirement for some lua functionality)

Author: hrydgard

CMakeLists.txt

@@ -2147,7 +2147,7 @@ add_library(${CoreLibName} ${CoreLinkType}
 	Core/Dialog/SavedataParam.h
 	Core/ELF/ElfReader.cpp
 	Core/ELF/ElfReader.h
-	Core/ELF/ElfTypes.h
+	Core/ELF/PSPElfTypes.h
 	Core/ELF/PBPReader.cpp
 	Core/ELF/PBPReader.h
 	Core/ELF/PrxDecrypter.cpp

Core/Core.vcxproj

@@ -1096,7 +1096,7 @@
     <ClInclude Include="Dialog\PSPScreenshotDialog.h" />
     <ClInclude Include="Dialog\SavedataParam.h" />
     <ClInclude Include="ELF\ElfReader.h" />
-    <ClInclude Include="ELF\ElfTypes.h" />
+    <ClInclude Include="ELF\PSPElfTypes.h" />
     <ClInclude Include="ELF\ParamSFO.h" />
     <ClInclude Include="ELF\PBPReader.h" />
     <ClInclude Include="ELF\PrxDecrypter.h" />
@@ -1348,4 +1348,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Core/Core.vcxproj.filters

@@ -1398,7 +1398,7 @@
     <ClInclude Include="ELF\ElfReader.h">
       <Filter>ELF</Filter>
     </ClInclude>
-    <ClInclude Include="ELF\ElfTypes.h">
+    <ClInclude Include="ELF\PSPElfTypes.h">
       <Filter>ELF</Filter>
     </ClInclude>
     <ClInclude Include="MIPS\MIPSDebugInterface.h">

Core/ELF/ElfReader.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "Common/CommonTypes.h"
-#include "Core/ELF/ElfTypes.h"
+#include "Core/ELF/PSPElfTypes.h"
 
 enum {
 	R_MIPS_NONE,

Core/ELF/ElfTypes.h renamed to Core/ELF/PSPElfTypes.h

@@ -131,7 +131,7 @@
     <ClInclude Include="..\..\Core\Dialog\PSPScreenshotDialog.h" />
     <ClInclude Include="..\..\Core\Dialog\SavedataParam.h" />
     <ClInclude Include="..\..\Core\ELF\ElfReader.h" />
-    <ClInclude Include="..\..\Core\ELF\ElfTypes.h" />
+    <ClInclude Include="..\..\Core\ELF\PSPElfTypes.h" />
     <ClInclude Include="..\..\Core\ELF\ParamSFO.h" />
     <ClInclude Include="..\..\Core\ELF\PBPReader.h" />
     <ClInclude Include="..\..\Core\ELF\PrxDecrypter.h" />
@@ -1032,4 +1032,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

UWP/CoreUWP/CoreUWP.vcxproj

@@ -458,7 +458,7 @@
     <ClInclude Include="..\..\Core\Dialog\PSPScreenshotDialog.h" />
     <ClInclude Include="..\..\Core\Dialog\SavedataParam.h" />
     <ClInclude Include="..\..\Core\ELF\ElfReader.h" />
-    <ClInclude Include="..\..\Core\ELF\ElfTypes.h" />
+    <ClInclude Include="..\..\Core\ELF\PSPElfTypes.h" />
     <ClInclude Include="..\..\Core\ELF\ParamSFO.h" />
     <ClInclude Include="..\..\Core\ELF\PBPReader.h" />
     <ClInclude Include="..\..\Core\ELF\PrxDecrypter.h" />

UWP/CoreUWP/CoreUWP.vcxproj.filters

@@ -306,6 +306,54 @@ SOURCES_CXX += \
 	${EXTDIR}/at3_standalone/fft.cpp \
 	${EXTDIR}/at3_standalone/mem.cpp
 
+SOURCES_CXX += \
+	$(EXTDIR)/armips/Util/ByteArray.cpp \
+	$(EXTDIR)/armips/Util/CRC.cpp \
+	$(EXTDIR)/armips/Util/EncodingTable.cpp \
+	$(EXTDIR)/armips/Util/FileClasses.cpp \
+	$(EXTDIR)/armips/Util/Util.cpp \
+	$(EXTDIR)/armips/Core/ELF/ElfRelocator.cpp \
+	$(EXTDIR)/armips/Core/ELF/ElfFile.cpp \
+	$(EXTDIR)/armips/Core/Assembler.cpp \
+	$(EXTDIR)/armips/Core/Common.cpp \
+	$(EXTDIR)/armips/Core/Expression.cpp \
+	$(EXTDIR)/armips/Core/ExpressionFunctions.cpp \
+	$(EXTDIR)/armips/Core/FileManager.cpp \
+	$(EXTDIR)/armips/Core/Misc.cpp \
+	$(EXTDIR)/armips/Core/SymbolData.cpp \
+	$(EXTDIR)/armips/Core/SymbolTable.cpp \
+	$(EXTDIR)/armips/Commands/CAssemblerCommand.cpp \
+	$(EXTDIR)/armips/Commands/CAssemblerLabel.cpp \
+	$(EXTDIR)/armips/Commands/CDirectiveArea.cpp \
+	$(EXTDIR)/armips/Commands/CDirectiveConditional.cpp \
+	$(EXTDIR)/armips/Commands/CDirectiveData.cpp \
+	$(EXTDIR)/armips/Commands/CDirectiveFile.cpp \
+	$(EXTDIR)/armips/Commands/CDirectiveMessage.cpp \
+	$(EXTDIR)/armips/Commands/CommandSequence.cpp \
+	$(EXTDIR)/armips/Archs/Architecture.cpp \
+	$(EXTDIR)/armips/Archs/ARM/Arm.cpp \
+	$(EXTDIR)/armips/Archs/ARM/ArmOpcodes.cpp \
+	$(EXTDIR)/armips/Archs/ARM/ArmParser.cpp \
+	$(EXTDIR)/armips/Archs/ARM/ArmElfRelocator.cpp \
+	$(EXTDIR)/armips/Archs/ARM/ArmExpressionFunctions.cpp \
+	$(EXTDIR)/armips/Archs/ARM/CArmInstruction.cpp \
+	$(EXTDIR)/armips/Archs/ARM/CThumbInstruction.cpp \
+	$(EXTDIR)/armips/Archs/ARM/Pool.cpp \
+	$(EXTDIR)/armips/Archs/ARM/ThumbOpcodes.cpp \
+	$(EXTDIR)/armips/Archs/MIPS/CMipsInstruction.cpp \
+	$(EXTDIR)/armips/Archs/MIPS/Mips.cpp \
+	$(EXTDIR)/armips/Archs/MIPS/MipsElfFile.cpp \
+	$(EXTDIR)/armips/Archs/MIPS/MipsElfRelocator.cpp \
+	$(EXTDIR)/armips/Archs/MIPS/MipsExpressionFunctions.cpp \
+	$(EXTDIR)/armips/Archs/MIPS/MipsMacros.cpp \
+	$(EXTDIR)/armips/Archs/MIPS/MipsOpcodes.cpp \
+	$(EXTDIR)/armips/Archs/MIPS/MipsParser.cpp \
+	$(EXTDIR)/armips/Archs/MIPS/PsxRelocator.cpp \
+	$(EXTDIR)/armips/Parser/DirectivesParser.cpp \
+	$(EXTDIR)/armips/Parser/ExpressionParser.cpp \
+	$(EXTDIR)/armips/Parser/Parser.cpp \
+	$(EXTDIR)/armips/Parser/Tokenizer.cpp
+
 ifeq ($(PLATFORM_EXT), android)
 COREFLAGS += -DHAVE_DLFCN_H
 else ifneq ($(PLATFORM_EXT), win32)