diff --git a/MiSTer.sln b/MiSTer.sln index 307739e..87178b2 100644 --- a/MiSTer.sln +++ b/MiSTer.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.6.33801.468 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MiSTer", "MiSTer.vcxproj", "{C1D6BEA2-1469-4FBC-8A27-A82BDE9041AC}" EndProject @@ -16,7 +16,4 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {2089D6CB-559A-43F3-B74D-478279388F62} - EndGlobalSection EndGlobal diff --git a/MiSTer.vcxproj b/MiSTer.vcxproj index 06f0622..e4f03a2 100644 --- a/MiSTer.vcxproj +++ b/MiSTer.vcxproj @@ -9,13 +9,12 @@ {C1D6BEA2-1469-4FBC-8A27-A82BDE9041AC} MakeFileProj - Makefile true - v143 + v141 @@ -25,12 +24,13 @@ + wsl bash -lic ./build.sh MiSTer wsl bash -lic ./clean.sh - __arm__;__GNUC__;__USE_GNU;_GNU_SOURCE;VDATE="000000";_FILE_OFFSET_BITS=64;_LARGEFILE64_SOURCE;USE_PROTOTYPES=1;$(NMakePreprocessorDefinitions) - C:\Work\MiSTer\toolchain\gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf\arm-none-linux-gnueabihf\libc\usr\include;C:\Work\MiSTer\toolchain\gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf\lib\gcc\arm-none-linux-gnueabihf\10.3.1\include;C:\Work\MiSTer\toolchain\gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf\arm-none-linux-gnueabihf\include\c++\10.3.1;C:\Work\MiSTer\toolchain\gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf\arm-none-linux-gnueabihf\include\c++\10.3.1\arm-linux-gnueabihf;$(NMakeIncludeSearchPath);lib\libco;lib\miniz;lib\lodepng;lib\libchdr\include;lib\bluetooth + __arm__;__GNUC__;__USE_GNU ;_GNU_SOURCE;VDATE="000000";_FILE_OFFSET_BITS=64;_LARGEFILE64_SOURCE;$(NMakePreprocessorDefinitions) + c:\Work\MiSTer\toolchain\gcc103\arm-none-linux-gnueabihf\libc\usr\include;c:\Work\MiSTer\toolchain\gcc103\lib\gcc\arm-none-linux-gnueabihf\10.3.1\include;c:\Work\MiSTer\toolchain\gcc103\arm-none-linux-gnueabihf\include\c++\10.3.1;c:\Work\MiSTer\toolchain\gcc103\arm-none-linux-gnueabihf\include\c++\10.3.1\arm-linux-gnueabihf;$(NMakeIncludeSearchPath);lib\libco;lib\miniz;lib\lodepng;lib\libchdr\include;lib\bluetooth $(TEMP) $(TEMP) @@ -199,4 +199,4 @@ - \ No newline at end of file + diff --git a/input.cpp b/input.cpp index 53106dc..7722c5c 100644 --- a/input.cpp +++ b/input.cpp @@ -2393,7 +2393,6 @@ static void setup_deadzone(struct input_event* ev, int dev) // Dual Shock 3/4 else if (input[dev].quirk == QUIRK_DS3 || input[dev].quirk == QUIRK_DS4) { - printf("DETECTED MOTHER FUCKING DS3!\n"); input[dev].deadzone = 10U; } // Default dead zone diff --git a/setup_default_toolchain.sh b/setup_default_toolchain.sh index 13554f3..9284cfd 100644 --- a/setup_default_toolchain.sh +++ b/setup_default_toolchain.sh @@ -9,7 +9,7 @@ fi echo "Setting up default toolchain..." SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -GCC_VER=10.3-2021.07 +GCC_VER=10.2-2020.11 GCC_PACKAGE_NAME=gcc-arm-$GCC_VER-x86_64-arm-none-linux-gnueabihf GCC_DIR=$SCRIPT_DIR/$GCC_PACKAGE_NAME