16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 12:49:18 +02:00

pre-merge syncs

This commit is contained in:
tmj-fstate
2018-02-03 17:37:46 +01:00
parent b3e7b88bbc
commit e8bb25454e
20 changed files with 53 additions and 82 deletions

View File

@@ -18,7 +18,7 @@
#endif // _DEBUG
#endif
// operating system
#ifdef _WINDOWS
#ifdef _WIN32
#include "targetver.h"
#define NOMINMAX
#include <windows.h>
@@ -73,12 +73,12 @@
#ifdef EU07_BUILD_STATIC
#define GLEW_STATIC
#else
#ifdef _WINDOWS
#ifdef _WIN32
#define GLFW_DLL
#endif // _windows
#endif // build_static
#include "GL/glew.h"
#ifdef _WINDOWS
#ifdef _WIN32
#include "GL/wglew.h"
#endif
#define GLFW_INCLUDE_GLU