diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9cfc80c..d0e1bef 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,32 +1,12 @@ + { "name": "C++", - "build": { - "dockerfile": "Dockerfile" - }, + "image": "ghcr.io/maks1ms/win32api-linux-dev-ru-devcontainer", "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], - "features": { - "ghcr.io/devcontainers/features/common-utils:2": { - "installZsh": "true", - "username": "vscode", - "userUid": "1000", - "userGid": "1000" - }, - "ghcr.io/maks1ms/devcontainers-features/wine:0": {}, - "ghcr.io/devcontainers/features/desktop-lite:1": {} - }, - "customizations": { - "vscode": { - "settings": {}, - "extensions": [ - "ms-vscode.cpptools-extension-pack", - "xaver.clang-format" - ] - } - }, "forwardPorts": [ 6080 ], diff --git a/.vscode/cmake-kits.json b/.vscode/cmake-kits.json index 945ef36..cb4168b 100644 --- a/.vscode/cmake-kits.json +++ b/.vscode/cmake-kits.json @@ -3,7 +3,8 @@ "name": "GCC 8.3-posix (i686-w64-mingw32)", "compilers": { "C": "i686-w64-mingw32-gcc-posix", - "CXX": "i686-w64-mingw32-g++-posix" + "CXX": "i686-w64-mingw32-g++-posix", + "RC": "i686-w64-mingw32-windres" } } ] \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index 97279ba..622145b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -14,7 +14,7 @@ "debugServerArgs": "Z:/usr/share/win32/gdbserver.exe localhost:1111 ${command:cmake.launchTargetPath} ${command:cmake.launchTargetPath} arg1 arg2", "miDebuggerServerAddress": "localhost:1111", "serverStarted":"Listening\\ on\\ port\\ \\d*", - "debugServerPath": "/usr/bin/wine", + "debugServerPath": "${workspaceFolder}/.vscode/wine-ru_RU.cp1251", "filterStderr":true, "filterStdout":false, "logging": {