This commit is contained in:
VB
2017-06-17 22:31:58 +02:00
parent ca56741433
commit 03ccb3d5e8
4 changed files with 6 additions and 5 deletions

1
.gitignore vendored
View File

@@ -72,3 +72,4 @@ ref/
builds/build_*
builds/*.zip
builds/deps_*

View File

@@ -3,7 +3,7 @@ branches:
except:
- master
- dp
image: Visual Studio 2015
image: Visual Studio 2017
clone_depth: 1
build_script:
- cmd: >-

View File

@@ -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 ^

View File

@@ -5,6 +5,8 @@
#pragma once
#define _USE_MATH_DEFINES
#include <cmath>
#ifdef _MSC_VER
// memory debug functions
#define _CRTDBG_MAP_ALLOC
@@ -28,8 +30,6 @@
// stl
#include <cstdlib>
#include <cassert>
#define _USE_MATH_DEFINES
#include <cmath>
#include <cstdint>
#include <iostream>
#include <iomanip>