From b86100aa14d02768179a72daffa699a1ad1ba0a9 Mon Sep 17 00:00:00 2001 From: sentientstardust Date: Wed, 20 May 2026 03:41:37 +0100 Subject: [PATCH] Fix windows non-PCH build --- .github/workflows/build_all.yml | 33 +++++++++++--------- .github/workflows/build_check_cache.yml | 21 ++++++++----- .github/workflows/build_deps.yml | 5 +++ .github/workflows/build_orca.yml | 22 +++++++++++-- CMakeLists.txt | 4 +-- src/OrcaSlicer.cpp | 8 +++-- src/OrcaSlicer_app_msvc.cpp | 4 +++ src/libslic3r/BlacklistedLibraryCheck.cpp | 1 + src/libslic3r/FilamentGroup.cpp | 2 +- src/libslic3r/Fill/FillRectilinear.cpp | 1 + src/libslic3r/GCode.cpp | 1 + src/libslic3r/GCode/PostProcessor.cpp | 4 +++ src/libslic3r/GCode/SeamPlacer.cpp | 1 + src/libslic3r/GCode/ToolOrdering.cpp | 1 + src/libslic3r/OpenVDBUtils.cpp | 2 ++ src/libslic3r/Preset.cpp | 6 ---- src/libslic3r/Print.cpp | 1 + src/libslic3r/SLA/Hollowing.cpp | 1 + src/libslic3r/SLA/SupportPointGenerator.cpp | 1 + src/libslic3r/SLA/SupportTreeBuilder.cpp | 2 ++ src/libslic3r/SLAPrintSteps.cpp | 1 + src/libslic3r/Support/SupportMaterial.cpp | 1 + src/libslic3r/Support/TreeModelVolumes.cpp | 1 + src/libslic3r/Support/TreeSupport3D.cpp | 1 + src/slic3r/CMakeLists.txt | 3 ++ src/slic3r/GUI/DragCanvas.hpp | 1 + src/slic3r/GUI/FilamentMapDialog.cpp | 2 ++ src/slic3r/GUI/GUI.cpp | 4 +++ src/slic3r/GUI/GUI_App.cpp | 1 + src/slic3r/GUI/InstanceCheck.cpp | 3 ++ src/slic3r/GUI/Jobs/ArrangeJob.cpp | 2 ++ src/slic3r/GUI/Printer/PrinterFileSystem.cpp | 3 ++ src/slic3r/GUI/SyncAmsInfoDialog.cpp | 1 + src/slic3r/GUI/SysInfoDialog.cpp | 8 +++-- 34 files changed, 116 insertions(+), 37 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 6f964980691..52f76eefc02 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -12,7 +12,7 @@ on: build_linux: description: 'Build Linux AppImage artifacts' type: boolean - default: false + default: true build_flatpak: description: 'Build Linux Flatpak artifacts' type: boolean @@ -21,6 +21,10 @@ on: description: 'Build Windows artifacts' type: boolean default: true + build_without_pch_windows: + description: 'Build without PCH (windows)' + type: boolean + default: false build_macos: description: 'Build macOS artifacts' type: boolean @@ -49,25 +53,26 @@ concurrency: cancel-in-progress: true jobs: - build_linux: - strategy: - fail-fast: false - if: ${{ !cancelled() && (github.event_name != 'create' || (github.event.ref_type == 'branch' && startsWith(github.event.ref, 'release/'))) && ((inputs.build_linux || false) || vars.BUILD_LINUX == 'true') }} - uses: ./.github/workflows/build_check_cache.yml - with: - os: ${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04' }} - build-deps-only: ${{ inputs.build-deps-only || false }} + build_linux: + strategy: + fail-fast: false + if: ${{ !cancelled() && (github.event_name != 'create' || (github.event.ref_type == 'branch' && startsWith(github.event.ref, 'release/'))) && (inputs.build_linux || github.event_name != 'workflow_dispatch' || vars.BUILD_LINUX == 'true') }} + uses: ./.github/workflows/build_check_cache.yml + with: + os: ${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04' }} + build-deps-only: ${{ inputs.build-deps-only || false }} release-version: ${{ inputs.release_version || '' }} secrets: inherit build_windows: if: ${{ !cancelled() && (inputs.build_windows || github.event_name != 'workflow_dispatch') && (github.event_name != 'create' || (github.event.ref_type == 'branch' && startsWith(github.event.ref, 'release/'))) }} uses: ./.github/workflows/build_check_cache.yml with: - os: ${{ vars.SELF_HOSTED && 'orca-win-server' || 'windows-latest' }} - build-deps-only: ${{ inputs.build-deps-only || false }} - force-build: false + os: ${{ vars.SELF_HOSTED && 'orca-win-server' || 'windows-latest' }} + build-deps-only: ${{ inputs.build-deps-only || false }} + force-build: false release-version: ${{ inputs.release_version || '' }} - secrets: inherit + build_without_pch_windows: ${{ inputs.build_without_pch_windows || false }} + secrets: inherit build_macos_arch: strategy: fail-fast: false @@ -159,7 +164,7 @@ jobs: name: Unit Tests runs-on: ${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04' }} needs: build_linux - if: ${{ !cancelled() && (github.event_name != 'create' || (github.event.ref_type == 'branch' && startsWith(github.event.ref, 'release/'))) && ((inputs.build_linux || false) || vars.BUILD_LINUX == 'true') && needs.build_linux.result == 'success' }} + if: ${{ !cancelled() && (github.event_name != 'create' || (github.event.ref_type == 'branch' && startsWith(github.event.ref, 'release/'))) && (inputs.build_linux || github.event_name != 'workflow_dispatch' || vars.BUILD_LINUX == 'true') && needs.build_linux.result == 'success' }} steps: - name: Checkout uses: actions/checkout@v6 diff --git a/.github/workflows/build_check_cache.yml b/.github/workflows/build_check_cache.yml index 703885dd8c5..d4ac38b3636 100644 --- a/.github/workflows/build_check_cache.yml +++ b/.github/workflows/build_check_cache.yml @@ -12,15 +12,19 @@ on: build-deps-only: required: false type: boolean - force-build: - required: false - type: boolean + force-build: + required: false + type: boolean release-version: required: false type: string default: '' - -jobs: + build_without_pch_windows: + required: false + type: boolean + default: false + +jobs: check_cache: # determines if there is a cache and outputs variables used in caching process name: Check Cache runs-on: ${{ inputs.os }} @@ -63,7 +67,8 @@ jobs: valid-cache: ${{ needs.check_cache.outputs.valid-cache == 'true' }} os: ${{ inputs.os }} arch: ${{ inputs.arch }} - build-deps-only: ${{ inputs.build-deps-only }} - force-build: ${{ inputs.force-build }} + build-deps-only: ${{ inputs.build-deps-only }} + force-build: ${{ inputs.force-build }} release-version: ${{ inputs.release-version }} - secrets: inherit + build_without_pch_windows: ${{ inputs.build_without_pch_windows }} + secrets: inherit diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 962f58ad887..1afa9738481 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -26,6 +26,10 @@ on: required: false type: string default: '' + build_without_pch_windows: + required: false + type: boolean + default: false jobs: build_deps: @@ -142,4 +146,5 @@ jobs: os: ${{ inputs.os }} arch: ${{ inputs.arch }} release-version: ${{ inputs.release-version }} + build_without_pch_windows: ${{ inputs.build_without_pch_windows }} secrets: inherit diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 5f9504d17d0..e714731185d 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -21,6 +21,10 @@ on: required: false type: string default: '' + build_without_pch_windows: + required: false + type: boolean + default: false jobs: build_orca: @@ -57,8 +61,9 @@ jobs: useCloudCache: true - name: Restore sccache cache + id: restore-sccache if: ${{ !vars.SELF_HOSTED && (runner.os == 'Windows' || runner.os == 'Linux' || (runner.os == 'macOS' && !inputs.macos-combine-only)) }} - uses: actions/cache@v5 + uses: actions/cache/restore@v5 with: path: ${{ env.SCCACHE_DIR }} key: sccache-orcaslicer-${{ runner.os }}-${{ inputs.arch || 'default' }}-${{ github.sha }} @@ -364,7 +369,7 @@ jobs: # env: # WindowsSdkDir: 'C:\Program Files (x86)\Windows Kits\10\' # WindowsSDKVersion: '10.0.26100.0\' - run: .\build_release_vs.bat slicer ${{ !vars.SELF_HOSTED && '-x -p' || '' }} + run: .\build_release_vs.bat slicer ${{ !vars.SELF_HOSTED && '-x' || '' }} ${{ !vars.SELF_HOSTED && inputs.build_without_pch_windows && '-p' || '' }} - name: Show sccache stats Windows if: ${{ always() && runner.os == 'Windows' && !vars.SELF_HOSTED }} @@ -473,6 +478,19 @@ jobs: sccache --show-stats fi + - name: Stop sccache server + if: ${{ always() && !vars.SELF_HOSTED && (runner.os == 'Windows' || runner.os == 'Linux' || (runner.os == 'macOS' && !inputs.macos-combine-only)) }} + continue-on-error: true + run: sccache --stop-server + + - name: Save sccache cache + if: ${{ always() && !vars.SELF_HOSTED && (runner.os == 'Windows' || runner.os == 'Linux' || (runner.os == 'macOS' && !inputs.macos-combine-only)) && steps.restore-sccache.outputs.cache-hit != 'true' && steps.restore-sccache.outputs.cache-primary-key != '' }} + continue-on-error: true + uses: actions/cache/save@v5 + with: + path: ${{ env.SCCACHE_DIR }} + key: ${{ steps.restore-sccache.outputs.cache-primary-key }} + # Use tar because upload-artifacts won't always preserve directory structure # and doesn't preserve file permissions - name: Upload Test Artifact diff --git a/CMakeLists.txt b/CMakeLists.txt index 80c3b5d718d..f6bd3f14305 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -502,10 +502,10 @@ include_directories(SYSTEM ${LIBDIR_BIN}/dev-utils/platform) include_directories(SYSTEM ${LIBDIR}/libigl) if(WIN32) - add_definitions(-D_USE_MATH_DEFINES -D_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS) + add_definitions(-D_USE_MATH_DEFINES -D_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -DNOMINMAX) if(MSVC) # BOOST_ALL_NO_LIB: Avoid the automatic linking of Boost libraries on Windows. Rather rely on explicit linking. - add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x602 -DBOOST_SYSTEM_USE_UTF8 ) + add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x602 -DBOOST_SYSTEM_USE_UTF8 -DBOOST_REGEX_NO_WIN32_LOCALE) # Force the source code encoding to UTF-8. See OrcaSlicer GH pull request #5583 add_compile_options("$<$:/utf-8>") add_compile_options("$<$:/utf-8>") diff --git a/src/OrcaSlicer.cpp b/src/OrcaSlicer.cpp index f8a42247be0..2b833253f4b 100644 --- a/src/OrcaSlicer.cpp +++ b/src/OrcaSlicer.cpp @@ -2,8 +2,12 @@ // Why? #define _WIN32_WINNT 0x0502 // The standard Windows includes. - #define WIN32_LEAN_AND_MEAN - #define NOMINMAX + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #ifndef NOMINMAX + #define NOMINMAX + #endif #include #include #include diff --git a/src/OrcaSlicer_app_msvc.cpp b/src/OrcaSlicer_app_msvc.cpp index 0f1953f55f6..435f2a3c9e1 100644 --- a/src/OrcaSlicer_app_msvc.cpp +++ b/src/OrcaSlicer_app_msvc.cpp @@ -1,8 +1,12 @@ // Why? #define _WIN32_WINNT 0x0502 // The standard Windows includes. +#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN +#endif +#ifndef NOMINMAX #define NOMINMAX +#endif #include #include #include diff --git a/src/libslic3r/BlacklistedLibraryCheck.cpp b/src/libslic3r/BlacklistedLibraryCheck.cpp index 938f5424977..cf7e6da2aaf 100644 --- a/src/libslic3r/BlacklistedLibraryCheck.cpp +++ b/src/libslic3r/BlacklistedLibraryCheck.cpp @@ -1,6 +1,7 @@ #include "BlacklistedLibraryCheck.hpp" #include +#include #include #ifdef WIN32 diff --git a/src/libslic3r/FilamentGroup.cpp b/src/libslic3r/FilamentGroup.cpp index 2a9b5b60377..71006764acd 100644 --- a/src/libslic3r/FilamentGroup.cpp +++ b/src/libslic3r/FilamentGroup.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include namespace Slic3r @@ -896,4 +897,3 @@ namespace Slic3r } - diff --git a/src/libslic3r/Fill/FillRectilinear.cpp b/src/libslic3r/Fill/FillRectilinear.cpp index 0b90d2bbb32..9e441aa8000 100644 --- a/src/libslic3r/Fill/FillRectilinear.cpp +++ b/src/libslic3r/Fill/FillRectilinear.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 1ec139e514c..d227274a4d7 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include diff --git a/src/libslic3r/GCode/PostProcessor.cpp b/src/libslic3r/GCode/PostProcessor.cpp index 1e084cd35e3..6c95a5c56be 100644 --- a/src/libslic3r/GCode/PostProcessor.cpp +++ b/src/libslic3r/GCode/PostProcessor.cpp @@ -19,8 +19,12 @@ #ifdef WIN32 // The standard Windows includes. +#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN +#endif +#ifndef NOMINMAX #define NOMINMAX +#endif #include #include diff --git a/src/libslic3r/GCode/SeamPlacer.cpp b/src/libslic3r/GCode/SeamPlacer.cpp index 24c6ae39cf6..37927d019f8 100644 --- a/src/libslic3r/GCode/SeamPlacer.cpp +++ b/src/libslic3r/GCode/SeamPlacer.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "libslic3r/AABBTreeLines.hpp" diff --git a/src/libslic3r/GCode/ToolOrdering.cpp b/src/libslic3r/GCode/ToolOrdering.cpp index bb1bcdcb53b..33ef8e77b17 100644 --- a/src/libslic3r/GCode/ToolOrdering.cpp +++ b/src/libslic3r/GCode/ToolOrdering.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include diff --git a/src/libslic3r/OpenVDBUtils.cpp b/src/libslic3r/OpenVDBUtils.cpp index 72c7668a45a..c72607f14f1 100644 --- a/src/libslic3r/OpenVDBUtils.cpp +++ b/src/libslic3r/OpenVDBUtils.cpp @@ -1,4 +1,6 @@ +#ifndef NOMINMAX #define NOMINMAX +#endif #include "OpenVDBUtils.hpp" #ifdef _MSC_VER diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 084b15fcc69..36de2791b06 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -6,12 +6,6 @@ #include "PresetBundle.hpp" #include "AppConfig.hpp" -#ifdef _MSC_VER - #define WIN32_LEAN_AND_MEAN - #define NOMINMAX - #include -#endif /* _MSC_VER */ - // instead of #include "slic3r/GUI/I18N.hpp" : #ifndef L // !!! If you needed to translate some string, diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index 954a9a4622d..fb049fec05d 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include diff --git a/src/libslic3r/SLA/Hollowing.cpp b/src/libslic3r/SLA/Hollowing.cpp index df621277703..f50cdbced28 100644 --- a/src/libslic3r/SLA/Hollowing.cpp +++ b/src/libslic3r/SLA/Hollowing.cpp @@ -1,4 +1,5 @@ #include +#include #include #include diff --git a/src/libslic3r/SLA/SupportPointGenerator.cpp b/src/libslic3r/SLA/SupportPointGenerator.cpp index 7c6c8d1f6b9..eacd08d0b83 100644 --- a/src/libslic3r/SLA/SupportPointGenerator.cpp +++ b/src/libslic3r/SLA/SupportPointGenerator.cpp @@ -16,6 +16,7 @@ #include "libslic3r.h" #include +#include #include namespace Slic3r { diff --git a/src/libslic3r/SLA/SupportTreeBuilder.cpp b/src/libslic3r/SLA/SupportTreeBuilder.cpp index 86339d2acf9..4080c4fc3f7 100644 --- a/src/libslic3r/SLA/SupportTreeBuilder.cpp +++ b/src/libslic3r/SLA/SupportTreeBuilder.cpp @@ -1,4 +1,6 @@ +#ifndef NOMINMAX #define NOMINMAX +#endif #include #include diff --git a/src/libslic3r/SLAPrintSteps.cpp b/src/libslic3r/SLAPrintSteps.cpp index 12eb2226e81..7fb5c90d891 100644 --- a/src/libslic3r/SLAPrintSteps.cpp +++ b/src/libslic3r/SLAPrintSteps.cpp @@ -1,3 +1,4 @@ +#include #include #include diff --git a/src/libslic3r/Support/SupportMaterial.cpp b/src/libslic3r/Support/SupportMaterial.cpp index 48e3f4caf26..b160ab15311 100644 --- a/src/libslic3r/Support/SupportMaterial.cpp +++ b/src/libslic3r/Support/SupportMaterial.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include diff --git a/src/libslic3r/Support/TreeModelVolumes.cpp b/src/libslic3r/Support/TreeModelVolumes.cpp index 0267c0c327c..16aa4ffd7e6 100644 --- a/src/libslic3r/Support/TreeModelVolumes.cpp +++ b/src/libslic3r/Support/TreeModelVolumes.cpp @@ -19,6 +19,7 @@ #include "../Utils.hpp" #include "../format.hpp" +#include #include #include diff --git a/src/libslic3r/Support/TreeSupport3D.cpp b/src/libslic3r/Support/TreeSupport3D.cpp index ba3008cd833..c7bc368c910 100644 --- a/src/libslic3r/Support/TreeSupport3D.cpp +++ b/src/libslic3r/Support/TreeSupport3D.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index 101aa234914..234e9cbbb6f 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -729,6 +729,9 @@ target_include_directories(libslic3r_gui PRIVATE Utils ${CMAKE_CURRENT_BINARY_DI if (WIN32) target_include_directories(libslic3r_gui SYSTEM PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../deps/WebView2/include) target_link_libraries(libslic3r_gui Advapi32) + if (MSVC) + target_compile_options(libslic3r_gui PRIVATE "$<$:/FIwx/msw/wrapcctl.h>") + endif() endif() source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SLIC3R_GUI_SOURCES}) diff --git a/src/slic3r/GUI/DragCanvas.hpp b/src/slic3r/GUI/DragCanvas.hpp index aa8d8ddfa8b..63ad4b0f62f 100644 --- a/src/slic3r/GUI/DragCanvas.hpp +++ b/src/slic3r/GUI/DragCanvas.hpp @@ -3,6 +3,7 @@ #include "wx/bitmap.h" #include "wx/dragimag.h" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/FilamentMapDialog.cpp b/src/slic3r/GUI/FilamentMapDialog.cpp index 73f8041a280..b8c3184f1e9 100644 --- a/src/slic3r/GUI/FilamentMapDialog.cpp +++ b/src/slic3r/GUI/FilamentMapDialog.cpp @@ -8,6 +8,8 @@ #include "CapsuleButton.hpp" #include "MsgDialog.hpp" +#include + namespace Slic3r { namespace GUI { static bool get_pop_up_remind_flag() diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp index 481f335d393..a40e031f4c9 100644 --- a/src/slic3r/GUI/GUI.cpp +++ b/src/slic3r/GUI/GUI.cpp @@ -16,8 +16,12 @@ #if __APPLE__ #import #elif _WIN32 +#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN +#endif +#ifndef NOMINMAX #define NOMINMAX +#endif #include #include "boost/nowide/convert.hpp" #endif diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 2d0dcaa817d..4836b05cb5d 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/InstanceCheck.cpp b/src/slic3r/GUI/InstanceCheck.cpp index fcdd1a9c888..fdda22836a3 100644 --- a/src/slic3r/GUI/InstanceCheck.cpp +++ b/src/slic3r/GUI/InstanceCheck.cpp @@ -1,6 +1,9 @@ #include "GUI_App.hpp" #include "InstanceCheck.hpp" #include "Plater.hpp" +#ifdef _WIN32 +#include +#endif #include #ifdef _WIN32 diff --git a/src/slic3r/GUI/Jobs/ArrangeJob.cpp b/src/slic3r/GUI/Jobs/ArrangeJob.cpp index e62e6e9d197..5e0c47e1e3e 100644 --- a/src/slic3r/GUI/Jobs/ArrangeJob.cpp +++ b/src/slic3r/GUI/Jobs/ArrangeJob.cpp @@ -16,6 +16,8 @@ #include "libnest2d/common.hpp" +#include + #define SAVE_ARRANGE_POLY 0 namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp index 8ecbe873914..3d9f4cc94a5 100644 --- a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp +++ b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp @@ -11,6 +11,9 @@ #include #include #include +#ifdef _WIN32 +#include +#endif #include #include diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index a819464a867..815c23d04be 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -1,5 +1,6 @@ #include "SyncAmsInfoDialog.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/SysInfoDialog.cpp b/src/slic3r/GUI/SysInfoDialog.cpp index 933cfb4d7cf..1722de343a8 100644 --- a/src/slic3r/GUI/SysInfoDialog.cpp +++ b/src/slic3r/GUI/SysInfoDialog.cpp @@ -20,8 +20,12 @@ #ifdef _WIN32 // The standard Windows includes. - #define WIN32_LEAN_AND_MEAN - #define NOMINMAX + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #ifndef NOMINMAX + #define NOMINMAX + #endif #include #include #endif /* _WIN32 */