16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 14:49:19 +02:00

android preparations, day 1

This commit is contained in:
milek7
2018-03-27 20:59:12 +02:00
parent bc2184966f
commit b262ab0fe7
3 changed files with 9 additions and 3 deletions

View File

@@ -12,7 +12,6 @@ http://mozilla.org/MPL/2.0/.
#include <istream>
#include "winheaders.h"
#include <string>
#include "GL/glew.h"
#include "ResourceManager.h"
struct opengl_texture {

View File

@@ -15,7 +15,6 @@ http://mozilla.org/MPL/2.0/.
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
#include "GL/glew.h"
#ifdef _WIN32
#include "GL/wglew.h"
#endif

View File

@@ -54,7 +54,6 @@
#include <tuple>
#include <cctype>
#include <locale>
#include <codecvt>
#include <iterator>
#include <random>
#include <algorithm>
@@ -75,13 +74,22 @@
#define GLFW_DLL
#endif // _windows
#endif // build_static
#ifndef __ANDROID__
#include "GL/glew.h"
#else
#include <GL/gl.h>
#include <GL/glu.h>
#endif
#ifdef _WIN32
#include "GL/wglew.h"
#endif
#define GLFW_INCLUDE_GLU
#ifndef __ANDROID__
#include <GLFW/glfw3.h>
#endif
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/matrix_access.hpp>