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

WIP - Fixes merge 3 (it now compiles fully)

Browse source
This commit is contained in:
Dimitris Panokostas 2017-09-19 14:24:41 +02:00
parent 5adf64a276
commit 7bc131d023
50 changed files with 947 additions and 3223 deletions
Download patch file Download diff file Expand all files Collapse all files

30
VSLinux/Amiberry.vcxproj
View file

@ -51,18 +51,20 @@
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<RemoteBuildCommandLine>cd ~/projects/Amiberry; make</RemoteBuildCommandLine>
<RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make</RemoteReBuildCommandLine>
<RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j4</RemoteBuildCommandLine>
<RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j4</RemoteReBuildCommandLine>
<RemoteCleanCommandLine>cd ~/projects/Amiberry; make clean</RemoteCleanCommandLine>
<NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;C:\GitHub\amiberry\src\guisan\include;C:\GitHub\amiberry\src\threaddep;C:\GitHub\amiberry\src\osdep;C:\GitHub\amiberry\src;C:\GitHub\amiberry\src\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<NMakePreprocessorDefinitions>DEBUG;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;CAPSLOCK_DEBIAN_WORKAROUND;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";USE_SDL;_REENTRANT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<NMakeIncludeSearchPath>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\GitHub\amiberry\src;C:\GitHub\amiberry\src\include;C:\GitHub\amiberry\src\osdep;C:\GitHub\amiberry\src\threaddep;C:\GitHub\amiberry\src\guisan\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<NMakePreprocessorDefinitions>DEBUG;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;CAPSLOCK_DEBIAN_WORKAROUND;USE_SDL;_REENTRANT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<RemoteBuildOutputs>
</RemoteBuildOutputs>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;D:\midwa\Projects\GitHub\amiberry\src\guisan\include;D:\midwa\Projects\GitHub\amiberry\src\threaddep;D:\midwa\Projects\GitHub\amiberry\src\osdep;D:\midwa\Projects\GitHub\amiberry\src;D:\midwa\Projects\GitHub\amiberry\src\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<RemoteBuildCommandLine>cd ~/projects/Amiberry; make</RemoteBuildCommandLine>
<RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make</RemoteReBuildCommandLine>
<NMakeIncludeSearchPath>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\4.9\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\4.9;C:\SysGCC\raspberry\arm-linux-gnueabihf\include;C:\GitHub\amiberry\src;C:\GitHub\amiberry\src\include;C:\GitHub\amiberry\src\osdep;C:\GitHub\amiberry\src\threaddep;C:\GitHub\amiberry\src\guisan\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vmcs_host\linux;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\opt\vc\include\interface\vcos\pthreads;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j4</RemoteBuildCommandLine>
<RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j4</RemoteReBuildCommandLine>
<RemoteCleanCommandLine>cd ~/projects/Amiberry; make clean</RemoteCleanCommandLine>
<NMakePreprocessorDefinitions>ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;CAPSLOCK_DEBIAN_WORKAROUND;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";USE_SDL;_REENTRANT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<NMakePreprocessorDefinitions>ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;CAPSLOCK_DEBIAN_WORKAROUND;USE_SDL;_REENTRANT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<ItemGroup>
<Text Include="..\conf\dir.txt">
@ -149,18 +151,13 @@
<DeploymentContent>false</DeploymentContent>
</ClCompile>
<ClCompile Include="..\src\ar.cpp" />
<ClCompile Include="..\src\archivers\7z\7zAlloc.cpp" />
<ClCompile Include="..\src\archivers\7z\7zBuf.cpp" />
<ClCompile Include="..\src\archivers\7z\7zBuf2.c" />
<ClCompile Include="..\src\archivers\7z\7zCrc.cpp" />
<ClCompile Include="..\src\archivers\7z\7zCrcOpt.cpp" />
<ClCompile Include="..\src\archivers\7z\7zDec.cpp" />
<ClCompile Include="..\src\archivers\7z\7zDecode.cpp" />
<ClCompile Include="..\src\archivers\7z\7zExtract.cpp" />
<ClCompile Include="..\src\archivers\7z\7zFile.c" />
<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\Alloc.c" />
<ClCompile Include="..\src\archivers\7z\Bcj2.cpp" />
@ -418,7 +415,6 @@
<ClCompile Include="..\src\osdep\gui\UaeRadioButton.cpp" />
<ClCompile Include="..\src\osdep\hardfile_amiberry.cpp" />
<ClCompile Include="..\src\osdep\keyboard_amiberry.cpp" />
<ClCompile Include="..\src\osdep\menu\menu_config.cpp" />
<ClCompile Include="..\src\osdep\mp3decoder.cpp" />
<ClCompile Include="..\src\osdep\picasso96.cpp" />
<ClCompile Include="..\src\osdep\sigsegv_handler.cpp" />
@ -465,15 +461,9 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\archivers\7z\7z.h" />
<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\7zFile.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\Alloc.h" />
<ClInclude Include="..\src\archivers\7z\Bcj2.h" />

45
VSLinux/Amiberry.vcxproj.filters
View file

@ -55,9 +55,6 @@
<Filter Include="src\osdep\gui">
<UniqueIdentifier>{b25f6ac8-afcb-45b8-a0fc-f0bc1c88fba1}</UniqueIdentifier>
</Filter>
<Filter Include="src\osdep\menu">
<UniqueIdentifier>{32996091-d9d9-437f-8338-e15198404b91}</UniqueIdentifier>
</Filter>
<Filter Include="src\sounddep">
<UniqueIdentifier>{767f436f-8275-4c9f-abf9-a880ba80c1f2}</UniqueIdentifier>
</Filter>
@ -333,30 +330,12 @@
<ClCompile Include="..\src\zfile_archive.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\src\archivers\7z\7zAlloc.cpp">
<Filter>src\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\src\archivers\7z\7zBuf.cpp">
<Filter>src\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\src\archivers\7z\7zCrc.cpp">
<Filter>src\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\src\archivers\7z\7zDecode.cpp">
<Filter>src\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\src\archivers\7z\7zExtract.cpp">
<Filter>src\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\src\archivers\7z\7zHeader.cpp">
<Filter>src\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\src\archivers\7z\7zIn.cpp">
<Filter>src\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\src\archivers\7z\7zItem.cpp">
<Filter>src\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\src\archivers\7z\7zStream.cpp">
<Filter>src\archivers\7z</Filter>
</ClCompile>
@ -606,9 +585,6 @@
<ClCompile Include="..\src\osdep\gui\UaeRadioButton.cpp">
<Filter>src\osdep\gui</Filter>
</ClCompile>
<ClCompile Include="..\src\osdep\menu\menu_config.cpp">
<Filter>src\osdep\menu</Filter>
</ClCompile>
<ClCompile Include="..\src\sounddep\sound.cpp">
<Filter>src\sounddep</Filter>
</ClCompile>
@ -762,32 +738,17 @@
<ClCompile Include="..\src\osdep\gui\ShowHelp.cpp">
<Filter>src\osdep\gui</Filter>
</ClCompile>
<ClCompile Include="..\src\archivers\7z\7zIn.cpp">
<Filter>src\archivers\7z</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\archivers\7z\7zAlloc.h">
<Filter>src\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\src\archivers\7z\7zBuf.h">
<Filter>src\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\src\archivers\7z\7zCrc.h">
<Filter>src\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\src\archivers\7z\7zDecode.h">
<Filter>src\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\src\archivers\7z\7zExtract.h">
<Filter>src\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\src\archivers\7z\7zHeader.h">
<Filter>src\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\src\archivers\7z\7zIn.h">
<Filter>src\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\src\archivers\7z\7zItem.h">
<Filter>src\archivers\7z</Filter>
</ClInclude>
<ClInclude Include="..\src\archivers\7z\7zVersion.h">
<Filter>src\archivers\7z</Filter>
</ClInclude>

4
VSLinux/Amiberry.vcxproj.user
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<RemoteDebuggerCommand>~/projects/amiberry/amiberry-sdl2</RemoteDebuggerCommand>
<RemoteDebuggerWorkingDirectory>~/projects/amiberry</RemoteDebuggerWorkingDirectory>
<RemoteDebuggerCommand>projects/amiberry/amiberry-sdl2</RemoteDebuggerCommand>
<RemoteDebuggerWorkingDirectory>projects/amiberry</RemoteDebuggerWorkingDirectory>
<DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
<PreLaunchCommand>
</PreLaunchCommand>