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

android preparations, day 1

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

1
Texture.h
View File

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

1
openglmatrixstack.h
View File

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

10
stdafx.h
View File

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