Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 16 additions & 13 deletions .github/workflows/build_cmake_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,24 +60,25 @@ jobs:
- uses: lukka/get-cmake@latest

- name: Configure CMake
shell: bash
shell: pwsh
run: |
cmake -S . \
-B build-windows-${{ matrix.BUILD_CONFIGURATION }}-${{ matrix.BUILD_PLATFORM }} \
-G "Visual Studio 17 2022" \
-A ${{ matrix.BUILD_PLATFORM }} \
-DCMAKE_BUILD_TYPE=${{ matrix.BUILD_CONFIGURATION }} \
cmake -S . `
-B build-windows-${{ matrix.BUILD_CONFIGURATION }}-${{ matrix.BUILD_PLATFORM }} `
-G "Visual Studio 17 2022" `
-A ${{ matrix.BUILD_PLATFORM }} `
-DCMAKE_BUILD_TYPE=${{ matrix.BUILD_CONFIGURATION }} `
-DOPENKO_FETCH_CLIENT_ASSETS=FALSE

- name: Build all
shell: bash
shell: pwsh
run: |
cmake \
--build build-windows-${{ matrix.BUILD_CONFIGURATION }}-${{ matrix.BUILD_PLATFORM }} \
--config ${{ matrix.BUILD_CONFIGURATION }}
cmake `
--build build-windows-${{ matrix.BUILD_CONFIGURATION }}-${{ matrix.BUILD_PLATFORM }} `
--config ${{ matrix.BUILD_CONFIGURATION }} `
--parallel

- name: Run tests
shell: bash
shell: pwsh
working-directory: build-windows-${{ matrix.BUILD_CONFIGURATION }}-${{ matrix.BUILD_PLATFORM }}
run: |
ctest -C "${{ matrix.BUILD_CONFIGURATION }}" --verbose
Expand Down Expand Up @@ -134,7 +135,8 @@ jobs:
run: |
cmake \
--build build-${{ matrix.COMPILER }}-${{ matrix.BUILD_CONFIGURATION }} \
--config ${{ matrix.BUILD_CONFIGURATION }}
--config ${{ matrix.BUILD_CONFIGURATION }} \
--parallel

- name: Run tests
shell: bash
Expand Down Expand Up @@ -179,7 +181,8 @@ jobs:
run: |
cmake \
--build build-${{ matrix.COMPILER }}-${{ matrix.BUILD_CONFIGURATION }} \
--config ${{ matrix.BUILD_CONFIGURATION }}
--config ${{ matrix.BUILD_CONFIGURATION }} \
--parallel

- name: Run tests
shell: bash
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build_msbuild_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,22 @@ jobs:

# NOTE: We could simply run All.sln, but it makes it far more obvious in the Github output when it's broken up across its solutions.
- name: Build third party dependencies
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" ThirdParty.slnx
run: msbuild /m /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" ThirdParty.slnx

- name: Build client
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Client.slnx
run: msbuild /m /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Client.slnx

- name: Build server
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Server.slnx
run: msbuild /m /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Server.slnx

- name: Build tools
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Tools.slnx
run: msbuild /m /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Tools.slnx

- name: Build client tools
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" ClientTools.slnx
run: msbuild /m /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" ClientTools.slnx

- name: Build tests
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Tests.slnx
run: msbuild /m /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Tests.slnx

- name: Run tests - FileIO
shell: cmd
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_msbuild_client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ jobs:

- name: Build client
working-directory: ${{env.GITHUB_WORKSPACE}}
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Client.slnx
run: msbuild /m /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" /p:NO_CLIENT_ASSETS="1" Client.slnx
2 changes: 1 addition & 1 deletion .github/workflows/build_msbuild_client_tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ jobs:
uses: microsoft/setup-msbuild@v2

- name: Build tools
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" ClientTools.slnx
run: msbuild /m /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" ClientTools.slnx
2 changes: 1 addition & 1 deletion .github/workflows/build_msbuild_server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ jobs:
uses: microsoft/setup-msbuild@v2

- name: Build server
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" Server.slnx
run: msbuild /m /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" Server.slnx
2 changes: 1 addition & 1 deletion .github/workflows/build_msbuild_tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ jobs:
uses: microsoft/setup-msbuild@v2

- name: Build tools
run: msbuild /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" Tools.slnx
run: msbuild /m /p:Configuration="${{matrix.BUILD_CONFIGURATION}}" /p:Platform="${{matrix.BUILD_PLATFORM}}" Tools.slnx
12 changes: 12 additions & 0 deletions .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,22 @@ on:
branches:
- master

paths:
- '**/*.cpp'
- '**/*.h'
- '**/*.hpp'
- '**/*.inl'

pull_request:
branches:
- master

paths:
- '**/*.cpp'
- '**/*.h'
- '**/*.hpp'
- '**/*.inl'

merge_group:
workflow_dispatch:

Expand Down
4 changes: 3 additions & 1 deletion Server.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
</Project>
</Folder>
<Folder Name="/_deps/fetch wrappers/">
<Project Path="deps/fetch-and-build-wrappers/fetch-argparse.vcxproj" Id="61a124fb-035e-4560-8499-198c6299b7da" />
<Project Path="deps/fetch-and-build-wrappers/fetch-argparse.vcxproj" Id="61a124fb-035e-4560-8499-198c6299b7da">
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
</Project>
<Project Path="deps/fetch-and-build-wrappers/fetch-asio.vcxproj" Id="98f92112-9ec7-4f20-a6c3-a0346acb271c">
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
</Project>
Expand Down
3 changes: 3 additions & 0 deletions ThirdParty.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<Platform Name="x64" />
</Configurations>
<Folder Name="/fetch wrappers/">
<Project Path="deps/fetch-and-build-wrappers/fetch-argparse.vcxproj" Id="61a124fb-035e-4560-8499-198c6299b7da">
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
</Project>
<Project Path="deps/fetch-and-build-wrappers/fetch-asio.vcxproj" Id="98f92112-9ec7-4f20-a6c3-a0346acb271c">
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
</Project>
Expand Down
1 change: 0 additions & 1 deletion src/Client/WarFare/StdAfx.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#include <WinSock2.h>
#include <N3Base/My_3DStruct.h>
#include <filesystem>

#if __has_include(<warfare_config.h>)
#include <warfare_config.h>
Expand Down
5 changes: 4 additions & 1 deletion src/N3Base/My_3DStruct.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
#pragma once

#include <d3dx9.h>
#include <string>

#include <cinttypes>
#include <cmath>
#include <filesystem>
#include <memory>
#include <string>

#include <spdlog/fmt/bundled/format.h>

Expand Down
4 changes: 3 additions & 1 deletion src/N3Base/N3BaseFileAccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ class CN3BaseFileAccess : public CN3Base
int m_iLOD; // 로딩할때 쓸 LOD

public:
// Full Path
const std::string& FileName() const
{
return m_szFileName;
} // Full Path
}

void FileNameSet(const std::string& szFileName);

bool LoadFromFile(); // 파일에서 읽어오기.
Expand Down
1 change: 0 additions & 1 deletion src/N3Base/StdAfxBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@
#pragma once

#include "My_3DStruct.h"
#include <filesystem>

#endif // N3BASE_STDAFX_H
2 changes: 2 additions & 0 deletions src/Server/AIServer/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#include <cassert>
#include <filesystem>
#include <memory>
#include <string>

#include <asio.hpp>

Expand Down
1 change: 1 addition & 0 deletions src/Server/Aujard/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#pragma once

#include <cassert>
#include <filesystem>
#include <memory>
#include <string>
Expand Down
7 changes: 6 additions & 1 deletion src/Server/Ebenezer/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@

#pragma once

#include <asio.hpp>
#include <cassert>
#include <filesystem>
#include <memory>
#include <string>

#include <shared-server/server_config.h>
#include <shared-server/utilities.h>

#include <asio.hpp>

#define myrand myrand_generic

#endif // SERVER_EBENEZER_PCH_H
5 changes: 5 additions & 0 deletions src/Server/ItemManager/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@

#pragma once

#include <cassert>
#include <filesystem>
#include <memory>
#include <string>

#include <shared-server/server_config.h>
#include <shared-server/utilities.h>

Expand Down
7 changes: 6 additions & 1 deletion src/Server/VersionManager/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@

#pragma once

#include <asio.hpp>
#include <cassert>
#include <filesystem>
#include <memory>
#include <string>

#include <shared-server/server_config.h>
#include <shared-server/utilities.h>

#include <asio.hpp>

#endif // SERVER_VERSIONMANAGER_PCH_H
1 change: 1 addition & 0 deletions src/Server/shared-server/pch.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#pragma once

#include <cinttypes>
#include <memory>

#include <shared/globals.h>

Expand Down
1 change: 0 additions & 1 deletion src/Tools/N3CE/StdAfx.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#endif // _AFX_NO_AFXCMN_SUPPORT

#include <N3Base/My_3DStruct.h>
#include <filesystem>

//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
Expand Down
2 changes: 1 addition & 1 deletion src/Tools/N3FXE/StdAfx.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <afxcmn.h> // MFC support for Windows Common Controls
#endif // _AFX_NO_AFXCMN_SUPPORT

#include <filesystem>
#include <N3Base/My_3DStruct.h>

//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
Expand Down
Loading