summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2009-02-14 01:05:13 +0100
committerJakob Bornecrantz <jakob@vmware.com>2009-02-14 07:04:01 +0100
commit96c773c77bf50140e7380d1358fd4528241719e8 (patch)
tree1e449d898ec54fbd3bde63c0b056abb41e5430ec /progs
parent0a323fe09b0b12fceb9695a8b0acbf232310d38b (diff)
progs: Make fp-tri use glew and add scons target
Diffstat (limited to 'progs')
-rw-r--r--progs/SConscript1
-rwxr-xr-xprogs/fp/Makefile2
-rw-r--r--progs/fp/SConscript13
-rw-r--r--progs/fp/fp-tri.c16
4 files changed, 28 insertions, 4 deletions
diff --git a/progs/SConscript b/progs/SConscript
index 6484c761fc5..544ea647504 100644
--- a/progs/SConscript
+++ b/progs/SConscript
@@ -5,4 +5,5 @@ SConscript([
'samples/SConscript',
'trivial/SConscript',
'vp/SConscript',
+ 'fp/SConscript',
])
diff --git a/progs/fp/Makefile b/progs/fp/Makefile
index ef6644cce27..681928cf260 100755
--- a/progs/fp/Makefile
+++ b/progs/fp/Makefile
@@ -8,7 +8,7 @@ TOP = ../..
include $(TOP)/configs/current
-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
SOURCES = \
tri-tex.c \
diff --git a/progs/fp/SConscript b/progs/fp/SConscript
new file mode 100644
index 00000000000..e31fa320238
--- /dev/null
+++ b/progs/fp/SConscript
@@ -0,0 +1,13 @@
+Import('env')
+
+if not env['GLUT']:
+ Return()
+
+env = env.Clone()
+
+env.Prepend(LIBS = ['$GLUT_LIB'])
+
+env.Program(
+ target = 'fp-tri',
+ source = ['fp-tri.c'],
+ )
diff --git a/progs/fp/fp-tri.c b/progs/fp/fp-tri.c
index 843f897871b..b695901bcdd 100644
--- a/progs/fp/fp-tri.c
+++ b/progs/fp/fp-tri.c
@@ -2,10 +2,14 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#define GL_GLEXT_PROTOTYPES
-#include <GL/glut.h>
+
+#ifndef WIN32
#include <unistd.h>
#include <signal.h>
+#endif
+
+#include <GL/glew.h>
+#include <GL/glut.h>
unsigned show_fps = 0;
unsigned int frame_cnt = 0;
@@ -15,11 +19,14 @@ static const char *filename = NULL;
static void usage(char *name)
{
fprintf(stderr, "usage: %s [ options ] shader_filename\n", name);
+#ifndef WIN32
fprintf(stderr, "\n" );
fprintf(stderr, "options:\n");
fprintf(stderr, " -fps show frames per second\n");
+#endif
}
+#ifndef WIN32
void alarmhandler (int sig)
{
if (sig == SIGALRM) {
@@ -31,6 +38,7 @@ void alarmhandler (int sig)
signal(SIGALRM, alarmhandler);
alarm(5);
}
+#endif
static void args(int argc, char *argv[])
{
@@ -142,7 +150,6 @@ static void Display(void)
glEnd();
glFlush();
-
if (show_fps) {
++frame_cnt;
glutPostRedisplay();
@@ -158,14 +165,17 @@ int main(int argc, char **argv)
glutInitDisplayMode(GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH);
args(argc, argv);
glutCreateWindow(filename);
+ glewInit();
glutReshapeFunc(Reshape);
glutKeyboardFunc(Key);
glutDisplayFunc(Display);
Init();
+#ifndef WIN32
if (show_fps) {
signal(SIGALRM, alarmhandler);
alarm(5);
}
+#endif
glutMainLoop();
return 0;
}