Skip to content

Commit 3aa73f9

Browse files
committed
Build cleanup
1 parent b8b62ed commit 3aa73f9

5 files changed

Lines changed: 3 additions & 127 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ jobs:
4949

5050
- name: Install Deps (Ubuntu)
5151
if: matrix.os == 'ubuntu-latest'
52-
run: sudo apt-get update && sudo apt-get install nasm libxext-dev libavcodec-dev libavformat-dev libavdevice-dev libavfilter-dev libegl-dev gperf autoconf-archive alsa-lib ninja-build
52+
run: sudo apt-get update && sudo apt-get install nasm libxext-dev libavcodec-dev libavformat-dev libavdevice-dev libavfilter-dev libegl-dev gperf autoconf-archive libasound2-dev ninja-build
5353

5454
- name: Install GCC (Ubuntu)
5555
if: matrix.os == 'ubuntu-latest'
5656
run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test && sudo apt-get install g++-10 libstdc++-10-dev && echo "CC=gcc-10" >> $GITHUB_ENV && echo "CXX=g++-10" >> $GITHUB_ENV
5757

5858
- name: Install Deps (MacOS)
59-
if: matrix.os == 'macos-11'
59+
if: matrix.os == 'macos-13'
6060
run: brew install nasm automake autoconf autoconf-archive ninja
6161

6262
- name: Run vcpkg

src/Abyss/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ add_library(Abyss
2222
Common/RingBuffer.h
2323
Common/Scene.h
2424
Common/SoundEffectProvider.h
25-
Common/WavDecompress.cpp Common/WavDecompress.h
2625

2726
Concepts/Drawable.h
2827
Concepts/FontRenderer.h

src/Abyss/Common/WavDecompress.cpp

Lines changed: 0 additions & 112 deletions
This file was deleted.

src/Abyss/Common/WavDecompress.h

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/OD2/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ int main(const int argc, char **argv) {
198198
engine.setScene(std::make_unique<OD2::Scenes::MainMenu::MainMenu>());
199199

200200
Abyss::Common::Log::info("Startup complete");
201-
engine.setMasterVolumeLevel(0.0f);
201+
//engine.setMasterVolumeLevel(0.0f);
202202

203203
engine.run();
204204
} catch (const std::exception &exception) {

0 commit comments

Comments
 (0)