benkyd/tinyobjloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial support of linux for viewer example.

Browse Source
This commit is contained in:
Syoyo Fujita
2016-04-19 20:34:51 +09:00
parent 28fc3523d4
commit 7399aedfdd
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/viewer/Makefile
View File

@@ -1,6 +1,12 @@
GLFW_INC=-I/usr/local/include GLFW_INC=-I/usr/local/include
GLFW_LIBS=-L/usr/local/lib -lglfw3 -lglew
GL_LIBS=-framework OpenGL # OSX
#GLFW_LIBS=-L/usr/local/lib -lglfw3 -lGLEW
#GL_LIBS=-framework OpenGL
# Linux
GLFW_LIBS=-L/usr/local/lib -lglfw3 -lGLEW
GL_LIBS=-lGL -lGLU -lX11 -lXrandr -lXi -lXxf86vm -lXcursor -lXinerama -ldl -pthread
CXX_FLAGS=-Wno-deprecated-declarations CXX_FLAGS=-Wno-deprecated-declarations

2
examples/viewer/viewer.cc
View File

@@ -4,6 +4,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <cstdio> #include <cstdio>
#include <cstdlib>
#include <iostream> #include <iostream>
#include <limits> #include <limits>
#include <cmath> #include <cmath>
@@ -345,6 +346,7 @@ int main(int argc, char **argv)
} }
glfwMakeContextCurrent(window); glfwMakeContextCurrent(window);
glfwSwapInterval(1);
// Callback // Callback
glfwSetWindowSizeCallback(window, reshapeFunc); glfwSetWindowSizeCallback(window, reshapeFunc);