Skip to content

[hotfix] Renamed includes directory to include. #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2024
Merged

[hotfix] Renamed includes directory to include. #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clangd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CompileFlags:
Add:
- '-std=c++17'
- '-Iincludes'
- '-Iinclude'
10 changes: 5 additions & 5 deletions .github/workflows/build.workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- main
paths:
- 'includes/**/*'
- 'include/**/*'
workflow_dispatch:

concurrency:
Expand All @@ -28,7 +28,7 @@ jobs:
- name: Build Release
run: |
mkdir -p build
g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so includes/RhythmGameUtilities/RhythmGameUtilities.cpp
g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so include/RhythmGameUtilities/RhythmGameUtilities.cpp

- name: Copy Release
run: |
Expand Down Expand Up @@ -65,8 +65,8 @@ jobs:
- name: Build Release
run: |
mkdir -p build
g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
lipo -create -output build/libRhythmGameUtilities.dylib build/libRhythmGameUtilities-arm64.dylib build/libRhythmGameUtilities-x86_64.dylib
lipo -info build/libRhythmGameUtilities.dylib

Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
mkdir -p build
cl /EHsc /std:c++17 /c includes/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
cl /EHsc /std:c++17 /c include/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
link /DLL /MACHINE:X64 /OUT:build\libRhythmGameUtilities.dll /IMPLIB:build\libRhythmGameUtilities.lib build\RhythmGameUtilities.obj
del build\RhythmGameUtilities.obj

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/canary-build.workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
branches:
- main
paths:
- 'includes/**/*'
- 'include/**/*'
workflow_dispatch:

concurrency:
Expand All @@ -24,7 +24,7 @@ jobs:
- name: Build Release
run: |
mkdir -p build
g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so includes/RhythmGameUtilities/RhythmGameUtilities.cpp
g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so include/RhythmGameUtilities/RhythmGameUtilities.cpp
canary-build-macos:
runs-on: macos-latest

Expand All @@ -35,8 +35,8 @@ jobs:
- name: Build Release
run: |
mkdir -p build
g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib includes/RhythmGameUtilities/RhythmGameUtilities.cpp
g++ -std=c++17 -shared -fPIC -arch arm64 -o build/libRhythmGameUtilities-arm64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
g++ -std=c++17 -shared -fPIC -arch x86_64 -o build/libRhythmGameUtilities-x86_64.dylib include/RhythmGameUtilities/RhythmGameUtilities.cpp
lipo -create -output build/libRhythmGameUtilities.dylib build/libRhythmGameUtilities-arm64.dylib build/libRhythmGameUtilities-x86_64.dylib
lipo -info build/libRhythmGameUtilities.dylib
canary-build-windows:
Expand All @@ -51,6 +51,6 @@ jobs:
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
mkdir -p build
cl /EHsc /std:c++17 /c includes/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
cl /EHsc /std:c++17 /c include/RhythmGameUtilities/RhythmGameUtilities.cpp /Fo:build\RhythmGameUtilities.obj
link /DLL /MACHINE:X64 /OUT:build\libRhythmGameUtilities.dll /IMPLIB:build\libRhythmGameUtilities.lib build\RhythmGameUtilities.obj
del build\RhythmGameUtilities.obj
6 changes: 3 additions & 3 deletions .github/workflows/test.workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- main
paths:
- 'includes/**/*'
- 'include/**/*'
- 'tests/**/*'
- 'RhythmGameUtilities/**/*'
- 'RhythmGameUtilities.Tests/**/*'
Expand All @@ -14,7 +14,7 @@ on:
branches:
- main
paths:
- 'includes/**/*'
- 'include/**/*'
- 'tests/**/*'
- 'RhythmGameUtilities/**/*'
- 'RhythmGameUtilities.Tests/**/*'
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Build Release
run: |
mkdir -p build
g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so includes/RhythmGameUtilities/RhythmGameUtilities.cpp
g++ -std=c++17 -shared -fPIC -o build/libRhythmGameUtilities.so include/RhythmGameUtilities/RhythmGameUtilities.cpp

- name: Copy Release
run: |
Expand Down
4 changes: 2 additions & 2 deletions .vscode/c_cpp_properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"configurations": [
{
"name": "Mac",
"includePath": ["${workspaceFolder}/**", "${workspaceFolder}/includes"],
"includePath": ["${workspaceFolder}/**", "${workspaceFolder}/include"],
"defines": [],
"compilerPath": "/usr/bin/clang",
"cStandard": "c17",
Expand All @@ -11,7 +11,7 @@
},
{
"name": "Win32",
"includePath": ["${workspaceFolder}/**", "${workspaceFolder}/includes"],
"includePath": ["${workspaceFolder}/**", "${workspaceFolder}/include"],
"defines": [],
"compilerPath": "C:/Program Files/Microsoft Visual Studio/2022/Preview/VC/Tools/MSVC/14.40.33617/bin/Hostx64/x64/cl.exe",
"cStandard": "c17",
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ clean: ## Clean project
git clean -xdf

tidy:
clang-tidy includes/**/*.hpp -checks=-*,clang-analyzer-*,-clang-analyzer-cplusplus*
clang-tidy include/**/*.hpp -checks=-*,clang-analyzer-*,-clang-analyzer-cplusplus*

.PHONY: build
2 changes: 1 addition & 1 deletion bin/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if not defined VCINSTALLDIR (

mkdir build

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

del build\RhythmGameUtilities.obj
Expand Down
4 changes: 2 additions & 2 deletions bin/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ COLOROFF=$(tput sgr0)

printf "Building macOS libraries ... "

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

if [[ ! -f build/libRhythmGameUtilities-arm64.dylib || ! -f build/libRhythmGameUtilities-x86_64.dylib ]]; then
exit 1
Expand Down
2 changes: 1 addition & 1 deletion bin/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ COLOROFF=$(tput sgr0)

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

if ! g++ -std=c++17 -o test "${FILE}" -Iincludes; then
if ! g++ -std=c++17 -o test "${FILE}" -Iinclude; then
printf "%sCOMPILATION FAILED%s\n" "${REDON}" "${COLOROFF}"
exit 1
fi
Expand Down
0 includes/RhythmGameUtilities/Audio.hpp → include/RhythmGameUtilities/Audio.hpp
View file
Open in desktop
File renamed without changes.
0 includes/RhythmGameUtilities/Common.hpp → include/RhythmGameUtilities/Common.hpp
View file
Open in desktop
File renamed without changes.
0 ...es/RhythmGameUtilities/Enums/Difficulty.h → ...de/RhythmGameUtilities/Enums/Difficulty.h
View file
Open in desktop
File renamed without changes.
0 .../RhythmGameUtilities/Enums/NamedSection.h → .../RhythmGameUtilities/Enums/NamedSection.h
View file
Open in desktop
File renamed without changes.
0 ...udes/RhythmGameUtilities/Enums/TypeCode.h → include/RhythmGameUtilities/Enums/TypeCode.h
View file
Open in desktop
File renamed without changes.
0 includes/RhythmGameUtilities/File.hpp → include/RhythmGameUtilities/File.hpp
View file
Open in desktop
File renamed without changes.
0 includes/RhythmGameUtilities/Parsers.hpp → include/RhythmGameUtilities/Parsers.hpp
View file
Open in desktop
File renamed without changes.
0 ...s/RhythmGameUtilities/ParsersInternal.hpp → ...e/RhythmGameUtilities/ParsersInternal.hpp
View file
Open in desktop
File renamed without changes.
0 ...ythmGameUtilities/RhythmGameUtilities.cpp → ...ythmGameUtilities/RhythmGameUtilities.cpp
View file
Open in desktop
File renamed without changes.
0 ...des/RhythmGameUtilities/Structs/BeatBar.h → ...ude/RhythmGameUtilities/Structs/BeatBar.h
View file
Open in desktop
File renamed without changes.
0 includes/RhythmGameUtilities/Structs/Note.h → include/RhythmGameUtilities/Structs/Note.h
View file
Open in desktop
File renamed without changes.
0 .../RhythmGameUtilities/Structs/TrackEvent.h → .../RhythmGameUtilities/Structs/TrackEvent.h
View file
Open in desktop
File renamed without changes.
0 includes/RhythmGameUtilities/Utilities.hpp → include/RhythmGameUtilities/Utilities.hpp
View file
Open in desktop
File renamed without changes.
0 ...RhythmGameUtilities/UtilitiesInternal.hpp → ...RhythmGameUtilities/UtilitiesInternal.hpp
View file
Open in desktop
File renamed without changes.