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

Fixes after merge

Browse source
This commit is contained in:
Dimitris Panokostas 2017-09-27 22:37:23 +02:00
parent 6cfac026cd
commit bf1e07c5a9
14 changed files with 83 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

18
VSLinux/Amiberry.vcxproj
View file

@ -51,8 +51,8 @@
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j4</RemoteBuildCommandLine>
<RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j4</RemoteReBuildCommandLine>
<RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j3</RemoteBuildCommandLine>
<RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j3</RemoteReBuildCommandLine>
<RemoteCleanCommandLine>cd ~/projects/Amiberry; make clean</RemoteCleanCommandLine>
<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>
@ -413,8 +413,8 @@
<ClCompile Include="..\src\osdep\gui\UaeDropDown.cpp" />
<ClCompile Include="..\src\osdep\gui\UaeListBox.cpp" />
<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\amiberry_hardfile.cpp" />
<ClCompile Include="..\src\osdep\keyboard.cpp" />
<ClCompile Include="..\src\osdep\mp3decoder.cpp" />
<ClCompile Include="..\src\osdep\picasso96.cpp" />
<ClCompile Include="..\src\osdep\sigsegv_handler.cpp" />
@ -518,19 +518,16 @@
<ClInclude Include="..\src\include\calc.h" />
<ClInclude Include="..\src\include\cd32_fmv.h" />
<ClInclude Include="..\src\include\cia.h" />
<ClInclude Include="..\src\include\clipboard.h" />
<ClInclude Include="..\src\include\commpipe.h" />
<ClInclude Include="..\src\include\cpummu.h" />
<ClInclude Include="..\src\include\cputbl.h" />
<ClInclude Include="..\src\include\cpu_prefetch.h" />
<ClInclude Include="..\src\include\crc32.h" />
<ClInclude Include="..\src\include\custom.h" />
<ClInclude Include="..\src\include\debug.h" />
<ClInclude Include="..\src\include\devices.h" />
<ClInclude Include="..\src\include\disk.h" />
<ClInclude Include="..\src\include\diskutil.h" />
<ClInclude Include="..\src\include\drawing.h" />
<ClInclude Include="..\src\include\ersatz.h" />
<ClInclude Include="..\src\include\events.h" />
<ClInclude Include="..\src\include\execio.h" />
<ClInclude Include="..\src\include\execlib.h" />
@ -538,8 +535,6 @@
<ClInclude Include="..\src\include\filesys.h" />
<ClInclude Include="..\src\include\flags_arm.h" />
<ClInclude Include="..\src\include\flashrom.h" />
<ClInclude Include="..\src\include\fpp-ieee-be.h" />
<ClInclude Include="..\src\include\fpp-unknown.h" />
<ClInclude Include="..\src\include\fpp.h" />
<ClInclude Include="..\src\include\fsdb.h" />
<ClInclude Include="..\src\include\fsusage.h" />
@ -559,15 +554,12 @@
<ClInclude Include="..\src\include\native2amiga_api.h" />
<ClInclude Include="..\src\include\newcpu.h" />
<ClInclude Include="..\src\include\options.h" />
<ClInclude Include="..\src\include\osemu.h" />
<ClInclude Include="..\src\include\picasso96.h" />
<ClInclude Include="..\src\include\readcpu.h" />
<ClInclude Include="..\src\include\rommgr.h" />
<ClInclude Include="..\src\include\rtc.h" />
<ClInclude Include="..\src\include\rtgmodes.h" />
<ClInclude Include="..\src\include\savestate.h" />
<ClInclude Include="..\src\include\scsi.h" />
<ClInclude Include="..\src\include\scsidev.h" />
<ClInclude Include="..\src\include\statusline.h" />
<ClInclude Include="..\src\include\sysdeps.h" />
<ClInclude Include="..\src\include\traps.h" />
@ -591,7 +583,6 @@
<ClInclude Include="..\src\jit\comptbl.h" />
<ClInclude Include="..\src\machdep\m68k.h" />
<ClInclude Include="..\src\machdep\maccess.h" />
<ClInclude Include="..\src\machdep\md-fpp.h" />
<ClInclude Include="..\src\machdep\rpt.h" />
<ClInclude Include="..\src\osdep\amiberry_gfx.h" />
<ClInclude Include="..\src\osdep\amiberry_rp9.h" />
@ -604,6 +595,7 @@
<ClInclude Include="..\src\osdep\gui\UaeListBox.hpp" />
<ClInclude Include="..\src\osdep\gui\UaeRadioButton.hpp" />
<ClInclude Include="..\src\osdep\mp3decoder.h" />
<ClInclude Include="..\src\osdep\picasso96.h" />
<ClInclude Include="..\src\osdep\sysconfig.h" />
<ClInclude Include="..\src\osdep\target.h" />
<ClInclude Include="..\src\softfloat\softfloat-macros.h" />

42
VSLinux/Amiberry.vcxproj.filters
View file

@ -486,12 +486,6 @@
<ClCompile Include="..\src\osdep\fsdb_host.cpp">
<Filter>src\osdep</Filter>
</ClCompile>
<ClCompile Include="..\src\osdep\hardfile_amiberry.cpp">
<Filter>src\osdep</Filter>
</ClCompile>
<ClCompile Include="..\src\osdep\keyboard_amiberry.cpp">
<Filter>src\osdep</Filter>
</ClCompile>
<ClCompile Include="..\src\osdep\mp3decoder.cpp">
<Filter>src\osdep</Filter>
</ClCompile>
@ -741,6 +735,12 @@
<ClCompile Include="..\src\archivers\7z\7zIn.cpp">
<Filter>src\archivers\7z</Filter>
</ClCompile>
<ClCompile Include="..\src\osdep\keyboard.cpp">
<Filter>src\osdep</Filter>
</ClCompile>
<ClCompile Include="..\src\osdep\amiberry_hardfile.cpp">
<Filter>src\osdep</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\archivers\7z\7zBuf.h">
@ -845,9 +845,6 @@
<ClInclude Include="..\src\include\cia.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\clipboard.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\commpipe.h">
<Filter>src\include</Filter>
</ClInclude>
@ -863,9 +860,6 @@
<ClInclude Include="..\src\include\custom.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\debug.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\disk.h">
<Filter>src\include</Filter>
</ClInclude>
@ -875,9 +869,6 @@
<ClInclude Include="..\src\include\drawing.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\ersatz.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\events.h">
<Filter>src\include</Filter>
</ClInclude>
@ -893,12 +884,6 @@
<ClInclude Include="..\src\include\flags_arm.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\fpp-ieee-be.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\fpp-unknown.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\fsdb.h">
<Filter>src\include</Filter>
</ClInclude>
@ -944,12 +929,6 @@
<ClInclude Include="..\src\include\options.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\osemu.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\picasso96.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\readcpu.h">
<Filter>src\include</Filter>
</ClInclude>
@ -965,9 +944,6 @@
<ClInclude Include="..\src\include\scsi.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\scsidev.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\include\statusline.h">
<Filter>src\include</Filter>
</ClInclude>
@ -1013,9 +989,6 @@
<ClInclude Include="..\src\machdep\maccess.h">
<Filter>src\machdep</Filter>
</ClInclude>
<ClInclude Include="..\src\machdep\md-fpp.h">
<Filter>src\machdep</Filter>
</ClInclude>
<ClInclude Include="..\src\machdep\rpt.h">
<Filter>src\machdep</Filter>
</ClInclude>
@ -1199,6 +1172,9 @@
<ClInclude Include="..\src\include\ar.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\src\osdep\picasso96.h">
<Filter>src\osdep</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\src\archivers\7z\7zVersion.rc">