Skip to content

Commit

Permalink
build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jmorton06 committed Aug 20, 2024
1 parent d1956e1 commit 3dfbe6d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Windows:
runs-on: windows-2019
runs-on: windows-2022
strategy:
matrix:
config: [Debug, Release, Production]
platform: [x64]
env:
MSBUILD_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\
MSBUILD_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -126,7 +126,7 @@ jobs:
- name: Generate Project
run: |
cd Scripts/Windows
./GenerateVS19.bat
./GenerateVS22.bat
- name: Build x64 ${{matrix.configuration}}
shell: cmd
run: |
Expand Down
5 changes: 3 additions & 2 deletions Lumos/Source/Lumos/Core/Asset/AssetRegistry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,14 @@ namespace Lumos
m_AssetRegistry[newID] = metaData;
m_AssetRegistry.erase(current);
std::string name;

#ifndef LUMOS_PRODUCTION
if(GetName(current, name))
{
m_NameMap[name] = newID;
#ifndef LUMOS_PRODUCTION
m_UUIDNameMap[newID] = name;
m_UUIDNameMap.erase(current);
#endif
}
#endif
}
}
2 changes: 1 addition & 1 deletion Lumos/Source/Lumos/Platform/iOS/iOSWindow.mm
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

bool iOSWindow::Init(const WindowDesc& properties, const std::string& title)
{
LINFO("Creating window - Title : %s, Width : %i, Height : %i", properties.Title.c_str(), properties.Width, properties.Height);
LINFO("Creating window - Title : %s, Width : %i, Height : %i", (const char*)properties.Title.str, properties.Width, properties.Height);

m_Data.Title = properties.Title;
m_Data.Width = properties.Width;
Expand Down

0 comments on commit 3dfbe6d

Please sign in to comment.