Skip to content

Commit

Permalink
tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
jwerle committed Feb 16, 2016
1 parent f9f5524 commit d7795d5
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 0 deletions.
22 changes: 22 additions & 0 deletions include/glisy/gl.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,28 @@
#define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED
#endif

#if __APPLE__
#include "TargetConditionals.h"
#if TARGET_OS_IPHONE
#include <OpenGLES/ES2/gl.h>
#include <OpenGLES/ES2/glext.h>
#elif TARGET_IPHONE_SIMULATOR
#include <OpenGLES/ES2/gl.h>
#include <OpenGLES/ES2/glext.h>
#elif TARGET_OS_MAC
#include <OpenGL/OpenGL.h>
#include <OpenGL/gl3.h>
#else
#error Unsupported Apple platform
#endif
#elif __ANDROID__ || GLISY_USE_GLES2
#define GL_GLEXT_PROTOTYPES
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#else
#define GL_GLEXT_PROTOTYPES
#include <GL/gl.h>
#include <GL/glext.h>
#endif

#endif
2 changes: 2 additions & 0 deletions include/glisy/glisy.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
extern "C" {
#endif

#define GLISY_EXPORT __attribute__((visibility("default")))

/**
* Glisy API.
*/
Expand Down
5 changes: 5 additions & 0 deletions src/geometry.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@ glisy_geometry_attr(glisy_geometry *geometry,
attr->name = name;
geometry->dirty = GL_TRUE;
upsert_attr(geometry, attr);
//printf("%s \n", name);
//for (int i = 0; i < 9; i++) {
//printf("%f ", attr->buffer.data[i]);
//}
//printf("\n");
}

void
Expand Down

0 comments on commit d7795d5

Please sign in to comment.