More fixes in the VS solution

This commit is contained in:
Dimitris Panokostas 2017-09-27 23:58:36 +02:00
parent 449aad66e4
commit 994cdba374
3 changed files with 15 additions and 5 deletions

View file

@ -58,13 +58,15 @@
<NMakePreprocessorDefinitions>DEBUG;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;CAPSLOCK_DEBIAN_WORKAROUND;USE_SDL;_REENTRANT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<RemoteBuildOutputs>
</RemoteBuildOutputs>
<RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-sdl2</RemoteProjectDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<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>
<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\archivers;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-sdl2; make -j3</RemoteBuildCommandLine>
<RemoteReBuildCommandLine>cd ~/projects/Amiberry-sdl2; make clean; make -j3</RemoteReBuildCommandLine>
<RemoteCleanCommandLine>cd ~/projects/Amiberry-sdl2; make clean</RemoteCleanCommandLine>
<NMakePreprocessorDefinitions>ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;CAPSLOCK_DEBIAN_WORKAROUND;USE_SDL;_REENTRANT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<RemoteProjectDir>$(RemoteRootDir)/$(ProjectName)-sdl2</RemoteProjectDir>
</PropertyGroup>
<ItemGroup>
<Text Include="..\conf\dir.txt">
@ -151,6 +153,7 @@
<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" />
@ -461,6 +464,7 @@
</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\7zFile.h" />
@ -610,7 +614,7 @@
</ItemGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<RemotePostBuildEvent>
<Command>cp ~/projects/Amiberry-sdl2/amiberry-sdl2-dev ~/projects/amiberry</Command>
<Command>cp ~/projects/Amiberry-sdl2/amiberry-sdl2 ~/projects/amiberry/amiberry-sdl2-dev</Command>
</RemotePostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@ -620,7 +624,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<RemotePostBuildEvent>
<Command>cp ~/projects/Amiberry-sdl2/amiberry-sdl2 ~/projects/amiberry</Command>
<Command>cp ~/projects/Amiberry-sdl2/amiberry-sdl2 ~/projects/amiberry/amiberry-sdl2-dev</Command>
<Message>Copy binary to launch location</Message>
</RemotePostBuildEvent>
</ItemDefinitionGroup>

View file

@ -741,6 +741,9 @@
<ClCompile Include="..\src\osdep\amiberry_hardfile.cpp">
<Filter>src\osdep</Filter>
</ClCompile>
<ClCompile Include="..\src\archivers\7z\7zAlloc.cpp">
<Filter>src\archivers\7z</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\archivers\7z\7zBuf.h">
@ -1175,6 +1178,9 @@
<ClInclude Include="..\src\osdep\picasso96.h">
<Filter>src\osdep</Filter>
</ClInclude>
<ClInclude Include="..\src\archivers\7z\7zAlloc.h">
<Filter>src\archivers\7z</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\src\archivers\7z\7zVersion.rc">

View file

@ -8,8 +8,8 @@
</PreLaunchCommand>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<RemoteDebuggerCommand>~/projects/amiberry/amiberry-sdl2</RemoteDebuggerCommand>
<RemoteDebuggerWorkingDirectory>~/projects/amiberry</RemoteDebuggerWorkingDirectory>
<RemoteDebuggerCommand>projects/amiberry/amiberry-sdl2-dev</RemoteDebuggerCommand>
<RemoteDebuggerWorkingDirectory>projects/amiberry</RemoteDebuggerWorkingDirectory>
<DebuggerFlavor>LinuxDebugger</DebuggerFlavor>
<PreLaunchCommand>
</PreLaunchCommand>