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

Merge remote-tracking branch 'origin/master' into dev

Browse source
This commit is contained in:
Dimitris Panokostas 2019-08-18 20:59:05 +02:00
commit f1d5850b6a
18 changed files with 2308 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
View file

@ -47,15 +47,14 @@
<ToolchainID>
<ID>com.visualgdb.raspberry_pi</ID>
<Version>
<GCC>6.3.0</GCC>
<GDB>7.12</GDB>
<Revision>4</Revision>
<GCC>8.3.0</GCC>
<GDB>8.2.1</GDB>
<Revision>1</Revision>
</Version>
</ToolchainID>
<ProjectFile>Amiberry.vcxproj</ProjectFile>
<RemoteBuildEnvironment>
<Records />
<EnvironmentSetupFiles />
</RemoteBuildEnvironment>
<ParallelJobCount>1</ParallelJobCount>
<SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>

11
VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
View file

@ -7,7 +7,7 @@
<PathStyle>MinGWUnixSlash</PathStyle>
</CustomSourceDirectories>
<DeploymentHost>
<HostName>192.168.1.216</HostName>
<HostName>192.168.1.142</HostName>
<Transport>SSH</Transport>
<UserName>pi</UserName>
</DeploymentHost>
@ -47,15 +47,14 @@
<ToolchainID>
<ID>com.visualgdb.raspberry_pi</ID>
<Version>
<GCC>6.3.0</GCC>
<GDB>7.12</GDB>
<Revision>4</Revision>
<GCC>8.3.0</GCC>
<GDB>8.2.1</GDB>
<Revision>1</Revision>
</Version>
</ToolchainID>
<ProjectFile>Amiberry.vcxproj</ProjectFile>
<RemoteBuildEnvironment>
<Records />
<EnvironmentSetupFiles />
</RemoteBuildEnvironment>
<ParallelJobCount>1</ParallelJobCount>
<SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
@ -184,7 +183,7 @@
</LaunchGDBSettings>
<GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
<DeploymentTargetPath>/home/pi/projects/amiberry/$(TargetFileName)</DeploymentTargetPath>
<X11WindowMode>Remote</X11WindowMode>
<X11WindowMode>Local</X11WindowMode>
<KeepConsoleAfterExit>false</KeepConsoleAfterExit>
<RunGDBUnderSudo>false</RunGDBUnderSudo>
<DeploymentMode>Auto</DeploymentMode>

6
VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings
View file

@ -50,9 +50,9 @@
<ToolchainID>
<ID>com.visualgdb.raspberry_pi</ID>
<Version>
<GCC>6.3.0</GCC>
<GDB>7.12</GDB>
<Revision>3</Revision>
<GCC>8.3.0</GCC>
<GDB>8.2.1</GDB>
<Revision>1</Revision>
</Version>
</ToolchainID>
<ProjectFile>Amiberry.vcxproj</ProjectFile>

7
VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
View file

@ -47,15 +47,14 @@
<ToolchainID>
<ID>com.visualgdb.raspberry_pi</ID>
<Version>
<GCC>6.3.0</GCC>
<GDB>7.12</GDB>
<Revision>4</Revision>
<GCC>8.3.0</GCC>
<GDB>8.2.1</GDB>
<Revision>1</Revision>
</Version>
</ToolchainID>
<ProjectFile>Amiberry.vcxproj</ProjectFile>
<RemoteBuildEnvironment>
<Records />
<EnvironmentSetupFiles />
</RemoteBuildEnvironment>
<ParallelJobCount>1</ParallelJobCount>
<SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>

16
VisualGDB/Amiberry/Amiberry.vcxproj
View file

@ -38,29 +38,29 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
<GNUConfigurationType>Debug</GNUConfigurationType>
<ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
<ToolchainVersion>6.3.0/7.12/r4</ToolchainVersion>
<ToolchainVersion>8.3.0/8.2.1/r1</ToolchainVersion>
<TargetName>$(ProjectName)-sdl2</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-dispmanx|VisualGDB'">
<GNUConfigurationType>Debug</GNUConfigurationType>
<ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
<ToolchainVersion>6.3.0/7.12/r4</ToolchainVersion>
<ToolchainVersion>8.3.0/8.2.1/r1</ToolchainVersion>
<TargetName>$(ProjectName)-sdl2</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
<ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
<ToolchainVersion>6.3.0/7.12/r4</ToolchainVersion>
<ToolchainVersion>8.3.0/8.2.1/r1</ToolchainVersion>
<TargetName>$(ProjectName)-sdl2</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-dispmanx|VisualGDB'">
<ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
<ToolchainVersion>6.3.0/7.12/r4</ToolchainVersion>
<ToolchainVersion>8.3.0/8.2.1/r1</ToolchainVersion>
<TargetName>$(ProjectName)-sdl2</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
<ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUG=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalCOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCOptions>
<AdditionalCPPOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCPPOptions>
@ -75,7 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-dispmanx|VisualGDB'">
<ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUG=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;USE_DISPMANX;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalCOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCOptions>
<AdditionalCPPOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCPPOptions>
@ -91,7 +91,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
<ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalCOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCOptions>
<AdditionalCPPOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCPPOptions>
@ -108,7 +108,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-dispmanx|VisualGDB'">
<ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>=/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/usr/local/include/SDL2;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;USE_DISPMANX;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalCOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCOptions>
<AdditionalCPPOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard </AdditionalCPPOptions>

5
VisualGDB/guisan/guisan.vcxproj
View file

@ -95,6 +95,7 @@
<ClCompile Include="..\..\guisan-dev\src\opengl\openglimage.cpp" />
<ClCompile Include="..\..\guisan-dev\src\rectangle.cpp" />
<ClCompile Include="..\..\guisan-dev\src\sdl\sdl.cpp" />
<ClCompile Include="..\..\guisan-dev\src\sdl\sdl2graphics.cpp" />
<ClCompile Include="..\..\guisan-dev\src\sdl\sdlgraphics.cpp" />
<ClCompile Include="..\..\guisan-dev\src\sdl\sdlimage.cpp" />
<ClCompile Include="..\..\guisan-dev\src\sdl\sdlimageloader.cpp" />
@ -165,6 +166,7 @@
<ClInclude Include="..\..\guisan-dev\include\guisan\platform.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\rectangle.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdl2graphics.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlgraphics.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimage.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdlimageloader.hpp" />
@ -181,8 +183,11 @@
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\dropdown.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\icon.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagebutton.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagetextbutton.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\inputbox.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\label.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\listbox.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\messagebox.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\progressbar.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\radiobutton.hpp" />
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\scrollarea.hpp" />

15
VisualGDB/guisan/guisan.vcxproj.filters
View file

@ -196,6 +196,9 @@
<ClCompile Include="..\..\guisan-dev\src\widgets\progressbar.cpp">
<Filter>Source files\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\sdl\sdl2graphics.cpp">
<Filter>Source files\sdl</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\guisan-dev\include\guisan.hpp">
@ -393,5 +396,17 @@
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\progressbar.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\sdl\sdl2graphics.hpp">
<Filter>Header files\guisan\sdl</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\imagetextbutton.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\inputbox.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\guisan-dev\include\guisan\widgets\messagebox.hpp">
<Filter>Header files\guisan\widgets</Filter>
</ClInclude>
</ItemGroup>
</Project>