Samples working for Windows (Robert Bergkvist)

diff --git a/progs/samples/Makefile.win b/progs/samples/Makefile.win
new file mode 100644 (file)
index 0000000..fc27772
--- /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 7be52073ab03500ec142ba51cb3f32e33e1b1f06..12107f5a6d5d624a636e671428f2dcd0eab4e92c 100644 (file)
--- 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 a46920d234564c0e3a96b194f258531c797978ec..7d3285d049fad39da76c38a577c7ef5fa218b6e9 100644 (file)
--- 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>