Skip to content

Commit 2477c81

Browse files
neogeekneogeek
committed
Renamed includes directory to include.
1 parent 826aadb commit 2477c81

23 files changed

+21
-21
lines changed

‎.clangd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
CompileFlags:
22
Add:
33
- '-std=c++17'
4-
- '-Iincludes'
4+
- '-Iinclude'

‎.github/workflows/build.workflow.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- main
77
paths:
8-
- 'includes/**/*'
8+
- 'include/**/*'
99
workflow_dispatch:
1010

1111
concurrency:
@@ -28,7 +28,7 @@ jobs:
2828
- name: Build Release
2929
run: |
3030
mkdir -p build
31-
g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so includes/RhythmGameUtilities/RhythmGameUtilities.cpp
31+
g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so include/RhythmGameUtilities/RhythmGameUtilities.cpp
3232
3333
- name: Copy Release
3434
run: |
@@ -65,8 +65,8 @@ jobs:
6565
- name: Build Release
6666
run: |
6767
mkdir -p build
68-
g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
69-
g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
68+
g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
69+
g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
7070
lipo -create -output build/libRhythmGameUtilities.dylib build/libRhythmGameUtilities-arm64.dylib build/libRhythmGameUtilities-x86_64.dylib
7171
lipo -info build/libRhythmGameUtilities.dylib
7272
@@ -107,7 +107,7 @@ jobs:
107107
run: |
108108
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
109109
mkdir -p build
110-
cl /EHsc /std:c++17 /c includes/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
110+
cl /EHsc /std:c++17 /c include/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
111111
link /DLL /MACHINE:X64 /OUT:build\libRhythmGameUtilities.dll /IMPLIB:build\libRhythmGameUtilities.lib build\RhythmGameUtilities.obj
112112
del build\RhythmGameUtilities.obj
113113

‎.github/workflows/canary-build.workflow.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
branches:
77
- main
88
paths:
9-
- 'includes/**/*'
9+
- 'include/**/*'
1010
workflow_dispatch:
1111

1212
concurrency:
@@ -24,7 +24,7 @@ jobs:
2424
- name: Build Release
2525
run: |
2626
mkdir -p build
27-
g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so includes/RhythmGameUtilities/RhythmGameUtilities.cpp
27+
g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so include/RhythmGameUtilities/RhythmGameUtilities.cpp
2828
canary-build-macos:
2929
runs-on: macos-latest
3030

@@ -35,8 +35,8 @@ jobs:
3535
- name: Build Release
3636
run: |
3737
mkdir -p build
38-
g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
39-
g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
38+
g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
39+
g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
4040
lipo -create -output build/libRhythmGameUtilities.dylib build/libRhythmGameUtilities-arm64.dylib build/libRhythmGameUtilities-x86_64.dylib
4141
lipo -info build/libRhythmGameUtilities.dylib
4242
canary-build-windows:
@@ -51,6 +51,6 @@ jobs:
5151
run: |
5252
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
5353
mkdir -p build
54-
cl /EHsc /std:c++17 /c includes/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
54+
cl /EHsc /std:c++17 /c include/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
5555
link /DLL /MACHINE:X64 /OUT:build\libRhythmGameUtilities.dll /IMPLIB:build\libRhythmGameUtilities.lib build\RhythmGameUtilities.obj
5656
del build\RhythmGameUtilities.obj

‎.github/workflows/test.workflow.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- main
77
paths:
8-
- 'includes/**/*'
8+
- 'include/**/*'
99
- 'tests/**/*'
1010
- 'RhythmGameUtilities/**/*'
1111
- 'RhythmGameUtilities.Tests/**/*'
@@ -14,7 +14,7 @@ on:
1414
branches:
1515
- main
1616
paths:
17-
- 'includes/**/*'
17+
- 'include/**/*'
1818
- 'tests/**/*'
1919
- 'RhythmGameUtilities/**/*'
2020
- 'RhythmGameUtilities.Tests/**/*'
@@ -47,7 +47,7 @@ jobs:
4747
- name: Build Release
4848
run: |
4949
mkdir -p build
50-
g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so includes/RhythmGameUtilities/RhythmGameUtilities.cpp
50+
g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so include/RhythmGameUtilities/RhythmGameUtilities.cpp
5151
5252
- name: Copy Release
5353
run: |

‎.vscode/c_cpp_properties.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"configurations": [
33
{
44
"name": "Mac",
5-
"includePath": ["${workspaceFolder}/**", "${workspaceFolder}/includes"],
5+
"includePath": ["${workspaceFolder}/**", "${workspaceFolder}/include"],
66
"defines": [],
77
"compilerPath": "/usr/bin/clang",
88
"cStandard": "c17",
@@ -11,7 +11,7 @@
1111
},
1212
{
1313
"name": "Win32",
14-
"includePath": ["${workspaceFolder}/**", "${workspaceFolder}/includes"],
14+
"includePath": ["${workspaceFolder}/**", "${workspaceFolder}/include"],
1515
"defines": [],
1616
"compilerPath": "C:/Program Files/Microsoft Visual Studio/2022/Preview/VC/Tools/MSVC/14.40.33617/bin/Hostx64/x64/cl.exe",
1717
"cStandard": "c17",

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ clean: ## Clean project
2828
git clean -xdf
2929

3030
tidy:
31-
clang-tidy includes/**/*.hpp -checks=-*,clang-analyzer-*,-clang-analyzer-cplusplus*
31+
clang-tidy include/**/*.hpp -checks=-*,clang-analyzer-*,-clang-analyzer-cplusplus*
3232

3333
.PHONY: build

‎bin/build.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if not defined VCINSTALLDIR (
77

88
mkdir build
99

10-
cl /EHsc /std:c++17 /c includes/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
10+
cl /EHsc /std:c++17 /c include/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
1111
link /DLL /MACHINE:X64 /OUT:build\libRhythmGameUtilities.dll /IMPLIB:build\libRhythmGameUtilities.lib build\RhythmGameUtilities.obj
1212

1313
del build\RhythmGameUtilities.obj

‎bin/build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ COLOROFF=$(tput sgr0)
1616

1717
printf "Building macOS libraries ... "
1818

19-
g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
20-
g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
19+
g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
20+
g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
2121

2222
if [[ ! -f build/libRhythmGameUtilities-arm64.dylib || ! -f build/libRhythmGameUtilities-x86_64.dylib ]]; then
2323
exit 1

‎bin/test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ COLOROFF=$(tput sgr0)
1818

1919
printf " - Running %s " "${FILE}"
2020

21-
if ! g++ -std=c++17 -o test "${FILE}" -Iincludes; then
21+
if ! g++ -std=c++17 -o test "${FILE}" -Iinclude; then
2222
printf "%sCOMPILATION FAILED%s\n" "${REDON}" "${COLOROFF}"
2323
exit 1
2424
fi

‎includes/RhythmGameUtilities/Audio.hpp‎ renamed to ‎include/RhythmGameUtilities/Audio.hpp‎

File renamed without changes.

0 commit comments

Comments
 (0)