pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved 7z/Archive/7z files to 7z/ folder for simplicity

Browse source
This commit is contained in:
Dimitris Panokostas 2017-03-30 23:47:33 +02:00
parent d00db779b1
commit b0bc4a3046
16 changed files with 110 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -98,12 +98,12 @@ OBJS = \
src/uaeresource.o \
src/zfile.o \
src/zfile_archive.o \
src/archivers/7z/Archive/7z/7zAlloc.o \
src/archivers/7z/Archive/7z/7zDecode.o \
src/archivers/7z/Archive/7z/7zExtract.o \
src/archivers/7z/Archive/7z/7zHeader.o \
src/archivers/7z/Archive/7z/7zIn.o \
src/archivers/7z/Archive/7z/7zItem.o \
src/archivers/7z/7zAlloc.o \
src/archivers/7z/7zDecode.o \
src/archivers/7z/7zExtract.o \
src/archivers/7z/7zHeader.o \
src/archivers/7z/7zIn.o \
src/archivers/7z/7zItem.o \
src/archivers/7z/7zBuf.o \
src/archivers/7z/7zCrc.o \
src/archivers/7z/7zStream.o \

24
VisualGDB/Amiberry/Amiberry.vcxproj
View file

@ -119,15 +119,15 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\akiko.cpp" />
<ClCompile Include="..\..\src\archivers\7z\7zAlloc.cpp" />
<ClCompile Include="..\..\src\archivers\7z\7zBuf.cpp" />
<ClCompile Include="..\..\src\archivers\7z\7zCrc.cpp" />
<ClCompile Include="..\..\src\archivers\7z\7zDecode.cpp" />
<ClCompile Include="..\..\src\archivers\7z\7zExtract.cpp" />
<ClCompile Include="..\..\src\archivers\7z\7zHeader.cpp" />
<ClCompile Include="..\..\src\archivers\7z\7zIn.cpp" />
<ClCompile Include="..\..\src\archivers\7z\7zItem.cpp" />
<ClCompile Include="..\..\src\archivers\7z\7zStream.cpp" />
<ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zAlloc.cpp" />
<ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zDecode.cpp" />
<ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zExtract.cpp" />
<ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zHeader.cpp" />
<ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zIn.cpp" />
<ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zItem.cpp" />
<ClCompile Include="..\..\src\archivers\7z\Bcj2.cpp" />
<ClCompile Include="..\..\src\archivers\7z\Bra.cpp" />
<ClCompile Include="..\..\src\archivers\7z\Bra86.cpp" />
@ -316,15 +316,15 @@
</Font>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\archivers\7z\7zAlloc.h" />
<ClInclude Include="..\..\src\archivers\7z\7zBuf.h" />
<ClInclude Include="..\..\src\archivers\7z\7zCrc.h" />
<ClInclude Include="..\..\src\archivers\7z\7zDecode.h" />
<ClInclude Include="..\..\src\archivers\7z\7zExtract.h" />
<ClInclude Include="..\..\src\archivers\7z\7zHeader.h" />
<ClInclude Include="..\..\src\archivers\7z\7zIn.h" />
<ClInclude Include="..\..\src\archivers\7z\7zItem.h" />
<ClInclude Include="..\..\src\archivers\7z\7zVersion.h" />
<ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zAlloc.h" />
<ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zDecode.h" />
<ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zExtract.h" />
<ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zHeader.h" />
<ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zIn.h" />
<ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zItem.h" />
<ClInclude Include="..\..\src\archivers\7z\Bcj2.h" />
<ClInclude Include="..\..\src\archivers\7z\Bra.h" />
<ClInclude Include="..\..\src\archivers\7z\CpuArch.h" />

174
VisualGDB/Amiberry/Amiberry.vcxproj.filters
View file

@ -41,18 +41,6 @@
<Filter Include="Source files\archivers\7z">
<UniqueIdentifier>{4e7f85db-d3e3-4b65-b969-a7b829bc3281}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\archivers\7z\Archive">
<UniqueIdentifier>{b1a09498-1e4a-40d4-a986-9e09ad865690}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\archivers\7z\Archive\7z">
<UniqueIdentifier>{dcfa291d-f91e-4f23-a259-791df4811cc0}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\archivers\7z\Archive">
<UniqueIdentifier>{7944e92f-3c23-4f86-842a-aa199a00dd35}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\archivers\7z\Archive\7z">
<UniqueIdentifier>{ad85bf25-c171-40d2-ae9d-997bd5237bab}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\archivers\dms">
<UniqueIdentifier>{a44fad77-d044-486d-8a84-3f2f17c6bb49}</UniqueIdentifier>
</Filter>
@ -303,45 +291,6 @@
<ClCompile Include="..\..\src\jit\compstbl.cpp">
<Filter>Source files\jit</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\7zBuf.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\7zCrc.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\7zStream.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\Bcj2.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\Bra.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\Bra86.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\LzmaDec.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zAlloc.cpp">
<Filter>Source files\archivers\7z\Archive\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zDecode.cpp">
<Filter>Source files\archivers\7z\Archive\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zExtract.cpp">
<Filter>Source files\archivers\7z\Archive\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zHeader.cpp">
<Filter>Source files\archivers\7z\Archive\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zIn.cpp">
<Filter>Source files\archivers\7z\Archive\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zItem.cpp">
<Filter>Source files\archivers\7z\Archive\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\dms\crc_csum.cpp">
<Filter>Source files\archivers\dms</Filter>
</ClCompile>
@ -561,6 +510,45 @@
<ClCompile Include="..\..\src\osdep\keyboard_amiberry.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\7zAlloc.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\7zBuf.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\7zCrc.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\7zDecode.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\7zExtract.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\7zHeader.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\7zIn.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\7zItem.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\7zStream.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\Bcj2.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\Bra.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\Bra86.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\..\src\archivers\7z\LzmaDec.cpp">
<Filter>Source files\archivers\7z</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\data\35floppy.ico">
@ -810,48 +798,6 @@
<ClInclude Include="..\..\src\jit\comptbl.h">
<Filter>Header files\jit</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\7zBuf.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\7zCrc.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\7zVersion.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\Bcj2.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\Bra.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\CpuArch.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\LzmaDec.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\Types.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zAlloc.h">
<Filter>Header files\archivers\7z\Archive\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zDecode.h">
<Filter>Header files\archivers\7z\Archive\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zExtract.h">
<Filter>Header files\archivers\7z\Archive\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zHeader.h">
<Filter>Header files\archivers\7z\Archive\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zIn.h">
<Filter>Header files\archivers\7z\Archive\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zItem.h">
<Filter>Header files\archivers\7z\Archive\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\dms\cdata.h">
<Filter>Header files\archivers\dms</Filter>
</ClInclude>
@ -1149,5 +1095,47 @@
<ClInclude Include="..\..\src\osdep\amiberry_rp9.h">
<Filter>Header files\osdep</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\7zAlloc.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\7zBuf.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\7zCrc.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\7zDecode.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\7zExtract.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\7zHeader.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\7zIn.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\7zItem.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\7zVersion.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\Bcj2.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\Bra.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\CpuArch.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\LzmaDec.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\..\src\archivers\7z\Types.h">
<Filter>Header files\archivers\7z</Filter>
</ClInclude>
</ItemGroup>
</Project>

0
src/archivers/7z/Archive/7z/7zAlloc.cpp → src/archivers/7z/7zAlloc.cpp
View file

0
src/archivers/7z/Archive/7z/7zAlloc.h → src/archivers/7z/7zAlloc.h
View file

6
src/archivers/7z/Archive/7z/7zDecode.cpp → src/archivers/7z/7zDecode.cpp
View file

@ -3,9 +3,9 @@
#include <string.h>
#include "../../Bcj2.h"
#include "../../Bra.h"
#include "../../LzmaDec.h"
#include "Bcj2.h"
#include "Bra.h"
#include "LzmaDec.h"
#include "7zDecode.h"
#define k_Copy 0

0
src/archivers/7z/Archive/7z/7zDecode.h → src/archivers/7z/7zDecode.h
View file

2
src/archivers/7z/Archive/7z/7zExtract.cpp → src/archivers/7z/7zExtract.cpp
View file

@ -1,7 +1,7 @@
/* 7zExtract.c -- Extracting from 7z archive
2008-11-23 : Igor Pavlov : Public domain */
#include "../../7zCrc.h"
#include "7zCrc.h"
#include "7zDecode.h"
#include "7zExtract.h"

0
src/archivers/7z/Archive/7z/7zExtract.h → src/archivers/7z/7zExtract.h
View file

0
src/archivers/7z/Archive/7z/7zHeader.cpp → src/archivers/7z/7zHeader.cpp
View file

2
src/archivers/7z/Archive/7z/7zHeader.h → src/archivers/7z/7zHeader.h
View file

@ -4,7 +4,7 @@
#ifndef __7Z_HEADER_H
#define __7Z_HEADER_H
#include "../../Types.h"
#include "Types.h"
#define k7zSignatureSize 6
extern Byte k7zSignature[k7zSignatureSize];

4
src/archivers/7z/Archive/7z/7zIn.cpp → src/archivers/7z/7zIn.cpp
View file

@ -1,8 +1,8 @@
/* 7zIn.c -- 7z Input functions
2008-12-31 : Igor Pavlov : Public domain */
#include "../../7zCrc.h"
#include "../../CpuArch.h"
#include "7zCrc.h"
#include "CpuArch.h"
#include "7zDecode.h"
#include "7zIn.h"

0
src/archivers/7z/Archive/7z/7zIn.h → src/archivers/7z/7zIn.h
View file

0
src/archivers/7z/Archive/7z/7zItem.cpp → src/archivers/7z/7zItem.cpp
View file

2
src/archivers/7z/Archive/7z/7zItem.h → src/archivers/7z/7zItem.h
View file

@ -4,7 +4,7 @@
#ifndef __7Z_ITEM_H
#define __7Z_ITEM_H
#include "../../7zBuf.h"
#include "7zBuf.h"
typedef struct
{

6
src/zfile_archive.cpp
View file

@ -492,9 +492,9 @@ static struct zfile *archive_unpack_zip (struct zfile *zf)
#include "archivers/7z/Types.h"
#include "archivers/7z/7zCrc.h"
#include "archivers/7z/Archive/7z/7zIn.h"
#include "archivers/7z/Archive/7z/7zExtract.h"
#include "archivers/7z/Archive/7z/7zAlloc.h"
#include "archivers/7z/7zIn.h"
#include "archivers/7z/7zExtract.h"
#include "archivers/7z/7zAlloc.h"
static ISzAlloc allocImp;
static ISzAlloc allocTempImp;