From 1372d3af7bf517dc6f8bc25d38f69759f2473488 Mon Sep 17 00:00:00 2001 From: solidgriever Date: Tue, 17 Jul 2018 01:59:28 +0300 Subject: [PATCH 1/7] config files for MSVC hardcoded to C:/MinGW/gcc.exe|c++,exe|gdb.exe --- .vs/launch.vs.json | 16 ++++++ CMakeSettings.json | 131 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+) create mode 100644 .vs/launch.vs.json create mode 100644 CMakeSettings.json diff --git a/.vs/launch.vs.json b/.vs/launch.vs.json new file mode 100644 index 000000000..8aae21610 --- /dev/null +++ b/.vs/launch.vs.json @@ -0,0 +1,16 @@ +{ + "version": "0.2.1", + "defaults": {}, + "configurations": [ + { + "type": "cppdbg", + "name": "SShock", + "project": "", + "cwd": "${workspaceRoot}", + "program": "${workspaceRoot}\\build\\x86-Debug\\systemshock.exe", + "MIMode": "gdb", + "miDebuggerPath": "C:\\MinGW\\bin\\gdb.exe", + "externalConsole": true + } + ] +} \ No newline at end of file diff --git a/CMakeSettings.json b/CMakeSettings.json new file mode 100644 index 000000000..daa24b7d0 --- /dev/null +++ b/CMakeSettings.json @@ -0,0 +1,131 @@ +{ + // See https://go.microsoft.com//fwlink//?linkid=834763 for more information about this file. + "configurations": [ + { + "name": "x86-Debug", + "generator": "Ninja", + "configurationType": "Debug", + "inheritEnvironments": [ "msvc_x86" ], + "buildRoot": "${workspaceRoot}\\build\\${name}", + "installRoot": "${workspaceRoot}\\build\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "-v", + "ctestCommandArgs": "", + "variables": [ + { + "name": "CMAKE_C_COMPILER", + "value": "C:/MinGW/bin/gcc.exe" + }, + { + "name": "CMAKE_CXX_COMPILER", + "value": "C:/MinGW/bin/g++.exe" + } + ] + }, + { + "name": "x86-Release", + "generator": "Ninja", + "configurationType": "RelWithDebInfo", + "inheritEnvironments": [ "msvc_x86" ], + "buildRoot": "${workspaceRoot}\\build\\${name}", + "installRoot": "${workspaceRoot}\\build\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "-v", + "ctestCommandArgs": "", + "variables": [ + { + "name": "CMAKE_C_COMPILER", + "value": "C:/MinGW/bin/gcc.exe" + }, + { + "name": "CMAKE_CXX_COMPILER", + "value": "C:/MinGW/bin/g++.exe" + } + ] + }, + { + "name": "x64-Debug", + "generator": "Ninja", + "configurationType": "Debug", + "inheritEnvironments": [ "msvc_x64_x64" ], + "buildRoot": "${workspaceRoot}\\build\\${name}", + "installRoot": "${workspaceRoot}\\build\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "-v", + "ctestCommandArgs": "", + "variables": [ + { + "name": "CMAKE_C_COMPILER", + "value": "C:/MinGW/bin/gcc.exe" + }, + { + "name": "CMAKE_CXX_COMPILER", + "value": "C:/MinGW/bin/g++.exe" + } + ] + }, + { + "name": "x64-Release", + "generator": "Ninja", + "configurationType": "RelWithDebInfo", + "inheritEnvironments": [ "msvc_x64_x64" ], + "buildRoot": "${workspaceRoot}\\build\\${name}", + "installRoot": "${workspaceRoot}\\build\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "-v", + "ctestCommandArgs": "", + "variables": [ + { + "name": "CMAKE_C_COMPILER", + "value": "C:/MinGW/bin/gcc.exe" + }, + { + "name": "CMAKE_CXX_COMPILER", + "value": "C:/MinGW/bin/g++.exe" + } + ] + }, + { + "name": "Linux-Debug", + "generator": "Unix Makefiles", + "remoteMachineName": "${defaultRemoteMachineName}", + "configurationType": "Debug", + "remoteCMakeListsRoot": "/var/tmp/src/${workspaceHash}/${name}", + "cmakeExecutable": "/usr/local/bin/cmake", + "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}", + "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}", + "remoteBuildRoot": "/var/tmp/build/${workspaceHash}/build/${name}", + "remoteInstallRoot": "/var/tmp/build/${workspaceHash}/install/${name}", + "remoteCopySources": true, + "remoteCopySourcesOutputVerbosity": "Normal", + "remoteCopySourcesConcurrentCopies": "10", + "remoteCopySourcesMethod": "rsync", + "remoteCopyBuildOutput": false, + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "linux_x64" ] + }, + { + "name": "Linux-Release", + "generator": "Unix Makefiles", + "remoteMachineName": "${defaultRemoteMachineName}", + "configurationType": "Release", + "remoteCMakeListsRoot": "/var/tmp/src/${workspaceHash}/${name}", + "cmakeExecutable": "/usr/local/bin/cmake", + "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}", + "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}", + "remoteBuildRoot": "/var/tmp/build/${workspaceHash}/build/${name}", + "remoteInstallRoot": "/var/tmp/build/${workspaceHash}/install/${name}", + "remoteCopySources": true, + "remoteCopySourcesOutputVerbosity": "Normal", + "remoteCopySourcesConcurrentCopies": "10", + "remoteCopySourcesMethod": "rsync", + "remoteCopyBuildOutput": false, + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "linux_x64" ] + } + ] +} \ No newline at end of file From 61d7dae065c5c4c78ccbb9d893d92427eaebe9d5 Mon Sep 17 00:00:00 2001 From: solidgriever Date: Thu, 19 Jul 2018 03:20:13 +0300 Subject: [PATCH 2/7] removed the hard coding but it is necesary to have MINGW as env variable --- .vs/launch.vs.json | 9 +++++---- CMakeSettings.json | 16 ++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.vs/launch.vs.json b/.vs/launch.vs.json index 8aae21610..be0e43bd6 100644 --- a/.vs/launch.vs.json +++ b/.vs/launch.vs.json @@ -4,13 +4,14 @@ "configurations": [ { "type": "cppdbg", - "name": "SShock", + "name": "System Shock", "project": "", - "cwd": "${workspaceRoot}", - "program": "${workspaceRoot}\\build\\x86-Debug\\systemshock.exe", + "cwd": "${workspaceRoot}\\build\\x86-Debug", + "program": "${debugInfo.target}\\build\\x86-Debug\\systemshock.exe", "MIMode": "gdb", - "miDebuggerPath": "C:\\MinGW\\bin\\gdb.exe", + "miDebuggerPath": "${env.MINGW_PREFIX}\\bin\\gdb.exe", "externalConsole": true } + ] } \ No newline at end of file diff --git a/CMakeSettings.json b/CMakeSettings.json index daa24b7d0..3a8831ec4 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -14,11 +14,11 @@ "variables": [ { "name": "CMAKE_C_COMPILER", - "value": "C:/MinGW/bin/gcc.exe" + "value": "${env.MINGW_PREFIX}\\bin\\gcc.exe" }, { "name": "CMAKE_CXX_COMPILER", - "value": "C:/MinGW/bin/g++.exe" + "value": "${env.MINGW_PREFIX}\\bin\\g++.exe" } ] }, @@ -35,11 +35,11 @@ "variables": [ { "name": "CMAKE_C_COMPILER", - "value": "C:/MinGW/bin/gcc.exe" + "value": "${env.MINGW_PREFIX}\\bin\\gcc.exe" }, { "name": "CMAKE_CXX_COMPILER", - "value": "C:/MinGW/bin/g++.exe" + "value": "${env.MINGW_PREFIX}\\bin\\g++.exe" } ] }, @@ -56,11 +56,11 @@ "variables": [ { "name": "CMAKE_C_COMPILER", - "value": "C:/MinGW/bin/gcc.exe" + "value": "${env.MINGW_PREFIX}\\bin\\gcc.exe" }, { "name": "CMAKE_CXX_COMPILER", - "value": "C:/MinGW/bin/g++.exe" + "value": "${env.MINGW_PREFIX}\\bin\\g++.exe" } ] }, @@ -77,11 +77,11 @@ "variables": [ { "name": "CMAKE_C_COMPILER", - "value": "C:/MinGW/bin/gcc.exe" + "value": "${env.MINGW_PREFIX}\\bin\\gcc.exe" }, { "name": "CMAKE_CXX_COMPILER", - "value": "C:/MinGW/bin/g++.exe" + "value": "${env.MINGW_PREFIX}\\bin\\g++.exe" } ] }, From 4fe45ae26d28589ee1612d5fe7f20bee1dd73aec Mon Sep 17 00:00:00 2001 From: solidgriever Date: Thu, 19 Jul 2018 23:57:38 +0300 Subject: [PATCH 3/7] reverted to hard coded "C:/MinGW" path --- .vs/launch.vs.json | 2 +- CMakeSettings.json | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.vs/launch.vs.json b/.vs/launch.vs.json index be0e43bd6..60b9949d6 100644 --- a/.vs/launch.vs.json +++ b/.vs/launch.vs.json @@ -9,7 +9,7 @@ "cwd": "${workspaceRoot}\\build\\x86-Debug", "program": "${debugInfo.target}\\build\\x86-Debug\\systemshock.exe", "MIMode": "gdb", - "miDebuggerPath": "${env.MINGW_PREFIX}\\bin\\gdb.exe", + "miDebuggerPath": "C:\\MinGW\\bin\\gdb.exe", "externalConsole": true } diff --git a/CMakeSettings.json b/CMakeSettings.json index 3a8831ec4..3c39bc445 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -9,16 +9,16 @@ "buildRoot": "${workspaceRoot}\\build\\${name}", "installRoot": "${workspaceRoot}\\build\\${name}", "cmakeCommandArgs": "", - "buildCommandArgs": "-v", + "buildCommandArgs": "-v -d stats", "ctestCommandArgs": "", "variables": [ { "name": "CMAKE_C_COMPILER", - "value": "${env.MINGW_PREFIX}\\bin\\gcc.exe" + "value": "C:\\MinGW\\bin\\gcc.exe" }, { "name": "CMAKE_CXX_COMPILER", - "value": "${env.MINGW_PREFIX}\\bin\\g++.exe" + "value": "C:\\MinGW\\bin\\g++.exe" } ] }, @@ -35,11 +35,11 @@ "variables": [ { "name": "CMAKE_C_COMPILER", - "value": "${env.MINGW_PREFIX}\\bin\\gcc.exe" + "value": "C:\\MinGW\\bin\\gcc.exe" }, { "name": "CMAKE_CXX_COMPILER", - "value": "${env.MINGW_PREFIX}\\bin\\g++.exe" + "value": "C:\\MinGW\\bin\\g++.exe" } ] }, @@ -53,14 +53,14 @@ "cmakeCommandArgs": "", "buildCommandArgs": "-v", "ctestCommandArgs": "", - "variables": [ + "variables": [ { "name": "CMAKE_C_COMPILER", - "value": "${env.MINGW_PREFIX}\\bin\\gcc.exe" + "value": "C:\\MinGW\\bin\\gcc.exe" }, { "name": "CMAKE_CXX_COMPILER", - "value": "${env.MINGW_PREFIX}\\bin\\g++.exe" + "value": "C:\\MinGW\\bin\\g++.exe" } ] }, @@ -74,14 +74,14 @@ "cmakeCommandArgs": "", "buildCommandArgs": "-v", "ctestCommandArgs": "", - "variables": [ + "variables": [ { "name": "CMAKE_C_COMPILER", - "value": "${env.MINGW_PREFIX}\\bin\\gcc.exe" + "value": "C:\\MinGW\\bin\\gcc.exe" }, { "name": "CMAKE_CXX_COMPILER", - "value": "${env.MINGW_PREFIX}\\bin\\g++.exe" + "value": "C:\\MinGW\\bin\\g++.exe" } ] }, From 82ff87ef622cbf8ca7c3b31ba4221119b308aa69 Mon Sep 17 00:00:00 2001 From: solidgriever Date: Fri, 20 Jul 2018 20:48:29 +0300 Subject: [PATCH 4/7] Added configuration for Visual Studio Code --- .vs/VSWorkspaceState.json | 9 +++++++++ .vscode/launch.json | 28 ++++++++++++++++++++++++++++ .vscode/settings.json | 4 ++++ CMakeSettings.json | 20 ++++++++++---------- 4 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 .vs/VSWorkspaceState.json create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 000000000..d6577200b --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,9 @@ +{ + "ExpandedNodes": [ + "", + "\\src", + "\\src\\MacSrc" + ], + "SelectedNode": "\\src\\MacSrc\\Shock.c", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 000000000..ab06a2c69 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,28 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "(gdb) Launch", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/build/systemshock.exe", + "args": [], + "stopAtEntry": false, + "cwd": "${workspaceFolder}/build", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "miDebuggerPath": "C:/MinGW/bin/gdb.exe", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..04abe32f0 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "cmake.configureOnOpen": true, + "C_Cpp.default.configurationProvider": "vector-of-bool.cmake-tools" +} \ No newline at end of file diff --git a/CMakeSettings.json b/CMakeSettings.json index 3c39bc445..d5de53989 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -14,11 +14,11 @@ "variables": [ { "name": "CMAKE_C_COMPILER", - "value": "C:\\MinGW\\bin\\gcc.exe" + "value": "C:/MinGW/bin/gcc.exe" }, { "name": "CMAKE_CXX_COMPILER", - "value": "C:\\MinGW\\bin\\g++.exe" + "value": "C:/MinGW/bin/g++.exe" } ] }, @@ -35,11 +35,11 @@ "variables": [ { "name": "CMAKE_C_COMPILER", - "value": "C:\\MinGW\\bin\\gcc.exe" + "value": "C:/MinGW/bin/gcc.exe" }, { "name": "CMAKE_CXX_COMPILER", - "value": "C:\\MinGW\\bin\\g++.exe" + "value": "C:/MinGW/bin/g++.exe" } ] }, @@ -53,14 +53,14 @@ "cmakeCommandArgs": "", "buildCommandArgs": "-v", "ctestCommandArgs": "", - "variables": [ + "variables": [ { "name": "CMAKE_C_COMPILER", - "value": "C:\\MinGW\\bin\\gcc.exe" + "value": "C:/MinGW/bin/gcc.exe" }, { "name": "CMAKE_CXX_COMPILER", - "value": "C:\\MinGW\\bin\\g++.exe" + "value": "C:/MinGW/bin/g++.exe" } ] }, @@ -74,14 +74,14 @@ "cmakeCommandArgs": "", "buildCommandArgs": "-v", "ctestCommandArgs": "", - "variables": [ + "variables": [ { "name": "CMAKE_C_COMPILER", - "value": "C:\\MinGW\\bin\\gcc.exe" + "value": "C:/MinGW/bin/gcc.exe" }, { "name": "CMAKE_CXX_COMPILER", - "value": "C:\\MinGW\\bin\\g++.exe" + "value": "C:/MinGW/bin/g++.exe" } ] }, From 451b8552bba4918a6c3656b71c2c35a2317247d6 Mon Sep 17 00:00:00 2001 From: solidgriever Date: Sat, 21 Jul 2018 02:43:26 +0300 Subject: [PATCH 5/7] VS & VS Code build in ./build/[ release | debug | minsizerel | relwithdebinfo ] folders debuggind done on the debug folder --- .vs/launch.vs.json | 9 +++---- .vscode/launch.json | 4 +-- .vscode/settings.json | 41 +++++++++++++++++++++++++++++- CMakeSettings.json | 58 ++++++------------------------------------- 4 files changed, 54 insertions(+), 58 deletions(-) diff --git a/.vs/launch.vs.json b/.vs/launch.vs.json index 60b9949d6..628b1c321 100644 --- a/.vs/launch.vs.json +++ b/.vs/launch.vs.json @@ -1,17 +1,16 @@ { "version": "0.2.1", - "defaults": {}, - "configurations": [ + "configurations": + [ { "type": "cppdbg", "name": "System Shock", "project": "", - "cwd": "${workspaceRoot}\\build\\x86-Debug", - "program": "${debugInfo.target}\\build\\x86-Debug\\systemshock.exe", + "cwd": "${workspaceRoot}\\build\\debug", + "program": "${debugInfo.target}\\build\\debug\\systemshock.exe", "MIMode": "gdb", "miDebuggerPath": "C:\\MinGW\\bin\\gdb.exe", "externalConsole": true } - ] } \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index ab06a2c69..c66869f8c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,10 +8,10 @@ "name": "(gdb) Launch", "type": "cppdbg", "request": "launch", - "program": "${workspaceFolder}/build/systemshock.exe", + "program": "${command:cmake.launchTargetPath}", "args": [], "stopAtEntry": false, - "cwd": "${workspaceFolder}/build", + "cwd": "${workspaceFolder}/build/debug", "environment": [], "externalConsole": true, "MIMode": "gdb", diff --git a/.vscode/settings.json b/.vscode/settings.json index 04abe32f0..7b4940d41 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,43 @@ { "cmake.configureOnOpen": true, - "C_Cpp.default.configurationProvider": "vector-of-bool.cmake-tools" + "C_Cpp.default.configurationProvider": "vector-of-bool.cmake-tools", + "cmake-tools-helper.cmake_download_path": "C:\\Users\\Admin\\.vscode\\extensions\\maddouri.cmake-tools-helper-0.2.1\\cmake_download", + "terminal.integrated.shell.windows": "C:\\WINDOWS\\System32\\cmd.exe", + "cmake.preferredGenerators": [ "Ninja", "Unix Makefiles" ], + "cmake.cmakePath": "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe", + "cmake.generator": "Ninja", + "cmake.configureSettings": + { + "CMAKE_MAKE_PROGRAM": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\IDE\\CommonExtensions\\Microsoft\\CMake\\Ninja\\ninja.exe" + }, + "cmake.useCMakeServer": true, + "cmake.buildDirectory": "${workspaceRoot}/build/${buildType}", + "cmake.defaultVariants": { + "buildType": { + "default": "debug", + "description": "The build type", + "choices": { + "debug": { + "short": "x86-Debug", + "long": "x86-Debug:Emit debug information without performing optimizations", + "buildType": "Debug" + }, + "release": { + "short": "x86-Release", + "long": "x86-Release: Enable optimizations, omit debug info", + "buildType": "Release" + }, + "minsize": { + "short": "x86-ReleaseMinSize", + "long": "x86-ReleaseMinSize: Optimize for smallest binary size", + "buildType": "MinSizeRel" + }, + "reldeb": { + "short": "x86-ReleaseWithDbgInfo", + "long": "x86-ReleaseWithDbgInfo: Perform optimizations AND include debugging information", + "buildType": "RelWithDebInfo" + } + } + } + } } \ No newline at end of file diff --git a/CMakeSettings.json b/CMakeSettings.json index d5de53989..90809472f 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -2,7 +2,7 @@ // See https://go.microsoft.com//fwlink//?linkid=834763 for more information about this file. "configurations": [ { - "name": "x86-Debug", + "name": "debug", "generator": "Ninja", "configurationType": "Debug", "inheritEnvironments": [ "msvc_x86" ], @@ -23,7 +23,7 @@ ] }, { - "name": "x86-Release", + "name": "release", "generator": "Ninja", "configurationType": "RelWithDebInfo", "inheritEnvironments": [ "msvc_x86" ], @@ -44,10 +44,10 @@ ] }, { - "name": "x64-Debug", + "name": "minsizerel", "generator": "Ninja", - "configurationType": "Debug", - "inheritEnvironments": [ "msvc_x64_x64" ], + "configurationType": "MinSizeRel", + "inheritEnvironments": [ "msvc_x86" ], "buildRoot": "${workspaceRoot}\\build\\${name}", "installRoot": "${workspaceRoot}\\build\\${name}", "cmakeCommandArgs": "", @@ -65,10 +65,10 @@ ] }, { - "name": "x64-Release", + "name": "relwithdebinfo", "generator": "Ninja", "configurationType": "RelWithDebInfo", - "inheritEnvironments": [ "msvc_x64_x64" ], + "inheritEnvironments": [ "msvc_x86" ], "buildRoot": "${workspaceRoot}\\build\\${name}", "installRoot": "${workspaceRoot}\\build\\${name}", "cmakeCommandArgs": "", @@ -84,48 +84,6 @@ "value": "C:/MinGW/bin/g++.exe" } ] - }, - { - "name": "Linux-Debug", - "generator": "Unix Makefiles", - "remoteMachineName": "${defaultRemoteMachineName}", - "configurationType": "Debug", - "remoteCMakeListsRoot": "/var/tmp/src/${workspaceHash}/${name}", - "cmakeExecutable": "/usr/local/bin/cmake", - "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}", - "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}", - "remoteBuildRoot": "/var/tmp/build/${workspaceHash}/build/${name}", - "remoteInstallRoot": "/var/tmp/build/${workspaceHash}/install/${name}", - "remoteCopySources": true, - "remoteCopySourcesOutputVerbosity": "Normal", - "remoteCopySourcesConcurrentCopies": "10", - "remoteCopySourcesMethod": "rsync", - "remoteCopyBuildOutput": false, - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "linux_x64" ] - }, - { - "name": "Linux-Release", - "generator": "Unix Makefiles", - "remoteMachineName": "${defaultRemoteMachineName}", - "configurationType": "Release", - "remoteCMakeListsRoot": "/var/tmp/src/${workspaceHash}/${name}", - "cmakeExecutable": "/usr/local/bin/cmake", - "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}", - "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}", - "remoteBuildRoot": "/var/tmp/build/${workspaceHash}/build/${name}", - "remoteInstallRoot": "/var/tmp/build/${workspaceHash}/install/${name}", - "remoteCopySources": true, - "remoteCopySourcesOutputVerbosity": "Normal", - "remoteCopySourcesConcurrentCopies": "10", - "remoteCopySourcesMethod": "rsync", - "remoteCopyBuildOutput": false, - "cmakeCommandArgs": "", - "buildCommandArgs": "", - "ctestCommandArgs": "", - "inheritEnvironments": [ "linux_x64" ] - } + } ] } \ No newline at end of file From 9d5a83a652f367190caa1944def179b8f811b060 Mon Sep 17 00:00:00 2001 From: solidgriever Date: Sun, 22 Jul 2018 04:28:06 +0300 Subject: [PATCH 6/7] Fix for the "Click-for-Options cursor is displayed instead of crosshair" when pressing F bug --- src/GameSrc/mouselook.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/GameSrc/mouselook.c b/src/GameSrc/mouselook.c index c02d256b1..b9723bca8 100644 --- a/src/GameSrc/mouselook.c +++ b/src/GameSrc/mouselook.c @@ -100,11 +100,16 @@ void mouse_look_toggle() { if (mlook_enabled) { // Flush mouse events, because we don't care about the past anymore - pump_events(); - mouse_flush(); + uiHideMouse(NULL); // Now we can center the mouse center_mouse(); + pump_events(); + mouse_flush(); + uiFlush(); + uiPopGlobalCursor(); + uiSetCursor(); + uiShowMouse(NULL); } } From d3dc2b42a0578bfb2071b3285c0a73c9446dcb80 Mon Sep 17 00:00:00 2001 From: solidgriever Date: Sun, 22 Jul 2018 05:03:31 +0300 Subject: [PATCH 7/7] Revert "Fix for the "Click-for-Options cursor is displayed instead of crosshair" when pressing F bug" This reverts commit 9d5a83a652f367190caa1944def179b8f811b060. --- src/GameSrc/mouselook.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/GameSrc/mouselook.c b/src/GameSrc/mouselook.c index b9723bca8..c02d256b1 100644 --- a/src/GameSrc/mouselook.c +++ b/src/GameSrc/mouselook.c @@ -100,16 +100,11 @@ void mouse_look_toggle() { if (mlook_enabled) { // Flush mouse events, because we don't care about the past anymore - uiHideMouse(NULL); + pump_events(); + mouse_flush(); // Now we can center the mouse center_mouse(); - pump_events(); - mouse_flush(); - uiFlush(); - uiPopGlobalCursor(); - uiSetCursor(); - uiShowMouse(NULL); } }