From e7376a0577375fb9eda0f1a1ac3def0016189a23 Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Mon, 14 Jan 2019 19:37:51 +0100 Subject: [PATCH] Updated VS project files with new preprocessor definition --- VSLinux/Amiberry.vcxproj | 10 +- .../Amiberry-RPI1-Debug.vgdbsettings | 88 ++++++++--------- .../Amiberry-RPI1-Release.vgdbsettings | 1 - VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj | 4 +- .../Amiberry-sdl1-Debug.vgdbsettings | 1 - .../Amiberry-sdl1-Release.vgdbsettings | 94 ++++++++++--------- VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj | 4 +- .../Amiberry-Debug-dispmanx.vgdbsettings | 5 +- .../Amiberry/Amiberry-Debug.vgdbsettings | 9 +- .../Amiberry-Release-dispmanx.vgdbsettings | 1 - .../Amiberry/Amiberry-Release.vgdbsettings | 1 - VisualGDB/Amiberry/Amiberry.vcxproj | 6 +- 12 files changed, 109 insertions(+), 115 deletions(-) diff --git a/VSLinux/Amiberry.vcxproj b/VSLinux/Amiberry.vcxproj index 3c4d0b94..dd991a1e 100644 --- a/VSLinux/Amiberry.vcxproj +++ b/VSLinux/Amiberry.vcxproj @@ -105,7 +105,7 @@ cd ~/projects/Amiberry-sdl2; make clean; make -j6 PLATFORM=rockpro64 cd ~/projects/Amiberry-sdl2; 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;$(NMakePreprocessorDefinitions) + DEBUG;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;_REENTRANT;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions) $(RemoteRootDir)/$(ProjectName)-sdl2 @@ -115,7 +115,7 @@ cd ~/projects/Amiberry; make clean; make -j4 PLATFORM=xu4 cd ~/projects/Amiberry; make clean 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) - DEBUG;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;USE_SDL2;_REENTRANT;ARM_HAS_DIV;MALI_GPU;USE_RENDER_THREAD;FASTERCYCLES;$(NMakePreprocessorDefinitions) + DEBUG;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;USE_SDL2;_REENTRANT;ARM_HAS_DIV;MALI_GPU;USE_RENDER_THREAD;FASTERCYCLES;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions) $(RemoteRootDir)/$(ProjectName) @@ -123,7 +123,7 @@ cd ~/projects/Amiberry; make -j6 PLATFORM=rockpro64 cd ~/projects/Amiberry; make clean; make -j6 PLATFORM=rockpro64 cd ~/projects/Amiberry; make clean - DEBUG;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;USE_SDL2;_REENTRANT;ARM_HAS_DIV;MALI_GPU;USE_RENDER_THREAD;FASTERCYCLES;$(NMakePreprocessorDefinitions) + DEBUG;ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;USE_SDL2;_REENTRANT;ARM_HAS_DIV;MALI_GPU;USE_RENDER_THREAD;FASTERCYCLES;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions) $(RemoteRootDir)/$(ProjectName) ..\src\include;..\src\osdep;..\src\archivers;..\guisan-dev\include;..\src @@ -133,7 +133,7 @@ cd ~/projects/Amiberry-sdl2; make -j3 PLATFORM=rpi3-sdl2 cd ~/projects/Amiberry-sdl2; make clean; make -j3 PLATFORM=rpi3-sdl2 cd ~/projects/Amiberry-sdl2; make clean - ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;_REENTRANT;$(NMakePreprocessorDefinitions) + ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;_REENTRANT;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions) $(RemoteRootDir)/$(ProjectName)-sdl2 @@ -141,7 +141,7 @@ cd ~/projects/Amiberry-sdl2; make -j3 PLATFORM=rpi3-sdl2 cd ~/projects/Amiberry-sdl2; make clean; make -j3 PLATFORM=rpi3-sdl2 cd ~/projects/Amiberry-sdl2; make clean - ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;MALI_GPU;USE_RENDER_THREAD;FASTERCYCLES;_REENTRANT;$(NMakePreprocessorDefinitions) + ARMV6T2;USE_ARMNEON;ARMV6_ASSEMBLY;AMIBERRY;CPU_arm;ARM_HAS_DIV;USE_SDL2;MALI_GPU;USE_RENDER_THREAD;FASTERCYCLES;_REENTRANT;_FILE_OFFSET_BITS=64;$(NMakePreprocessorDefinitions) $(RemoteRootDir)/$(ProjectName)-sdl2 diff --git a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Debug.vgdbsettings b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Debug.vgdbsettings index e758a2bb..15d3217f 100644 --- a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Debug.vgdbsettings +++ b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Debug.vgdbsettings @@ -58,11 +58,55 @@ Amiberry-RPI1.vcxproj - 1 true + + + + + + + + + + + + Default + + + + true + + + + + False + + + + + true + false + + Enabled + true + true + true + + + + + + + + false + + + VisualGDB\VisualGDBCache + + @@ -110,46 +154,4 @@ true false - - - - - - - - - - - - Default - - - - true - - - - - False - - - - - true - false - - Enabled - true - true - true - - - - - - false - - - VisualGDB\VisualGDBCache - \ No newline at end of file diff --git a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Release.vgdbsettings b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Release.vgdbsettings index fabc866d..a0560827 100644 --- a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Release.vgdbsettings +++ b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1-Release.vgdbsettings @@ -58,7 +58,6 @@ Amiberry-RPI1.vcxproj - 1 true diff --git a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj index d480bf82..e09c6c43 100644 --- a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj +++ b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj @@ -39,7 +39,7 @@ GNUPP14 =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories) - DEBUG=1;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;ARM_HAS_DIV;USE_SDL2;%(ClCompile.PreprocessorDefinitions) + DEBUG=1;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;ARM_HAS_DIV;USE_SDL2;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions) -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp %(AdditionalOptions) @@ -53,7 +53,7 @@ GNUPP14 =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories) - NDEBUG=1;RELEASE=1;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;ARM_HAS_DIV;USE_SDL2;%(ClCompile.PreprocessorDefinitions) + NDEBUG=1;RELEASE=1;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;ARM_HAS_DIV;USE_SDL2;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions) -march=armv6zk -mtune=arm1176jzf-s -mfpu=vfp %(AdditionalOptions) diff --git a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings index 83d8e713..ec7518d7 100644 --- a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings +++ b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings @@ -58,7 +58,6 @@ Amiberry-sdl1.vcxproj - 1 true diff --git a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Release.vgdbsettings b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Release.vgdbsettings index 73271787..293ce113 100644 --- a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Release.vgdbsettings +++ b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Release.vgdbsettings @@ -50,19 +50,63 @@ com.visualgdb.raspberry_pi - 4.9.2 - 7.7.1 - 4 + 6.3.0 + 7.12 + 3 Amiberry-sdl1.vcxproj - 1 true + + + + + + + + + + + + Default + + + + true + + + + + False + + + + + true + false + + Enabled + true + true + true + + + + + + + + false + + + VisualGDB\VisualGDBCache + + @@ -110,46 +154,4 @@ true false - - - - - - - - - - - - Default - - - - true - - - - - False - - - - - true - false - - Enabled - true - true - true - - - - - - false - - - VisualGDB\VisualGDBCache - \ No newline at end of file diff --git a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj index e31b8b02..3fc39a85 100644 --- a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj +++ b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj @@ -38,7 +38,7 @@ GNUPP14 =/usr/include/SDL;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories) - DEBUG=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL1;USE_DISPMANX;%(ClCompile.PreprocessorDefinitions) + DEBUG=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL1;USE_DISPMANX;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions) -march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions) @@ -52,7 +52,7 @@ GNUPP14 =/usr/include/SDL;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories) - NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL1;USE_DISPMANX;%(ClCompile.PreprocessorDefinitions) + NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL1;USE_DISPMANX;_FILE_OFFSET_BITS=64;%(ClCompile.PreprocessorDefinitions) -march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions) diff --git a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings index 66fae691..23f4719c 100644 --- a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings +++ b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings @@ -6,9 +6,6 @@ Unknown - - None - 192.168.1.173 SSH @@ -35,6 +32,7 @@ true true + false true @@ -57,7 +55,6 @@ Amiberry.vcxproj - 1 true diff --git a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings index e0612410..4020f054 100644 --- a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings +++ b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings @@ -6,11 +6,8 @@ MinGWUnixSlash - - None - - 192.168.1.99 + 192.168.1.216 SSH pi @@ -35,6 +32,7 @@ true true + false true @@ -57,7 +55,6 @@ Amiberry.vcxproj - 1 true @@ -186,7 +183,7 @@ false /home/pi/projects/amiberry/$(TargetFileName) - Remote + Local false false Auto diff --git a/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings index e522d0a6..fba730e5 100644 --- a/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings +++ b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings @@ -58,7 +58,6 @@ Amiberry.vcxproj - 1 true diff --git a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings index d9891347..66088454 100644 --- a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings +++ b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings @@ -58,7 +58,6 @@ Amiberry.vcxproj - 1 true diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj index d295db53..069caccc 100644 --- a/VisualGDB/Amiberry/Amiberry.vcxproj +++ b/VisualGDB/Amiberry/Amiberry.vcxproj @@ -75,7 +75,7 @@ GNUPP14 =/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) - DEBUG=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;USE_DISPMANX;%(ClCompile.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) -march=armv8-a -mfpu=neon-fp-armv8 %(AdditionalOptions) @@ -90,7 +90,7 @@ GNUPP14 =/usr/local/include/SDL2;=/usr/include/libxml2;../../src;../../src/osdep;../../src/threaddep;../../src/include;../../guisan-dev/include;../../src/archivers;%(ClCompile.AdditionalIncludeDirectories) - NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;%(ClCompile.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) -march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions) @@ -106,7 +106,7 @@ GNUPP14 =/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) - NDEBUG=1;RELEASE=1;ARMV6T2;USE_ARMNEON;ARM_HAS_DIV;_REENTRANT;AMIBERRY;CPU_arm;ARMV6_ASSEMBLY;USE_SDL2;USE_DISPMANX;%(ClCompile.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) -march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)