Updated building config

This commit is contained in:
Dmitriy Shishkov 2022-05-31 07:44:42 +03:00
parent f80c95e75e
commit 926718365f
No known key found for this signature in database
GPG Key ID: 26720CB2A9608C97
6 changed files with 43 additions and 119 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
build/ build/
class_diagram/ class_diagram/
diagrams/ diagrams/
.vscode/*.log

View File

@ -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
}

25
.vscode/launch.json vendored
View File

@ -5,25 +5,16 @@
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"name": "make - Build and debug active file", "type": "lldb",
"type": "cppdbg",
"request": "launch", "request": "launch",
"program": "${fileDirname}/build/wxMahjong", "name": "Debug",
"program": "${workspaceFolder}/build/wxMahjong",
"args": [], "args": [],
"stopAtEntry": false, "cwd": "${workspaceFolder}",
"cwd": "${fileDirname}", "env": {
"environment": [{"name": "LD_LIBRARY_PATH", "value": "$LD_LIBRARY_PATH:/usr/local/lib"}], "LD_LIBRARY_PATH": "$LD_LIBRARY_PATH:/usr/local/lib"
"externalConsole": false, },
"MIMode": "gdb", "preLaunchTask": "C/C++: make build active file",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
],
"preLaunchTask": "C/C++: g++ build active file",
"miDebuggerPath": "/usr/bin/gdb"
} }
] ]
} }

114
.vscode/settings.json vendored
View File

@ -1,84 +1,32 @@
{ {
"C_Cpp.default.includePath": [ "makefile.extensionOutputFolder": "./.vscode",
"${default}", "makefile.launchConfigurations": [
"/usr/local/include/wx-3.1/", {
"/usr/local/lib/wx/include/gtk3-unicode-3.1" "cwd": "/home/dm1sh/dev/wxMahjong/build",
], "binaryPath": "/home/dm1sh/dev/wxMahjong/build/wxMahjong",
"files.associations": { "binaryArgs": []
"hash_map": "cpp", }
"*.tcc": "cpp", ],
"deque": "cpp", "files.associations": {
"list": "cpp", "array": "cpp",
"string": "cpp", "*.tcc": "cpp",
"vector": "cpp", "cmath": "cpp",
"hash_set": "cpp", "compare": "cpp",
"valarray": "cpp", "concepts": "cpp",
"iterator": "cpp", "cstdio": "cpp",
"random": "cpp", "cstdlib": "cpp",
"array": "cpp", "deque": "cpp",
"string_view": "cpp", "list": "cpp",
"chrono": "cpp", "vector": "cpp",
"numeric": "cpp", "exception": "cpp",
"streambuf": "cpp", "initializer_list": "cpp",
"*.inc": "cpp", "limits": "cpp",
"any": "cpp", "new": "cpp",
"atomic": "cpp", "cstdint": "cpp",
"bit": "cpp", "type_traits": "cpp",
"cctype": "cpp", "typeinfo": "cpp",
"cinttypes": "cpp", "unordered_set": "cpp",
"clocale": "cpp", "set": "cpp",
"cmath": "cpp", "tuple": "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"
}

2
.vscode/tasks.json vendored
View File

@ -2,7 +2,7 @@
"tasks": [ "tasks": [
{ {
"type": "cppbuild", "type": "cppbuild",
"label": "C/C++: g++ build active file", "label": "C/C++: make build active file",
"command": "make", "command": "make",
"args": [], "args": [],
"options": { "options": {

View File

@ -7,12 +7,12 @@ BDIR = build
OBJECTS := $(addprefix $(BDIR)/,$(patsubst %.cpp,%.o,$(wildcard *.cpp))) OBJECTS := $(addprefix $(BDIR)/,$(patsubst %.cpp,%.o,$(wildcard *.cpp)))
$(BDIR)/%.o: %.cpp $(BDIR)/%.o: %.cpp
$(CXX) -c `wx-config --cxxflags` -o $@ $< $(CXX) -c -g `wx-config --cxxflags` -o $@ $<
all: $(BDIR) $(PROGRAM) all: $(BDIR) $(PROGRAM)
$(PROGRAM): $(OBJECTS) $(PROGRAM): $(OBJECTS)
$(CXX) -o $(BDIR)/$(PROGRAM) $(OBJECTS) `wx-config --libs` -ggdb3 $(CXX) -o $(BDIR)/$(PROGRAM) $(OBJECTS) `wx-config --libs` -g
$(BDIR): $(BDIR):
mkdir $@ mkdir $@