eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 00:49:19 +02:00
Code Issues 121 Wiki Activity

vs2017

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -71,4 +71,5 @@ ref/
*.aps *.aps
builds/build_* builds/build_*
builds/*.zip builds/*.zip
builds/deps_*

2
appveyor.yml
View File

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

2
builds/cmake_win32.bat
View File

@@ -2,7 +2,7 @@ if not exist deps_win call %~dp0download_windeps.bat
set DEPS_DIR="%cd%/deps_win" set DEPS_DIR="%cd%/deps_win"
if not exist build_win32 mkdir build_win32 if not exist build_win32 mkdir build_win32
pushd build_win32 pushd build_win32
cmake ../.. -T v140_xp ^ cmake ../.. -T v141_xp ^
-DGLEW_INCLUDE_DIR=%DEPS_DIR%/glew-2.0.0/include ^ -DGLEW_INCLUDE_DIR=%DEPS_DIR%/glew-2.0.0/include ^
-DGLEW_LIBRARY=%DEPS_DIR%/glew-2.0.0/lib/Release/Win32/glew32.lib ^ -DGLEW_LIBRARY=%DEPS_DIR%/glew-2.0.0/lib/Release/Win32/glew32.lib ^
-DGLFW3_ROOT_PATH=%DEPS_DIR%/glfw-3.2.1.bin.WIN32 ^ -DGLFW3_ROOT_PATH=%DEPS_DIR%/glfw-3.2.1.bin.WIN32 ^

4
stdafx.h
View File

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