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

Updated VSLinux solution, added xu4 target, updated guisan Makefile so it can compile on its own

Browse source
This commit is contained in:
Dimitris Panokostas 2018-04-20 18:42:50 +02:00
parent 1fcad51c59
commit 6df690a9be
7 changed files with 181 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

29
VSLinux/Amiberry.sln
View file

@ -15,33 +15,62 @@ Global
Debug|ARM = Debug|ARM
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Debug-xu4|ARM = Debug-xu4|ARM
Debug-xu4|x64 = Debug-xu4|x64
Debug-xu4|x86 = Debug-xu4|x86
Release|ARM = Release|ARM
Release|x64 = Release|x64
Release|x86 = Release|x86
Release-xu4|ARM = Release-xu4|ARM
Release-xu4|x64 = Release-xu4|x64
Release-xu4|x86 = Release-xu4|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|ARM.ActiveCfg = Debug|ARM
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|ARM.Build.0 = Debug|ARM
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|x64.ActiveCfg = Debug|ARM
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|x86.ActiveCfg = Debug|ARM
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|ARM.ActiveCfg = Debug-xu4|ARM
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|ARM.Build.0 = Debug-xu4|ARM
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|x64.ActiveCfg = Debug-xu4|ARM
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|x86.ActiveCfg = Debug-xu4|ARM
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|ARM.ActiveCfg = Release|ARM
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|ARM.Build.0 = Release|ARM
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|x64.ActiveCfg = Release|ARM
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|x86.ActiveCfg = Release|ARM
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|ARM.ActiveCfg = Release-xu4|ARM
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|ARM.Build.0 = Release-xu4|ARM
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|x64.ActiveCfg = Release-xu4|ARM
{7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|x86.ActiveCfg = Release-xu4|ARM
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|ARM.ActiveCfg = Debug|ARM
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|ARM.Build.0 = Debug|ARM
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|x64.ActiveCfg = Debug|x64
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|x64.Build.0 = Debug|x64
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|x86.ActiveCfg = Debug|x86
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|x86.Build.0 = Debug|x86
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|ARM.ActiveCfg = Debug-xu4|ARM
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|ARM.Build.0 = Debug-xu4|ARM
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|x64.ActiveCfg = Debug-xu4|x64
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|x64.Build.0 = Debug-xu4|x64
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|x86.ActiveCfg = Debug-xu4|x86
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|x86.Build.0 = Debug-xu4|x86
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|ARM.ActiveCfg = Release|ARM
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|ARM.Build.0 = Release|ARM
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|x64.ActiveCfg = Release|x64
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|x64.Build.0 = Release|x64
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|x86.ActiveCfg = Release|x86
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|x86.Build.0 = Release|x86
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|ARM.ActiveCfg = Release-xu4|ARM
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|ARM.Build.0 = Release-xu4|ARM
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|x64.ActiveCfg = Release-xu4|x64
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|x64.Build.0 = Release-xu4|x64
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|x86.ActiveCfg = Release-xu4|x86
{06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|x86.Build.0 = Release-xu4|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {82BF2138-CE12-476F-9056-958AEA8D9ACF}
EndGlobalSection
EndGlobal

70
VSLinux/Amiberry.vcxproj
View file

@ -1,10 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug-xu4|ARM">
<Configuration>Debug-xu4</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release-xu4|ARM">
<Configuration>Release-xu4</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
@ -25,26 +33,51 @@
<UseDebugLibraries>true</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
<RemoteRootDir>~/projects</RemoteRootDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|x86'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|x86'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|x64'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|x64'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Label="Shared" />
@ -60,6 +93,15 @@
</RemoteBuildOutputs>
<RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-sdl2</RemoteProjectDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'">
<RemoteBuildCommandLine>cd ~/projects/Amiberry; make -j4 PLATFORM=xu4</RemoteBuildCommandLine>
<RemoteReBuildCommandLine>cd ~/projects/Amiberry; make clean; make -j4 PLATFORM=xu4</RemoteReBuildCommandLine>
<RemoteCleanCommandLine>cd ~/projects/Amiberry; make clean</RemoteCleanCommandLine>
<NMakeIncludeSearchPath>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\local\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;..\src;..\src\include;..\src\osdep;..\src\archivers;..\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;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<NMakePreprocessorDefinitions>DEBUG;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;USE_SDL2;_REENTRANT;ARM_HAS_DIV;MALI_GPU;USE_RENDER_THREAD;TINKER;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<RemoteBuildOutputs />
<RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)</RemoteProjectDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<NMakeIncludeSearchPath>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;..\src;..\src\include;..\src\osdep;..\src\archivers;..\guisan\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2; make -j3 PLATFORM=rpi3-sdl2</RemoteBuildCommandLine>
@ -68,6 +110,14 @@
<NMakePreprocessorDefinitions>ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;USE_SDL2;_REENTRANT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-sdl2</RemoteProjectDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'">
<NMakeIncludeSearchPath>C:\SysGCC\raspberry\lib\gcc\arm-linux-gnueabihf\6\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\include\c++\6;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\arm-linux-gnueabihf;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\libxml2;..\src;..\src\include;..\src\osdep;..\src\archivers;..\guisan\include;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2; make -j3 PLATFORM=rpi3-sdl2</RemoteBuildCommandLine>
<RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2; make clean; make -j3 PLATFORM=rpi3-sdl2</RemoteReBuildCommandLine>
<RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2; make clean</RemoteCleanCommandLine>
<NMakePreprocessorDefinitions>ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;USE_SDL2;_REENTRANT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-sdl2</RemoteProjectDir>
</PropertyGroup>
<ItemGroup>
<Text Include="..\conf\dir.txt">
<DeploymentContent>true</DeploymentContent>
@ -141,7 +191,7 @@
</ItemGroup>
<ItemGroup>
<None Include="..\Makefile">
<DeploymentContent>true</DeploymentContent>
<DeploymentContent>false</DeploymentContent>
</None>
<None Include="..\src\aks.def" />
<None Include="..\src\filesys.asm">
@ -617,17 +667,35 @@
<Command>cp ~/projects/Amiberry-sdl2/amiberry-rpi3-sdl2-dev ~/projects/amiberry/</Command>
</RemotePostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'">
<RemotePostBuildEvent>
<Command>
</Command>
</RemotePostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<RemotePostBuildEvent>
<Message>Copy binary to launch location</Message>
</RemotePostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'">
<RemotePostBuildEvent>
<Message>
</Message>
</RemotePostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<RemotePostBuildEvent>
<Command>cp ~/projects/Amiberry-sdl2/amiberry-sdl2-dev ~/projects/amiberry/</Command>
<Message>Copy binary to launch location</Message>
</RemotePostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'">
<RemotePostBuildEvent>
<Command>cp ~/projects/Amiberry-sdl2/amiberry-sdl2-dev ~/projects/amiberry/</Command>
<Message>Copy binary to launch location</Message>
</RemotePostBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>

13
VSLinux/Amiberry.vcxproj.user
View file

@ -7,10 +7,23 @@
<PreLaunchCommand>
</PreLaunchCommand>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'">
<RemoteDebuggerCommand>/home/pigaming/projects/Amiberry/amiberry-xu4</RemoteDebuggerCommand>
<RemoteDebuggerWorkingDirectory>/home/pigaming/projects/Amiberry</RemoteDebuggerWorkingDirectory>
<DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
<PreLaunchCommand />
<RemoteTarget>-1406338439;192.168.1.47 (username=, port=22, authentication=Password)</RemoteTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<RemoteDebuggerCommand>projects/amiberry/amiberry-sdl2-dev</RemoteDebuggerCommand>
<RemoteDebuggerWorkingDirectory>projects/amiberry</RemoteDebuggerWorkingDirectory>
<DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
<PreLaunchCommand>export DEBUG=0</PreLaunchCommand>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'">
<RemoteDebuggerCommand>projects/amiberry/amiberry-sdl2-dev</RemoteDebuggerCommand>
<RemoteDebuggerWorkingDirectory>projects/amiberry</RemoteDebuggerWorkingDirectory>
<DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
<PreLaunchCommand>export DEBUG=0</PreLaunchCommand>
</PropertyGroup>
</Project>

64
VSLinux/guisan/guisan.vcxproj
View file

@ -1,10 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug-xu4|ARM">
<Configuration>Debug-xu4</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug-xu4|x64">
<Configuration>Debug-xu4</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug-xu4|x86">
<Configuration>Debug-xu4</Configuration>
<Platform>x86</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release-xu4|ARM">
<Configuration>Release-xu4</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release-xu4|x64">
<Configuration>Release-xu4</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release-xu4|x86">
<Configuration>Release-xu4</Configuration>
<Platform>x86</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
@ -42,27 +66,53 @@
<ConfigurationType>Makefile</ConfigurationType>
<RemoteRootDir>~/projects/Amiberry-sdl2/src</RemoteRootDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
<RemoteRootDir>~/projects/Amiberry</RemoteRootDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
<RemoteRootDir>~/projects/Amiberry-sdl2/src</RemoteRootDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
<RemoteRootDir>~/projects/Amiberry-sdl2/src</RemoteRootDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|x86'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|x86'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|x64'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|x64'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
<ConfigurationType>Makefile</ConfigurationType>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Label="Shared" />
@ -74,11 +124,23 @@
<RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
<NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'">
<RemoteBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make all</RemoteBuildCommandLine>
<RemoteCleanCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean</RemoteCleanCommandLine>
<RemoteReBuildCommandLine>cd ~/projects/Amiberry/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
<NMakeIncludeSearchPath>C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-dev</RemoteProjectDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make all</RemoteBuildCommandLine>
<RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
<RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean</RemoteCleanCommandLine>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-xu4|ARM'">
<RemoteBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make all</RemoteBuildCommandLine>
<RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean; make all</RemoteReBuildCommandLine>
<RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean</RemoteCleanCommandLine>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\guisan-dev\lib\.keep">
<DeploymentContent>true</DeploymentContent>
@ -165,7 +227,7 @@
<ClCompile Include="..\..\guisan-dev\src\genericinput.cpp" />
<ClCompile Include="..\..\guisan-dev\src\graphics.cpp" />
<ClCompile Include="..\..\guisan-dev\src\gui.cpp" />
<ClCompile Include="..\..\guisan-dev\guisan.cpp" />
<ClCompile Include="..\..\guisan-dev\src\guisan.cpp" />
<ClCompile Include="..\..\guisan-dev\src\image.cpp" />
<ClCompile Include="..\..\guisan-dev\src\imagefont.cpp" />
<ClCompile Include="..\..\guisan-dev\src\inputevent.cpp" />

6
VSLinux/guisan/guisan.vcxproj.filters
View file

@ -272,9 +272,6 @@
<ClCompile Include="..\..\guisan-dev\src\gui.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\guisan.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\image.cpp">
<Filter>src</Filter>
</ClCompile>
@ -386,5 +383,8 @@
<ClCompile Include="..\..\guisan-dev\src\widgets\progressbar.cpp">
<Filter>src\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\guisan-dev\src\guisan.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
</Project>

4
VSLinux/guisan/guisan.vcxproj.user
View file

@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-xu4|ARM'">
<RemoteTarget>-1406338439;192.168.1.47 (username=, port=22, authentication=Password)</RemoteTarget>
</PropertyGroup>
</Project>

2
guisan-dev/Makefile
View file

@ -6,7 +6,7 @@ DIRS =$(shell find ./src -maxdepth 3 -type d)
SOURCE = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.cpp))
OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SOURCE)))
CPPFLAGS +=-I./include
CPPFLAGS +=-I./include -std=gnu++14 `sdl2-config --cflags --libs`
.PHONY : all clean