diff --git a/.gitignore b/.gitignore index 700ddb3d..c802b630 100644 --- a/.gitignore +++ b/.gitignore @@ -71,4 +71,5 @@ ref/ *.aps builds/build_* -builds/*.zip \ No newline at end of file +builds/*.zip +builds/deps_* diff --git a/appveyor.yml b/appveyor.yml index f093d2aa..94464053 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ branches: except: - master - dp -image: Visual Studio 2015 +image: Visual Studio 2017 clone_depth: 1 build_script: - cmd: >- diff --git a/builds/cmake_win32.bat b/builds/cmake_win32.bat index 7237e543..bec24d87 100644 --- a/builds/cmake_win32.bat +++ b/builds/cmake_win32.bat @@ -2,7 +2,7 @@ if not exist deps_win call %~dp0download_windeps.bat set DEPS_DIR="%cd%/deps_win" if not exist build_win32 mkdir build_win32 pushd build_win32 -cmake ../.. -T v140_xp ^ +cmake ../.. -T v141_xp ^ -DGLEW_INCLUDE_DIR=%DEPS_DIR%/glew-2.0.0/include ^ -DGLEW_LIBRARY=%DEPS_DIR%/glew-2.0.0/lib/Release/Win32/glew32.lib ^ -DGLFW3_ROOT_PATH=%DEPS_DIR%/glfw-3.2.1.bin.WIN32 ^ diff --git a/stdafx.h b/stdafx.h index 83e96e3d..78bc2c27 100644 --- a/stdafx.h +++ b/stdafx.h @@ -5,6 +5,8 @@ #pragma once +#define _USE_MATH_DEFINES +#include #ifdef _MSC_VER // memory debug functions #define _CRTDBG_MAP_ALLOC @@ -28,8 +30,6 @@ // stl #include #include -#define _USE_MATH_DEFINES -#include #include #include #include