diff --git a/appveyor.yml b/appveyor.yml index 9a74745c..a3278377 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -39,9 +39,9 @@ test_script: - ps: cd c:\projects\flax - ps: New-Item -Force -Path build\sysroot\usr\local\lib\flaxlibs -ItemType Directory - ps: Copy-Item -Recurse -Force libs\* build\sysroot\usr\local\lib\flaxlibs\ - - ps: build\meson-rel\flaxc.exe -sysroot build\sysroot -profile -run -backend llvm build\tester.flx - - ps: build\meson-rel\flaxc.exe -sysroot build\sysroot -profile -run -backend interp build\tester.flx - - ps: build\meson-rel\flaxc.exe -sysroot build\sysroot -profile build\tester.flx + - ps: build\meson-rel\flaxc.exe -sysroot build\sysroot -run -backend llvm build\tester.flx + - ps: build\meson-rel\flaxc.exe -sysroot build\sysroot -run -backend interp build\tester.flx + - ps: build\meson-rel\flaxc.exe -sysroot build\sysroot build\tester.flx - ps: .\tester.exe after_test: diff --git a/source/platform/msvcfinder.cpp b/source/platform/msvcfinder.cpp index 2671f365..295ff8ef 100644 --- a/source/platform/msvcfinder.cpp +++ b/source/platform/msvcfinder.cpp @@ -10,14 +10,12 @@ #include #if OS_WINDOWS - #ifndef NOMINMAX - #define NOMINMAX - #endif - #include +#ifndef NOMINMAX + #define NOMINMAX #endif - +#include namespace platform { namespace compiler @@ -429,6 +427,7 @@ namespace compiler } } +#endif