Compare commits
3 Commits
46029cd01f
...
2.2.4
| Author | SHA1 | Date | |
|---|---|---|---|
| 49ccc76933 | |||
| d1660e05cb | |||
| 259d9873fb |
@@ -1 +1 @@
|
|||||||
2.2.3
|
2.2.4
|
||||||
@@ -1,3 +1,9 @@
|
|||||||
|
## 2.2.4
|
||||||
|
+ **default config**: C standard changed to C99
|
||||||
|
+ **default config**: enabled more warnings
|
||||||
|
+ added file `default_vscode/c_cpp_properties.json`
|
||||||
|
+ fixed copying of `default_vscode` files
|
||||||
|
|
||||||
## 2.2.3
|
## 2.2.3
|
||||||
+ removed `\r` characters from `detect_os.sh`
|
+ removed `\r` characters from `detect_os.sh`
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
INSTALLED_CBUILD_VERSION=2.2.3
|
INSTALLED_CBUILD_VERSION=2.2.4
|
||||||
|
|
||||||
# set \t size to 4 spaces
|
# set \t size to 4 spaces
|
||||||
tabs 4
|
tabs 4
|
||||||
@@ -106,8 +106,10 @@ do
|
|||||||
|
|
||||||
if ask_yn "Copy default .vscode launch tasks?"; then
|
if ask_yn "Copy default .vscode launch tasks?"; then
|
||||||
new_project_vscode_dir="$new_project_dir/.vscode"
|
new_project_vscode_dir="$new_project_dir/.vscode"
|
||||||
mkdir -p "$new_project_vscode_dir"
|
mkdir -pv "$new_project_vscode_dir"
|
||||||
cp -vr "$CBUILD_INSTALL_DIR/default_vscode/"* "$new_project_vscode_dir/"
|
for vscode_dir_f in $(find "$CBUILD_INSTALL_DIR/default_vscode/" -type f); do
|
||||||
|
cp -vr "$vscode_dir_f" "$new_project_vscode_dir/"
|
||||||
|
done
|
||||||
sed "s,\%PROJECT_NAME\%,$project_name,g" \
|
sed "s,\%PROJECT_NAME\%,$project_name,g" \
|
||||||
"$new_project_vscode_dir/launch.json" > "$new_project_vscode_dir/launch.json.temp"
|
"$new_project_vscode_dir/launch.json" > "$new_project_vscode_dir/launch.json.temp"
|
||||||
mv "$new_project_vscode_dir/launch.json.temp" "$new_project_vscode_dir/launch.json"
|
mv "$new_project_vscode_dir/launch.json.temp" "$new_project_vscode_dir/launch.json"
|
||||||
|
|||||||
@@ -1,13 +1,22 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
CBUILD_VERSION=2.2.3
|
CBUILD_VERSION=2.2.4
|
||||||
|
|
||||||
PROJECT="%PROJECT_NAME%"
|
PROJECT="%PROJECT_NAME%"
|
||||||
CMP_C="gcc"
|
CMP_C="gcc"
|
||||||
CMP_CPP="g++"
|
CMP_CPP="g++"
|
||||||
STD_C="c11"
|
STD_C="c99"
|
||||||
STD_CPP="c++11"
|
STD_CPP="c++11"
|
||||||
WARN_C="-Wall -Wno-discarded-qualifiers -Wextra -Wno-unused-parameter"
|
WARN_C="-Wall -Wextra
|
||||||
WARN_CPP="-Wall -Wextra -Wno-unused-parameter"
|
-Wduplicated-branches
|
||||||
|
-Wduplicated-cond
|
||||||
|
-Wformat=2
|
||||||
|
-Wmissing-include-dirs
|
||||||
|
-Wshadow
|
||||||
|
-Werror=return-type
|
||||||
|
-Werror=pointer-arith
|
||||||
|
-Werror=init-self
|
||||||
|
-Werror=incompatible-pointer-types"
|
||||||
|
WARN_CPP="$WARN_C"
|
||||||
SRC_C="$(find src -name '*.c')"
|
SRC_C="$(find src -name '*.c')"
|
||||||
SRC_CPP="$(find src -name '*.cpp')"
|
SRC_CPP="$(find src -name '*.cpp')"
|
||||||
|
|
||||||
@@ -24,9 +33,9 @@ ENABLED_DEPENDENCIES=''
|
|||||||
# └── profile/ - gcc *.gcda profiling info files
|
# └── profile/ - gcc *.gcda profiling info files
|
||||||
OBJDIR="obj"
|
OBJDIR="obj"
|
||||||
OUTDIR="bin"
|
OUTDIR="bin"
|
||||||
STATIC_LIB_FILE="lib$PROJECT.a"
|
STATIC_LIB_FILE="$PROJECT.a"
|
||||||
|
|
||||||
# example: "-I./dependencies/include/SDL2"
|
# example: "-I./include"
|
||||||
INCLUDE=""
|
INCLUDE=""
|
||||||
|
|
||||||
# OS-specific options
|
# OS-specific options
|
||||||
|
|||||||
14
default_vscode/c_cpp_properties.json
Normal file
14
default_vscode/c_cpp_properties.json
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": "all",
|
||||||
|
"defines": [],
|
||||||
|
"includePath": [
|
||||||
|
// "include",
|
||||||
|
"${default}"
|
||||||
|
],
|
||||||
|
"cStandard": "c99"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"version": 4
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user