summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorKarl Schultz <kschultz@freedesktop.org>2002-01-16 00:57:54 +0000
committerKarl Schultz <kschultz@freedesktop.org>2002-01-16 00:57:54 +0000
commit3d587f643229a29f615d5047e47e4a3805930588 (patch)
tree06f8514318017809ced068c4ebbb205b589a31f7 /progs
parent164ce1220232e03660633e16681737782c73059e (diff)
Samples working for Windows (Robert Bergkvist)
Diffstat (limited to 'progs')
-rw-r--r--progs/samples/Makefile.win42
-rw-r--r--progs/samples/blendeq.c4
-rw-r--r--progs/samples/blendxor.c4
3 files changed, 50 insertions, 0 deletions
diff --git a/progs/samples/Makefile.win b/progs/samples/Makefile.win
new file mode 100644
index 0000000000..fc277726a0
--- /dev/null
+++ b/progs/samples/Makefile.win
@@ -0,0 +1,42 @@
+# $Id: Makefile.win,v 1.1 2002/01/16 00:57:54 kschultz Exp $
+
+# Mesa 3-D graphics library
+# Version: 3.5
+# Copyright (C) 1995-2001 Brian Paul
+
+# Makefile for GLUT-based demo programs for Windows
+
+!include <win32.mak>
+
+##### MACROS #####
+
+TOP = ..
+INCDIR = ..\include
+LIBDIR = ..\lib
+
+PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
+ font line logo nurb oglinfo olympic overlay point prim quad select \
+ shape sphere star stencil stretch texture tri wave
+
+SRCS = \
+ accum.c \
+ bitmap1.c \
+ bitmap2.c \
+ blendeq.c \
+ blendxor.c \
+ copy.c \
+ cursor.c depth.c eval.c fog.c \
+ font.c line.c logo.c nurb.c olympic.c overlay.c point.c prim.c quad.c select.c \
+ shape.c sphere.c star.c stencil.c stretch.c texture.c tri.c wave.c
+
+!include "../mesawin32.mak"
+
+##### TARGETS #####
+
+clean::
+
+clobber::
+
+$(EXES) : $*.obj
+ @echo $@
+ $(link) -out:$@ $* /LIBPATH:$(LIBDIR) $(LIBS)
diff --git a/progs/samples/blendeq.c b/progs/samples/blendeq.c
index 7be52073ab..12107f5a6d 100644
--- a/progs/samples/blendeq.c
+++ b/progs/samples/blendeq.c
@@ -11,6 +11,10 @@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#ifdef _WIN32
+#include <windows.h>
+#endif
+#define GL_GLEXT_LEGACY
#include <GL/glut.h>
diff --git a/progs/samples/blendxor.c b/progs/samples/blendxor.c
index a46920d234..7d3285d049 100644
--- a/progs/samples/blendxor.c
+++ b/progs/samples/blendxor.c
@@ -10,6 +10,10 @@
#include <unistd.h>
#endif
#include <stdlib.h>
+#ifdef _WIN32
+#include <windows.h>
+#endif
+#define GL_GLEXT_LEGACY
#include <GL/glut.h>