Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Luis Penaranda
panoramic
Commits
bd95f302
Commit
bd95f302
authored
Aug 14, 2013
by
Luis Penaranda
Browse files
compile again on windows
parent
2978dddc
Changes
2
Hide whitespace changes
Inline
Side-by-side
glincludes.h
View file @
bd95f302
...
...
@@ -3,7 +3,12 @@
// TODO: test on mac
#define GL_GLEXT_PROTOTYPES 1
// OpenGL>=2.1 not found, try GLEW
#include
<GL/glew.h>
#if (!defined GLEW_VERSION_2_1) || (!defined GL_VERSION_2_1)
#error OpenGL 2.1 or GLEW is required
#endif
#ifdef __APPLE__
#include
<OpenGL/gl.h>
#include
<OpenGL/glu.h>
...
...
@@ -17,15 +22,4 @@
//#include <GL/glext.h>
#endif
// GLew might not be needed on mac, or if a recent version of OpenGL is present
//#ifndef __APPLE__
#ifndef GL_VERSION_2_1
// OpenGL>=2.1 not found, try GLEW
#include
<GL/glew.h>
#ifndef GLEW_VERSION_2_1
#error OpenGL 2.1 or GLEW is required
#endif
#endif
//#endif
#endif // GLINCLUDES_H
pano_interface_1.pro
View file @
bd95f302
...
...
@@ -56,7 +56,7 @@ LIBS += -L$${PFROOT}/freeglut/lib
LIBS
+=
-
L
$$
{
PFROOT
}
/
GnuWin32
/
lib
LIBS
+=
-
L
$$
{
PFROOT
}
/
GnuWin32
/
bin
LIBS
+=
-
L
$$
{
PFROOT
}
/
glew
-
1.9
.
0
/
lib
LIBS
+=
-
lglew32s
-
lfreeglut
-
lglu32
-
lopengl32
-
ljpeg
-
lpng
#
-
llibnetpbm10
LIBS
+=
-
lglew32s
-
lfreeglut
-
lglu32
-
lopengl32
-
ljpeg
-
l
lib
png
-
llibnetpbm10
}
TARGET
=
pano_interface_1
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment