diff -Nrup tclogl.orig/Makefile.gnu tclogl/Makefile.gnu --- tclogl.orig/Makefile.gnu Mon May 23 22:17:48 2005 +++ tclogl/Makefile.gnu Thu Oct 6 11:29:20 2005 @@ -58,6 +58,7 @@ clean: -$(RM) $(WRAPOBJS) -$(RM) $(UTILOBJS) -$(RM) $(WRAPSRCS) + -$(RM) $(PKG_LIB) -$(RM) *.lib -$(RM) *.exp diff -Nrup tclogl.orig/config_Darwin tclogl/config_Darwin --- tclogl.orig/config_Darwin Thu Jan 1 01:00:00 1970 +++ tclogl/config_Darwin Wed Oct 5 10:13:19 2005 @@ -0,0 +1,60 @@ +# Copyright (c) Paul Obermeier 2005 + +# Set the following variable to 1, if compiling with stubs. +WITH_STUBS = 1 + +# Set the following variable to 1, if compiling with debugging information. +WITH_DEBUG = 1 + +INSTDIR = /Library/Tcl +TCLDIR = /Library/Frameworks/Tcl.framework +TKDIR = /Library/Frameworks/Tk.framework + +TCLMAJOR = 8 +TCLMINOR = 4 + +INSTBIN = $(INSTDIR)/bin +INSTLIB = $(INSTDIR) +INSTINC = $(INSTDIR)/include + +ifdef WITH_DEBUG +OPT = -g -Wall -Wno-unused +else +OPT = -Os -Wall -Wno-unused -Wuninitialized -DNDEBUG +endif + +PPSTUBS = -DUSE_TCL_STUBS -DUSE_TK_STUBS +PPNOSTUBS = -D$(MACHINE) -I/System/Library/Frameworks/OpenGL.framework/Headers + +CC = gcc -c +LDOUT = -o +SHLIB_LD = gcc -dynamiclib -Wl,-single_module +SHLIB_CFLAGS = -fno-common + +OBJEXT = .o +LIBEXT = .a +SHLIBEXT = .dylib +BINEXT = +DSEP = / + +GLLIBS = -framework OpenGL + +SYSLIBS = + +TCLVERSION = $(TCLMAJOR).$(TCLMINOR) +TCLSTUBLIBS = $(TKDIR)/libtkstub$(TCLVERSION)$(LIBEXT) $(TCLDIR)/libtclstub$(TCLVERSION)$(LIBEXT) +TCLSTDLIBS = $(TKDIR)/Tk $(TCLDIR)/Tcl + +RM = rm -f +CP = cp -p +MKDIR = mkdir -p + +INCL = -I. -I$(TCLDIR)/Headers -I$(TKDIR)/Headers + +ifdef WITH_STUBS +TCLLIBS = $(TCLSTUBLIBS) +PPDEFS = $(PPNOSTUBS) $(PPSTUBS) +else +TCLLIBS = $(TCLSTDLIBS) +PPDEFS = $(PPNOSTUBS) +endif diff -Nrup tclogl.orig/gl.i tclogl/gl.i --- tclogl.orig/gl.i Mon May 23 22:18:58 2005 +++ tclogl/gl.i Thu Oct 6 11:30:03 2005 @@ -9,7 +9,11 @@ #include #include #endif +#ifdef Darwin +#include +#else #include +#endif %} %typemap(in) const double * (double *tmp) { @@ -134,5 +138,9 @@ // Maybe this could be made more elegant with typemaps ?? const char *glGetString (GLenum name); +#ifdef Darwin +%include +#else %include +#endif diff -Nrup tclogl.orig/glm.c tclogl/glm.c --- tclogl.orig/glm.c Wed May 11 13:28:00 2005 +++ tclogl/glm.c Wed Oct 5 10:06:20 2005 @@ -25,7 +25,11 @@ #include #endif +#ifdef Darwin +#include +#else #include +#endif #include "glm.h" diff -Nrup tclogl.orig/glu.i tclogl/glu.i --- tclogl.orig/glu.i Mon May 23 22:19:06 2005 +++ tclogl/glu.i Wed Oct 5 09:57:49 2005 @@ -9,7 +9,11 @@ #include #include #endif +#ifdef Darwin +#include +#else #include +#endif %} %typemap(in) double * (double *tmp) { @@ -82,4 +86,8 @@ GLint gluUnProject ( #endif +#ifdef Darwin +%include +#else %include +#endif diff -Nrup tclogl.orig/shapes.c tclogl/shapes.c --- tclogl.orig/shapes.c Fri May 6 23:19:20 2005 +++ tclogl/shapes.c Wed Oct 5 10:05:06 2005 @@ -52,7 +52,11 @@ OpenGL(TM) is a trademark of Silicon Gra #endif #include +#ifdef Darwin +#include +#else #include +#endif #include "shapes.h" diff -Nrup tclogl.orig/teapot.c tclogl/teapot.c --- tclogl.orig/teapot.c Thu Apr 7 09:57:10 2005 +++ tclogl/teapot.c Wed Oct 5 10:05:48 2005 @@ -51,7 +51,11 @@ OpenGL(TM) is a trademark of Silicon Gra #include #endif +#ifdef Darwin +#include +#else #include +#endif #include "shapes.h"