diff --git a/Minecraft.Client/cmake/sources/Windows.cmake b/Minecraft.Client/cmake/sources/Windows.cmake index 7fc07abd..046075f9 100644 --- a/Minecraft.Client/cmake/sources/Windows.cmake +++ b/Minecraft.Client/cmake/sources/Windows.cmake @@ -24,6 +24,8 @@ set(_MINECRAFT_CLIENT_WINDOWS_COMMON_UI "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIBitmapFont.h" "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIController.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIController.h" + "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIUnicodeBitmapFont.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIUnicodeBitmapFont.h" "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIGroup.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UIGroup.h" "${CMAKE_CURRENT_SOURCE_DIR}/Common/UI/UILayer.cpp" diff --git a/Minecraft.Server/cmake/sources/Common.cmake b/Minecraft.Server/cmake/sources/Common.cmake index 06aa0bfe..00991cee 100644 --- a/Minecraft.Server/cmake/sources/Common.cmake +++ b/Minecraft.Server/cmake/sources/Common.cmake @@ -130,6 +130,7 @@ set(_MINECRAFT_SERVER_COMMON_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/IUIScene_StartGame.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIBitmapFont.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIUnicodeBitmapFont.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIComponent_Chat.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIComponent_DebugUIConsole.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../Minecraft.Client/Common/UI/UIComponent_DebugUIMarketingGuide.cpp" diff --git a/Update-NightlyRelease.ps1 b/Update-NightlyRelease.ps1 index ea119429..e13112be 100644 --- a/Update-NightlyRelease.ps1 +++ b/Update-NightlyRelease.ps1 @@ -4,7 +4,7 @@ Builds zips for client and server, updates their Nightly GitHub releases, and archives locally. .DESCRIPTION 1. Fetches the latest commit hash. - 2. Zips client (x64\Release) and server (x64\Minecraft.Server\Release) builds into the archive folder. + 2. Zips client (build\Minecraft.Client\Release) and server (build\Minecraft.Server\Release) builds into the archive folder. 3. Updates the Nightly release: deletes old assets, uploads client zip + exe + pdb, updates title. 4. Updates the Nightly-Dedicated-Server release: deletes old assets, uploads server zip, updates title. .NOTES @@ -18,10 +18,10 @@ $ErrorActionPreference = "Stop" $RepoOwner = "itsRevela" $RepoName = "MinecraftConsoles" $ReleaseTag = "Nightly" -$ReleaseDir = Join-Path $PSScriptRoot "x64\Release" +$ReleaseDir = Join-Path $PSScriptRoot "build\Minecraft.Client\Release" $ZipName = "LCEWindows64.zip" $ServerReleaseTag = "Nightly-Dedicated-Server" -$ServerReleaseDir = Join-Path $PSScriptRoot "x64\Minecraft.Server\Release" +$ServerReleaseDir = Join-Path $PSScriptRoot "build\Minecraft.Server\Release" $ServerZipName = "LCEServerWindows64.zip" $ArchiveRoot = "C:\Users\rexma\Documents\Minecraft\itsRevelaReleases" $ApiBase = "https://api.github.com/repos/$RepoOwner/$RepoName"