diff --git a/.github/workflows/cooking.yml b/.github/workflows/cooking.yml index 46b8deea2..c46c2221e 100644 --- a/.github/workflows/cooking.yml +++ b/.github/workflows/cooking.yml @@ -34,14 +34,16 @@ jobs: path: FlaxSamples - name: Build Editor run: | + cp .github\data\ExitOnEsc.cs FlaxSamples\MaterialsFeaturesTour\Source\Game .\Development\Scripts\Windows\CallBuildTool.bat -build -log -printSDKs -dotnet=8 -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxEditor - name: Cook Game (Windows) + shell: cmd run: | - cp .github\data\ExitOnEsc.cs FlaxSamples\MaterialsFeaturesTour\Source\Game - .\Binaries\Editor\Win64\Development\FlaxEditor.exe -std -headless -mute -null -project "FlaxSamples\MaterialsFeaturesTour" -build "Development.Windows" + start /w Binaries\Editor\Win64\Development\FlaxEditor.exe -std -headless -mute -null -project "FlaxSamples\MaterialsFeaturesTour" -build "Development.Windows" - name: Test Game (Windows) + shell: cmd run: | - .\FlaxSamples\MaterialsFeaturesTour\Output\Windows\MaterialsFeaturesTour.exe -std -headless -mute -null + start /w FlaxSamples\MaterialsFeaturesTour\Output\Windows\MaterialsFeaturesTour.exe -std -headless -mute -null # Cook on Mac cook-mac: @@ -50,10 +52,15 @@ jobs: steps: - name: Checkout repo uses: actions/checkout@v3 + - name: Setup Vulkan + uses: ./.github/actions/vulkan - name: Setup .NET uses: actions/setup-dotnet@v3 with: dotnet-version: 8.0.x + - name: Setup .NET Workload + run: | + dotnet workload install ios - name: Print .NET info run: | dotnet --info diff --git a/Source/Engine/Core/Log.cpp b/Source/Engine/Core/Log.cpp index 9395af05f..2b6d0f300 100644 --- a/Source/Engine/Core/Log.cpp +++ b/Source/Engine/Core/Log.cpp @@ -16,7 +16,7 @@ #include #define LOG_ENABLE_FILE (!PLATFORM_SWITCH) -#define LOG_ENABLE_WINDOWS_SINGLE_NEW_LINE_CHAR (PLATFORM_DESKTOP && (USE_EDITOR || !BUILD_RELEASE)) +#define LOG_ENABLE_WINDOWS_SINGLE_NEW_LINE_CHAR (PLATFORM_WINDOWS && PLATFORM_DESKTOP && (USE_EDITOR || !BUILD_RELEASE)) namespace {