diff --git a/VSLinux/Amiberry.sln b/VSLinux/Amiberry.sln index e20217d8..84d8d893 100644 --- a/VSLinux/Amiberry.sln +++ b/VSLinux/Amiberry.sln @@ -12,67 +12,36 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guisan", "guisan\guisan.vcx EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug-rockpro64|ARM = Debug-rockpro64|ARM - Debug-rockpro64|ARM64 = Debug-rockpro64|ARM64 - Debug-rpi4|ARM = Debug-rpi4|ARM - Debug-rpi4|ARM64 = Debug-rpi4|ARM64 - Debug-xu4|ARM = Debug-xu4|ARM - Debug-xu4|ARM64 = Debug-xu4|ARM64 - Release-rpi4|ARM = Release-rpi4|ARM - Release-rpi4|ARM64 = Release-rpi4|ARM64 - Release-xu4|ARM = Release-xu4|ARM - Release-xu4|ARM64 = Release-xu4|ARM64 + Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 + Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rockpro64|ARM.ActiveCfg = Debug-rockpro64|ARM - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rockpro64|ARM.Build.0 = Debug-rockpro64|ARM - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rockpro64|ARM64.ActiveCfg = Debug-rockpro64|ARM64 - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rockpro64|ARM64.Build.0 = Debug-rockpro64|ARM64 - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rockpro64|ARM64.Deploy.0 = Debug-rockpro64|ARM64 - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM.ActiveCfg = Debug|ARM - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM.Build.0 = Debug|ARM - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM64.ActiveCfg = Debug|ARM64 - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM64.Build.0 = Debug|ARM64 - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-rpi4|ARM64.Deploy.0 = Debug|ARM64 - {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|ARM64.ActiveCfg = Debug-xu4|ARM64 - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|ARM64.Build.0 = Debug-xu4|ARM64 - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug-xu4|ARM64.Deploy.0 = Debug-xu4|ARM64 - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM.ActiveCfg = Release|ARM - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM.Build.0 = Release|ARM - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM64.ActiveCfg = Release|ARM64 - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM64.Build.0 = Release|ARM64 - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-rpi4|ARM64.Deploy.0 = Release|ARM64 - {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|ARM64.ActiveCfg = Release-xu4|ARM64 - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|ARM64.Build.0 = Release-xu4|ARM64 - {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release-xu4|ARM64.Deploy.0 = Release-xu4|ARM64 - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rockpro64|ARM.ActiveCfg = Debug-rockpro64|ARM - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rockpro64|ARM64.ActiveCfg = Debug-rockpro64|ARM64 - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rockpro64|ARM64.Build.0 = Debug-rockpro64|ARM64 - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rockpro64|ARM64.Deploy.0 = Debug-rockpro64|ARM64 - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM.ActiveCfg = Debug|ARM - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM.Build.0 = Debug|ARM - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM64.ActiveCfg = Debug|ARM64 - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM64.Build.0 = Debug|ARM64 - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-rpi4|ARM64.Deploy.0 = Debug|ARM64 - {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|ARM64.ActiveCfg = Debug-xu4|ARM64 - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|ARM64.Build.0 = Debug-xu4|ARM64 - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug-xu4|ARM64.Deploy.0 = Debug-xu4|ARM64 - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM.ActiveCfg = Release|ARM - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM.Build.0 = Release|ARM - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM64.ActiveCfg = Release|ARM64 - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM64.Build.0 = Release|ARM64 - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-rpi4|ARM64.Deploy.0 = Release|ARM64 - {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|ARM64.ActiveCfg = Release-xu4|ARM64 - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|ARM64.Build.0 = Release-xu4|ARM64 - {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release-xu4|ARM64.Deploy.0 = Release-xu4|ARM64 + {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|ARM.Deploy.0 = Debug|ARM + {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|ARM64.Build.0 = Debug|ARM64 + {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {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|ARM.Deploy.0 = Release|ARM + {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|ARM64.ActiveCfg = Release|ARM64 + {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|ARM64.Build.0 = Release|ARM64 + {7B9A67B2-3F13-4E7B-A875-AAB6CAAE63D7}.Release|ARM64.Deploy.0 = Release|ARM64 + {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|ARM.Deploy.0 = Debug|ARM + {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|ARM64.Build.0 = Debug|ARM64 + {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {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|ARM.Deploy.0 = Release|ARM + {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|ARM64.ActiveCfg = Release|ARM64 + {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|ARM64.Build.0 = Release|ARM64 + {06B356E1-FE8B-4E50-BF9F-A9D6E419ECBD}.Release|ARM64.Deploy.0 = Release|ARM64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/VSLinux/Amiberry.vcxproj b/VSLinux/Amiberry.vcxproj index 46a6d4fe..33772296 100644 --- a/VSLinux/Amiberry.vcxproj +++ b/VSLinux/Amiberry.vcxproj @@ -1,22 +1,6 @@  - - Debug-rockpro64 - ARM - - - Debug-rockpro64 - ARM64 - - - Debug-xu4 - ARM - - - Debug-xu4 - ARM64 - Debug ARM @@ -25,14 +9,6 @@ Debug ARM64 - - Release-xu4 - ARM - - - Release-xu4 - ARM64 - Release ARM @@ -56,31 +32,12 @@ true Makefile + Remote_GCC_1_0 true Makefile - - true - Makefile - ~/projects - - - true - Makefile - ~/projects - - - true - Makefile - ~/projects - - - true - Makefile - ~/projects - false Makefile @@ -89,54 +46,6 @@ false Makefile - - false - Makefile - - - false - Makefile - - - true - Makefile - - - true - Makefile - - - true - Makefile - - - false - Makefile - - - false - Makefile - - - true - Makefile - - - true - Makefile - - - true - Makefile - - - false - Makefile - - - false - Makefile - @@ -153,8 +62,8 @@ $(RemoteRootDir)/$(ProjectName) - cd ~/projects/Amiberry; make -j4 PLATFORM=rpi4-sdl2 - cd ~/projects/Amiberry; make clean; make -j4 PLATFORM=rpi4-sdl2 + cd ~/projects/Amiberry; make -j4 PLATFORM=pi64 + cd ~/projects/Amiberry; make clean; make -j4 PLATFORM=pi64 cd ~/projects/Amiberry; make clean ..\src;..\src\include;..\src\osdep;..\src\archivers;..\guisan-dev\include;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;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) DEBUG;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;_REENTRANT;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions) @@ -199,16 +108,16 @@ ..\src;..\src\include;..\src\osdep;..\src\archivers;..\guisan-dev\include;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;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) - cd ~/projects/Amiberry; make -j3 PLATFORM=rpi4-sdl2 - cd ~/projects/Amiberry; make clean; make -j3 PLATFORM=rpi4-sdl2 + cd ~/projects/Amiberry; make -j4 PLATFORM=rpi4-sdl2 + cd ~/projects/Amiberry; make clean; make -j4 PLATFORM=rpi4-sdl2 cd ~/projects/Amiberry; make clean ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;_REENTRANT;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions) $(RemoteRootDir)/$(ProjectName) ..\src;..\src\include;..\src\osdep;..\src\archivers;..\guisan-dev\include;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;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) - cd ~/projects/Amiberry; make -j3 PLATFORM=rpi4-sdl2 - cd ~/projects/Amiberry; make clean; make -j3 PLATFORM=rpi4-sdl2 + cd ~/projects/Amiberry; make -j4 PLATFORM=pi64 + cd ~/projects/Amiberry; make clean; make -j4 PLATFORM=pi64 cd ~/projects/Amiberry; make clean ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;_REENTRANT;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions) $(RemoteRootDir)/$(ProjectName) @@ -248,6 +157,7 @@ true + true @@ -296,9 +206,6 @@ - - true - @@ -308,9 +215,6 @@ false - - true - true @@ -320,9 +224,6 @@ - - true - @@ -420,12 +321,15 @@ false + + false false + false @@ -503,6 +407,7 @@ false + @@ -543,6 +448,7 @@ + @@ -561,6 +467,7 @@ + @@ -571,10 +478,6 @@ - - - - @@ -594,7 +497,9 @@ false + + false @@ -602,15 +507,18 @@ false + false + false false + false @@ -674,9 +582,14 @@ + + + + + @@ -701,6 +614,8 @@ + + @@ -714,11 +629,15 @@ + + + + @@ -727,6 +646,7 @@ + @@ -746,10 +666,6 @@ - - - - diff --git a/VSLinux/Amiberry.vcxproj.filters b/VSLinux/Amiberry.vcxproj.filters index 38599805..227aae0c 100644 --- a/VSLinux/Amiberry.vcxproj.filters +++ b/VSLinux/Amiberry.vcxproj.filters @@ -143,26 +143,20 @@ data + + data + - - data - data - - src - src - - src - src\osdep @@ -564,18 +558,6 @@ src\osdep\gui - - src\osdep\gui - - - src\osdep\gui - - - src\osdep\gui - - - src\osdep\gui - src\sounddep @@ -741,6 +723,39 @@ src\caps + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src\osdep + + + src\osdep\gui + @@ -1004,18 +1019,6 @@ src\osdep\gui - - src\osdep\gui - - - src\osdep\gui - - - src\osdep\gui - - - src\osdep\gui - src\sounddep @@ -1154,5 +1157,41 @@ src\jit + + src\include\uae + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + + + src\include + \ No newline at end of file diff --git a/VSLinux/Amiberry.vcxproj.user b/VSLinux/Amiberry.vcxproj.user index f25b9741..f7973d0e 100644 --- a/VSLinux/Amiberry.vcxproj.user +++ b/VSLinux/Amiberry.vcxproj.user @@ -6,12 +6,14 @@ LinuxDebugger + 983517077;rpi4.midlair (username=, port=22, authentication=Password) /home/pi/projects/amiberry/amiberry /home/pi/projects/amiberry LinuxDebugger + -1706257654;argon (username=, port=22, authentication=Password) /home/pigaming/projects/Amiberry/amiberry-xu4 @@ -38,6 +40,7 @@ projects/amiberry LinuxDebugger export DEBUG=0 + -1706257654;argon (username=, port=22, authentication=Password) projects/amiberry/amiberry-sdl2-dev diff --git a/VSLinux/guisan/guisan.vcxproj b/VSLinux/guisan/guisan.vcxproj index 80dbfeea..a0d9672b 100644 --- a/VSLinux/guisan/guisan.vcxproj +++ b/VSLinux/guisan/guisan.vcxproj @@ -1,38 +1,6 @@  - - Debug-rockpro64 - ARM - - - Debug-rockpro64 - ARM64 - - - Debug-rockpro64 - x64 - - - Debug-rockpro64 - x86 - - - Debug-xu4 - ARM - - - Debug-xu4 - ARM64 - - - Debug-xu4 - x64 - - - Debug-xu4 - x86 - Debug ARM @@ -41,22 +9,6 @@ Debug ARM64 - - Release-xu4 - ARM - - - Release-xu4 - ARM64 - - - Release-xu4 - x64 - - - Release-xu4 - x86 - Release ARM @@ -103,26 +55,6 @@ Makefile ~/projects/Amiberry/src - - true - Makefile - ~/projects/Amiberry/src - - - true - Makefile - ~/projects/Amiberry/src - - - true - Makefile - ~/projects/Amiberry/src - - - true - Makefile - ~/projects/Amiberry/src - false Makefile @@ -133,256 +65,182 @@ Makefile ~/projects/Amiberry/src - - false - Makefile - ~/projects/Amiberry/src - - - false - Makefile - ~/projects/Amiberry/src - true Makefile - - true - Makefile - - - true - Makefile - false Makefile - - false - Makefile - true Makefile - - true - Makefile - - - true - Makefile - false Makefile - - false - Makefile - - cd ~/projects/Amiberry/guisan-dev/; make all - cd ~/projects/Amiberry/guisan-dev/; make clean - cd ~/projects/Amiberry/guisan-dev/; make clean; make all + cd ~/projects/Amiberry/external/libguisan/; make all + cd ~/projects/Amiberry/external/libguisan/; make clean + cd ~/projects/Amiberry/external/libguisan/; make clean; make all C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath) $(RemoteRootDir)/$(ProjectName)-dev - cd ~/projects/Amiberry/guisan-dev/; make all - cd ~/projects/Amiberry/guisan-dev/; make clean - cd ~/projects/Amiberry/guisan-dev/; make clean; make all - C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath) - $(RemoteRootDir)/$(ProjectName)-dev - - - cd ~/projects/Amiberry/guisan-dev/; make all - cd ~/projects/Amiberry/guisan-dev/; make clean - cd ~/projects/Amiberry/guisan-dev/; make clean; make all - C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath) - $(RemoteRootDir)/$(ProjectName)-dev - - - cd ~/projects/Amiberry/guisan-dev/; make all - cd ~/projects/Amiberry/guisan-dev/; make clean - cd ~/projects/Amiberry/guisan-dev/; make clean; make all - C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath) - $(RemoteRootDir)/$(ProjectName)-dev - - - cd ~/projects/Amiberry/guisan-dev/; make all - cd ~/projects/Amiberry/guisan-dev/; make clean - cd ~/projects/Amiberry/guisan-dev/; make clean; make all - C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath) - $(RemoteRootDir)/$(ProjectName)-dev - - - cd ~/projects/Amiberry/guisan-dev/; make all - cd ~/projects/Amiberry/guisan-dev/; make clean - cd ~/projects/Amiberry/guisan-dev/; make clean; make all + cd ~/projects/Amiberry/external/libguisan/; make all + cd ~/projects/Amiberry/external/libguisan/; make clean + cd ~/projects/Amiberry/external/libguisan/; make clean; make all C:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include\SDL2;$(NMakeIncludeSearchPath) $(RemoteRootDir)/$(ProjectName)-dev - cd ~/projects/Amiberry-sdl2/guisan-dev/; make all - cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean; make all - cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean + cd ~/projects/Amiberry-sdl2/external/libguisan/; make all + cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean; make all + cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean $(RemoteRootDir)/$(ProjectName)-dev - cd ~/projects/Amiberry-sdl2/guisan-dev/; make all - cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean; make all - cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean - $(RemoteRootDir)/$(ProjectName)-dev - - - cd ~/projects/Amiberry-sdl2/guisan-dev/; make all - cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean; make all - cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean - $(RemoteRootDir)/$(ProjectName)-dev - - - cd ~/projects/Amiberry-sdl2/guisan-dev/; make all - cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean; make all - cd ~/projects/Amiberry-sdl2/guisan-dev/; make clean + cd ~/projects/Amiberry-sdl2/external/libguisan/; make all + cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean; make all + cd ~/projects/Amiberry-sdl2/external/libguisan/; make clean $(RemoteRootDir)/$(ProjectName)-dev - + true - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/VSLinux/guisan/guisan.vcxproj.filters b/VSLinux/guisan/guisan.vcxproj.filters index 29ff7ed1..2c853dbb 100644 --- a/VSLinux/guisan/guisan.vcxproj.filters +++ b/VSLinux/guisan/guisan.vcxproj.filters @@ -33,373 +33,131 @@ - - lib - - + + - - include - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan - - - include\guisan\opengl - - - include\guisan\opengl - - - include\guisan\opengl - - - include\guisan\sdl - - - include\guisan\sdl - - - include\guisan\sdl - - - include\guisan\sdl - - - include\guisan\sdl - - - include\guisan\sdl - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\widgets - - - include\guisan\sdl - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src\opengl - - - src\opengl - - - src\opengl - - - src\sdl - - - src\sdl - - - src\sdl - - - src\sdl - - - src\sdl - - - src\sdl - - - src\widgets - - - src\widgets - - - src\widgets - - - src\widgets - - - src\widgets - - - src\widgets - - - src\widgets - - - src\widgets - - - src\widgets - - - src\widgets - - - src\widgets - - - src\widgets - - - src\widgets - - - src\widgets - - - src\widgets - - - src\widgets - - - src\widgets - - - src - - - src\sdl - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/VSLinux/guisan/guisan.vcxproj.user b/VSLinux/guisan/guisan.vcxproj.user index f24ea7a9..ac0d7376 100644 --- a/VSLinux/guisan/guisan.vcxproj.user +++ b/VSLinux/guisan/guisan.vcxproj.user @@ -1,9 +1,2 @@  - - - -1406338439;192.168.1.47 (username=, port=22, authentication=Password) - - - -1406338439;192.168.1.47 (username=, port=22, authentication=Password) - - \ No newline at end of file + \ No newline at end of file diff --git a/VisualGDB/Amiberry/Amiberry.sln b/VisualGDB/Amiberry.sln similarity index 52% rename from VisualGDB/Amiberry/Amiberry.sln rename to VisualGDB/Amiberry.sln index b6b04af7..17d6a774 100644 --- a/VisualGDB/Amiberry/Amiberry.sln +++ b/VisualGDB/Amiberry.sln @@ -3,65 +3,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29209.62 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry", "Amiberry.vcxproj", "{FDC6BF55-C4BC-44FB-85A9-3369784716E8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Amiberry", "Amiberry\Amiberry.vcxproj", "{FDC6BF55-C4BC-44FB-85A9-3369784716E8}" ProjectSection(ProjectDependencies) = postProject {E613050D-EE8C-4ED1-936D-EB9E0E155EA6} = {E613050D-EE8C-4ED1-936D-EB9E0E155EA6} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guisan", "..\guisan\guisan.vcxproj", "{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guisan", "guisan\guisan.vcxproj", "{E613050D-EE8C-4ED1-936D-EB9E0E155EA6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|VisualGDB = Debug|VisualGDB - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Debug-dispmanx|VisualGDB = Debug-dispmanx|VisualGDB - Debug-dispmanx|x64 = Debug-dispmanx|x64 - Debug-dispmanx|x86 = Debug-dispmanx|x86 Release|VisualGDB = Release|VisualGDB - Release|x64 = Release|x64 - Release|x86 = Release|x86 Release-dispmanx|VisualGDB = Release-dispmanx|VisualGDB - Release-dispmanx|x64 = Release-dispmanx|x64 - Release-dispmanx|x86 = Release-dispmanx|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|VisualGDB.Build.0 = Debug|VisualGDB - {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|x64.ActiveCfg = Debug|VisualGDB - {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug|x86.ActiveCfg = Debug|VisualGDB {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug-dispmanx|VisualGDB {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|VisualGDB.Build.0 = Debug-dispmanx|VisualGDB - {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|x64.ActiveCfg = Debug-dispmanx|VisualGDB - {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Debug-dispmanx|x86.ActiveCfg = Debug-dispmanx|VisualGDB {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|VisualGDB.ActiveCfg = Release|VisualGDB {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|VisualGDB.Build.0 = Release|VisualGDB - {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|x64.ActiveCfg = Release|VisualGDB - {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release|x86.ActiveCfg = Release|VisualGDB {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|VisualGDB.ActiveCfg = Release-dispmanx|VisualGDB {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|VisualGDB.Build.0 = Release-dispmanx|VisualGDB - {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|x64.ActiveCfg = Release-dispmanx|VisualGDB - {FDC6BF55-C4BC-44FB-85A9-3369784716E8}.Release-dispmanx|x86.ActiveCfg = Release-dispmanx|VisualGDB {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|VisualGDB.ActiveCfg = Debug|VisualGDB {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|VisualGDB.Build.0 = Debug|VisualGDB - {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|x64.ActiveCfg = Debug|VisualGDB - {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug|x86.ActiveCfg = Debug|VisualGDB {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|VisualGDB.ActiveCfg = Debug|VisualGDB {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|VisualGDB.Build.0 = Debug|VisualGDB - {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x64.ActiveCfg = Release|VisualGDB - {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x64.Build.0 = Release|VisualGDB - {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x86.ActiveCfg = Release|VisualGDB - {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Debug-dispmanx|x86.Build.0 = Release|VisualGDB {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|VisualGDB.ActiveCfg = Release|VisualGDB {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|VisualGDB.Build.0 = Release|VisualGDB - {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|x64.ActiveCfg = Release|VisualGDB - {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release|x86.ActiveCfg = Release|VisualGDB {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|VisualGDB.ActiveCfg = Release|VisualGDB {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|VisualGDB.Build.0 = Release|VisualGDB - {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x64.ActiveCfg = Release|VisualGDB - {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x64.Build.0 = Release|VisualGDB - {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x86.ActiveCfg = Release|VisualGDB - {E613050D-EE8C-4ED1-936D-EB9E0E155EA6}.Release-dispmanx|x86.Build.0 = Release|VisualGDB EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings new file mode 100644 index 00000000..5501309e --- /dev/null +++ b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings @@ -0,0 +1,120 @@ + + + Debug-dispmanx + + + + MinGWUnixSlash + $(ToolchainDir) + + + rpi4.midlair + SSH + pi + + false + false + false + false + false + $(ProjectDir) + + + + + com.visualgdb.raspberry_pi + + 8.3.0 + 8.2.1 + 2 + + + Amiberry.vcxproj + 0 + true + + + + + + + + + + + + + Default + + + + true + + + + + Unknown + + true + true + true + + + + false + + + + + + + + + false + false + false + false + false + false + false + false + false + + false + false + false + false + false + false + true + false + None + false + false + main + true + false + false + false + 0 + true + + + $(TargetPath) + 2000 + + Auto + + false + false + /home/pi/projects/amiberry/$(TargetFileName) + Remote + false + false + Auto + true + false + false + false + + \ No newline at end of file diff --git a/VisualGDB/Amiberry/Amiberry-Debug-sdl1.vgdbsettings.midwan.user b/VisualGDB/Amiberry/Amiberry-Debug-sdl1.vgdbsettings.midwan.user deleted file mode 100644 index be8d5823..00000000 --- a/VisualGDB/Amiberry/Amiberry-Debug-sdl1.vgdbsettings.midwan.user +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - false - false - false - false - false - false - - - false - - - \ No newline at end of file diff --git a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings new file mode 100644 index 00000000..2a4bea8d --- /dev/null +++ b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings @@ -0,0 +1,120 @@ + + + Debug + + + + MinGWUnixSlash + $(ToolchainDir) + + + rpi4.midlair + SSH + pi + + false + false + false + false + false + $(ProjectDir) + + + + + com.visualgdb.raspberry_pi + + 8.3.0 + 8.2.1 + 2 + + + Amiberry.vcxproj + 0 + true + + + + + + + + + + + + + Default + + + + true + + + + + Unknown + + true + true + true + + + + false + + + + + + + + + false + false + false + false + false + false + false + false + false + + false + false + false + false + false + false + true + false + None + false + false + main + true + false + false + false + 0 + true + + + $(TargetPath) + 2000 + + Auto + + false + false + /home/pi/projects/amiberry/$(TargetFileName) + Remote + false + false + Auto + true + false + false + false + + \ No newline at end of file diff --git a/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings new file mode 100644 index 00000000..f2aaff62 --- /dev/null +++ b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings @@ -0,0 +1,120 @@ + + + Release-dispmanx + + + + MinGWUnixSlash + $(ToolchainDir) + + + rpi4.midlair + SSH + pi + + false + false + false + false + false + $(ProjectDir) + + + + + com.visualgdb.raspberry_pi + + 8.3.0 + 8.2.1 + 2 + + + Amiberry.vcxproj + 0 + true + + + + + + + + + + + + + Default + + + + true + + + + + Unknown + + true + true + true + + + + false + + + + + + + + + false + false + false + false + false + false + false + false + false + + false + false + false + false + false + false + true + false + None + false + false + main + true + false + false + false + 0 + true + + + $(TargetPath) + 2000 + + Auto + + false + false + /home/pi/projects/amiberry/$(TargetFileName) + Local + false + false + Auto + true + false + false + false + + \ No newline at end of file diff --git a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings new file mode 100644 index 00000000..165037a0 --- /dev/null +++ b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings @@ -0,0 +1,120 @@ + + + Release + + + + MinGWUnixSlash + $(ToolchainDir) + + + rpi4.midlair + SSH + pi + + false + false + false + false + false + $(ProjectDir) + + + + + com.visualgdb.raspberry_pi + + 8.3.0 + 8.2.1 + 2 + + + Amiberry.vcxproj + 0 + true + + + + + + + + + + + + + Default + + + + true + + + + + Unknown + + true + true + true + + + + false + + + + + + + + + false + false + false + false + false + false + false + false + false + + false + false + false + false + false + false + true + false + None + false + false + main + true + false + false + false + 0 + true + + + $(TargetPath) + 2000 + + Auto + + false + false + /home/pi/projects/amiberry/$(TargetFileName) + Local + false + false + Auto + true + false + false + false + + \ No newline at end of file diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj index cde5a4d3..64209e96 100644 --- a/VisualGDB/Amiberry/Amiberry.vcxproj +++ b/VisualGDB/Amiberry/Amiberry.vcxproj @@ -39,7 +39,7 @@ Debug com.visualgdb.raspberry_pi 8.3.0/8.2.1/r2 - $(ProjectName)-sdl2 + $(ProjectName) @@ -47,21 +47,21 @@ Debug com.visualgdb.raspberry_pi 8.3.0/8.2.1/r2 - $(ProjectName)-sdl2 + $(ProjectName) com.visualgdb.raspberry_pi 8.3.0/8.2.1/r2 - $(ProjectName)-sdl2 + $(ProjectName) com.visualgdb.raspberry_pi 8.3.0/8.2.1/r2 - $(ProjectName)-sdl2 + $(ProjectName) @@ -329,7 +329,9 @@ + + diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj.filters b/VisualGDB/Amiberry/Amiberry.vcxproj.filters index 7e65ee96..a0afba28 100644 --- a/VisualGDB/Amiberry/Amiberry.vcxproj.filters +++ b/VisualGDB/Amiberry/Amiberry.vcxproj.filters @@ -98,6 +98,12 @@ Source files\jit + + VisualGDB settings + + + VisualGDB settings + diff --git a/VisualGDB/genblitter/Readme.txt b/VisualGDB/genblitter/Readme.txt deleted file mode 100644 index 85dd819a..00000000 --- a/VisualGDB/genblitter/Readme.txt +++ /dev/null @@ -1,17 +0,0 @@ -This tool generates the following files: -- blit.h -- blitfunc.cpp -- blitfunc.h -- blittable.cpp - -To use it, compile it for the target platform, then execute it there as follows: - -genblitter.exe i > blit.h - -genblitter.exe f > blitfunc.cpp - -genblitter.exe h > blitfunc.h - -genblitter.exe t > blittable.cpp - -Copy the resulting files back in the "src" directory of Amiberry \ No newline at end of file diff --git a/VisualGDB/genblitter/genblitter.vcxproj b/VisualGDB/genblitter/genblitter.vcxproj deleted file mode 100644 index a7e9c7c4..00000000 --- a/VisualGDB/genblitter/genblitter.vcxproj +++ /dev/null @@ -1,75 +0,0 @@ - - - - - Debug - VisualGDB - - - Release - VisualGDB - - - - 15.0 - {619EFB8C-E41A-4058-B085-1B8CD22692DD} - - - - - - - - - - Debug - C:\SysGCC\raspberry - com.visualgdb.raspberry_pi - 6.3.0/7.12/r3 - - - C:\SysGCC\raspberry - com.visualgdb.raspberry_pi - 6.3.0/7.12/r3 - - - - GNUPP14 - 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:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;..\..\src\include;..\..\src;..\..\src\osdep;%(ClCompile.AdditionalIncludeDirectories) - DEBUG=1;%(ClCompile.PreprocessorDefinitions) - - - ;%(Link.AdditionalLinkerInputs) - ;%(Link.LibrarySearchDirectories) - ;%(Link.AdditionalLibraryNames) - - - - - - GNUPP14 - 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:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;../../src/include;../../src;../../src/osdep;%(ClCompile.AdditionalIncludeDirectories) - NDEBUG=1;RELEASE=1;%(ClCompile.PreprocessorDefinitions) - - - ;%(Link.AdditionalLinkerInputs) - ;%(Link.LibrarySearchDirectories) - ;%(Link.AdditionalLibraryNames) - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/VisualGDB/genblitter/genblitter.vcxproj.filters b/VisualGDB/genblitter/genblitter.vcxproj.filters deleted file mode 100644 index fcb90c62..00000000 --- a/VisualGDB/genblitter/genblitter.vcxproj.filters +++ /dev/null @@ -1,40 +0,0 @@ - - - - - {afe8a49f-0586-4eea-b2ea-cc1c4567db36} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {4718ef87-4582-42a4-8469-11a35b5a4418} - h;hpp;hxx;hm;inl;inc;xsd - - - {e9ba1ae1-6dab-41af-8b75-7c41100a7fc9} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {c7346196-4f74-4afd-aa85-9da2661c7ab7} - *.vgdbsettings - - - - - VisualGDB settings - - - VisualGDB settings - - - - - Source files - - - Source files - - - - - - \ No newline at end of file diff --git a/VisualGDB/genblitter/genblitter.vcxproj.user b/VisualGDB/genblitter/genblitter.vcxproj.user deleted file mode 100644 index be250787..00000000 --- a/VisualGDB/genblitter/genblitter.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/VisualGDB/genlinetoscr/Readme.txt b/VisualGDB/genlinetoscr/Readme.txt deleted file mode 100644 index ff2f6f3c..00000000 --- a/VisualGDB/genlinetoscr/Readme.txt +++ /dev/null @@ -1,7 +0,0 @@ -This tool generates the "linetoscr.cpp" file. - -Compile it for the target system (e.g. Raspberry) then run it there as: - -genlinetoscr > linetoscr.cpp - -Copy the generated file back into the "src" directory. \ No newline at end of file diff --git a/VisualGDB/genlinetoscr/genlinetoscr.vcxproj b/VisualGDB/genlinetoscr/genlinetoscr.vcxproj deleted file mode 100644 index edb80923..00000000 --- a/VisualGDB/genlinetoscr/genlinetoscr.vcxproj +++ /dev/null @@ -1,74 +0,0 @@ - - - - - Debug - VisualGDB - - - Release - VisualGDB - - - - 15.0 - {883F2A00-8030-429B-AC7F-E930DDF9568F} - - - - - - - - - - Debug - C:\SysGCC\raspberry - com.visualgdb.raspberry_pi - 6.3.0/7.12/r3 - - - C:\SysGCC\raspberry - com.visualgdb.raspberry_pi - 6.3.0/7.12/r3 - - - - GNUPP14 - 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:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;../../src/include;../../src;../../src/osdep;=/usr/local/include/SDL2;%(ClCompile.AdditionalIncludeDirectories) - DEBUG=1;%(ClCompile.PreprocessorDefinitions) - - - ;%(Link.AdditionalLinkerInputs) - =/usr/local/lib;%(Link.LibrarySearchDirectories) - SDL2;%(Link.AdditionalLibraryNames) - - - - - - GNUPP14 - 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:\SysGCC\raspberry\arm-linux-gnueabihf\sysroot\usr\include;../../src/include;../../src;../../src/osdep;=/usr/local/include/SDL2;%(ClCompile.AdditionalIncludeDirectories) - NDEBUG=1;RELEASE=1;%(ClCompile.PreprocessorDefinitions) - - - ;%(Link.AdditionalLinkerInputs) - =/usr/local/lib;%(Link.LibrarySearchDirectories) - SDL2;%(Link.AdditionalLibraryNames) - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/VisualGDB/genlinetoscr/genlinetoscr.vcxproj.filters b/VisualGDB/genlinetoscr/genlinetoscr.vcxproj.filters deleted file mode 100644 index dc1e79f8..00000000 --- a/VisualGDB/genlinetoscr/genlinetoscr.vcxproj.filters +++ /dev/null @@ -1,37 +0,0 @@ - - - - - {19e139ec-d402-45d4-89fc-39f22443a95b} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {0a02e0a2-214b-4e9e-a7c5-0668ebf38e34} - h;hpp;hxx;hm;inl;inc;xsd - - - {30f92ef0-a24c-49e2-9e92-906dcef4d050} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {20bde34c-9e8e-42ee-83c1-c8c8143c7516} - *.vgdbsettings - - - - - VisualGDB settings - - - VisualGDB settings - - - - - Source files - - - - - - \ No newline at end of file diff --git a/VisualGDB/genlinetoscr/genlinetoscr.vcxproj.user b/VisualGDB/genlinetoscr/genlinetoscr.vcxproj.user deleted file mode 100644 index be250787..00000000 --- a/VisualGDB/genlinetoscr/genlinetoscr.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file