From 926718365f5f9be675d75a4b9c17005ba400f3a2 Mon Sep 17 00:00:00 2001 From: dm1sh Date: Tue, 31 May 2022 07:44:42 +0300 Subject: [PATCH] Updated building config --- .gitignore | 1 + .vscode/c_cpp_properties.json | 16 ----- .vscode/launch.json | 25 +++----- .vscode/settings.json | 114 +++++++++------------------------- .vscode/tasks.json | 2 +- Makefile | 4 +- 6 files changed, 43 insertions(+), 119 deletions(-) delete mode 100644 .vscode/c_cpp_properties.json diff --git a/.gitignore b/.gitignore index 7ebfe7e..8d8154e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ build/ class_diagram/ diagrams/ +.vscode/*.log \ No newline at end of file diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json deleted file mode 100644 index fe4c888..0000000 --- a/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "configurations": [ - { - "name": "Linux", - "includePath": [ - "${default}" - ], - "defines": [], - "compilerPath": "/usr/bin/clang", - "cStandard": "c17", - "cppStandard": "c++17", - "intelliSenseMode": "linux-clang-x64" - } - ], - "version": 4 -} \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index fc674e8..cc944cd 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,25 +5,16 @@ "version": "0.2.0", "configurations": [ { - "name": "make - Build and debug active file", - "type": "cppdbg", + "type": "lldb", "request": "launch", - "program": "${fileDirname}/build/wxMahjong", + "name": "Debug", + "program": "${workspaceFolder}/build/wxMahjong", "args": [], - "stopAtEntry": false, - "cwd": "${fileDirname}", - "environment": [{"name": "LD_LIBRARY_PATH", "value": "$LD_LIBRARY_PATH:/usr/local/lib"}], - "externalConsole": false, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ], - "preLaunchTask": "C/C++: g++ build active file", - "miDebuggerPath": "/usr/bin/gdb" + "cwd": "${workspaceFolder}", + "env": { + "LD_LIBRARY_PATH": "$LD_LIBRARY_PATH:/usr/local/lib" + }, + "preLaunchTask": "C/C++: make build active file", } ] } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index d2b3b7f..93df527 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,84 +1,32 @@ { - "C_Cpp.default.includePath": [ - "${default}", - "/usr/local/include/wx-3.1/", - "/usr/local/lib/wx/include/gtk3-unicode-3.1" - ], - "files.associations": { - "hash_map": "cpp", - "*.tcc": "cpp", - "deque": "cpp", - "list": "cpp", - "string": "cpp", - "vector": "cpp", - "hash_set": "cpp", - "valarray": "cpp", - "iterator": "cpp", - "random": "cpp", - "array": "cpp", - "string_view": "cpp", - "chrono": "cpp", - "numeric": "cpp", - "streambuf": "cpp", - "*.inc": "cpp", - "any": "cpp", - "atomic": "cpp", - "bit": "cpp", - "cctype": "cpp", - "cinttypes": "cpp", - "clocale": "cpp", - "cmath": "cpp", - "compare": "cpp", - "complex": "cpp", - "concepts": "cpp", - "condition_variable": "cpp", - "csignal": "cpp", - "cstdarg": "cpp", - "cstddef": "cpp", - "cstdint": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cstring": "cpp", - "ctime": "cpp", - "cwchar": "cpp", - "cwctype": "cpp", - "map": "cpp", - "set": "cpp", - "unordered_map": "cpp", - "unordered_set": "cpp", - "exception": "cpp", - "algorithm": "cpp", - "functional": "cpp", - "memory": "cpp", - "memory_resource": "cpp", - "optional": "cpp", - "ratio": "cpp", - "system_error": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "utility": "cpp", - "fstream": "cpp", - "initializer_list": "cpp", - "iomanip": "cpp", - "iosfwd": "cpp", - "iostream": "cpp", - "istream": "cpp", - "limits": "cpp", - "mutex": "cpp", - "new": "cpp", - "numbers": "cpp", - "ostream": "cpp", - "semaphore": "cpp", - "sstream": "cpp", - "stdexcept": "cpp", - "stop_token": "cpp", - "thread": "cpp", - "typeinfo": "cpp", - "variant": "cpp", - "*.xpm": "cpp", - "cfenv": "cpp", - "charconv": "cpp", - "shared_mutex": "cpp" - }, - "C_Cpp.default.cppStandard": "c++20" -} + "makefile.extensionOutputFolder": "./.vscode", + "makefile.launchConfigurations": [ + { + "cwd": "/home/dm1sh/dev/wxMahjong/build", + "binaryPath": "/home/dm1sh/dev/wxMahjong/build/wxMahjong", + "binaryArgs": [] + } + ], + "files.associations": { + "array": "cpp", + "*.tcc": "cpp", + "cmath": "cpp", + "compare": "cpp", + "concepts": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "deque": "cpp", + "list": "cpp", + "vector": "cpp", + "exception": "cpp", + "initializer_list": "cpp", + "limits": "cpp", + "new": "cpp", + "cstdint": "cpp", + "type_traits": "cpp", + "typeinfo": "cpp", + "unordered_set": "cpp", + "set": "cpp", + "tuple": "cpp" + } +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index f832e2f..413e87c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -2,7 +2,7 @@ "tasks": [ { "type": "cppbuild", - "label": "C/C++: g++ build active file", + "label": "C/C++: make build active file", "command": "make", "args": [], "options": { diff --git a/Makefile b/Makefile index 4e02dcf..02747bd 100644 --- a/Makefile +++ b/Makefile @@ -7,12 +7,12 @@ BDIR = build OBJECTS := $(addprefix $(BDIR)/,$(patsubst %.cpp,%.o,$(wildcard *.cpp))) $(BDIR)/%.o: %.cpp - $(CXX) -c `wx-config --cxxflags` -o $@ $< + $(CXX) -c -g `wx-config --cxxflags` -o $@ $< all: $(BDIR) $(PROGRAM) $(PROGRAM): $(OBJECTS) - $(CXX) -o $(BDIR)/$(PROGRAM) $(OBJECTS) `wx-config --libs` -ggdb3 + $(CXX) -o $(BDIR)/$(PROGRAM) $(OBJECTS) `wx-config --libs` -g $(BDIR): mkdir $@