araxiaonline/AscEmu
3
0
Fork 0
mirror of https://github.com/araxiaonline/AscEmu.git synced 2026-06-13 03:02:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix build errors when in C++20 mode

Browse Source 
enable BUILD_TOOLS for build
sch_mode
This commit is contained in:
schnek
2022-12-11 20:11:17 +03:00
parent 07d4557c9c
commit e1b6fa0ea2
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/build-test.yml vendored
View File

@@ -24,7 +24,7 @@ jobs:
gcc --version
cmake --version
mkdir ascemu_build_сlassic
cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=0 -DASCEMU_VERSION=Classic
cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=1 -DASCEMU_VERSION=Classic
make -j 4 && make install
TBC:
@@ -44,7 +44,7 @@ jobs:
gcc --version
cmake --version
mkdir ascemu_build_tbc
cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=0 -DASCEMU_VERSION=TBC
cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=1 -DASCEMU_VERSION=TBC
make -j 4 && make install
WotLK:
runs-on: ubuntu-latest
@@ -63,7 +63,7 @@ jobs:
gcc --version
cmake --version
mkdir ascemu_build_wotlk
cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=0 -DASCEMU_VERSION=WotLK
cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=1 -DASCEMU_VERSION=WotLK
make -j 4 && make install
Cata:
runs-on: ubuntu-latest
@@ -82,7 +82,7 @@ jobs:
gcc --version
cmake --version
mkdir ascemu_build_cata
cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=0 -DASCEMU_VERSION=Cata
cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=1 -DASCEMU_VERSION=Cata
make -j 4 && make install
Mop:
runs-on: ubuntu-latest
@@ -101,5 +101,5 @@ jobs:
gcc --version
cmake --version
mkdir ascemu_build_mop
cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=0 -DASCEMU_VERSION=Mop
cmake -DCMAKE_INSTALL_PREFIX=~/ -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_WARNINGS=0 -DBUILD_TOOLS=1 -DASCEMU_VERSION=Mop
make -j 4 && make install

5
src/tools/ToolsCataMop/mmaps_generator/MapBuilder.h
View File

@@ -45,8 +45,7 @@ private:
std::atomic<bool> _shutdown;
public:
ProducerConsumerQueue<T>() : _shutdown(false) { }
ProducerConsumerQueue() : _shutdown(false) { }
void Push(const T& value)
{
@@ -231,7 +230,7 @@ namespace MMAP
rcContext* m_rcContext;
std::vector<std::thread> _workerThreads;
ProducerConsumerQueue<uint32> _queue;
ProducerConsumerQueue<uint32_t> _queue;
std::atomic<bool> _cancelationToken;
};
}

5
src/tools/mmaps_generator/MapBuilder.h
View File

@@ -45,8 +45,7 @@ private:
std::atomic<bool> _shutdown;
public:
ProducerConsumerQueue<T>() : _shutdown(false) { }
ProducerConsumerQueue() : _shutdown(false) { }
void Push(const T& value)
{
@@ -231,7 +230,7 @@ namespace MMAP
rcContext* m_rcContext;
std::vector<std::thread> _workerThreads;
ProducerConsumerQueue<uint32> _queue;
ProducerConsumerQueue<uint32_t> _queue;
std::atomic<bool> _cancelationToken;
};
}