diff options
| author | Bruce Smith <bruce@nanorex.com> | 2008-02-24 05:28:17 +0000 |
|---|---|---|
| committer | Bruce Smith <bruce@nanorex.com> | 2008-02-24 05:28:17 +0000 |
| commit | c7765d7ca76218fa6cf6f80c02979a4d3678f364 (patch) | |
| tree | 9304a6db6c5dacb34948107f9c0b8cdbf55b7bc0 | |
| parent | c89c5cbc5203dbaad0ae21c36b898d17a53052b6 (diff) | |
| download | nanoengineer-c7765d7ca76218fa6cf6f80c02979a4d3678f364.tar.gz nanoengineer-c7765d7ca76218fa6cf6f80c02979a4d3678f364.zip | |
fix Mac OpenGL compile
| -rwxr-xr-x | cad/src/experimental/LearningOpenGL/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/cad/src/experimental/LearningOpenGL/Makefile b/cad/src/experimental/LearningOpenGL/Makefile index 1c62e0e9c..627d50407 100755 --- a/cad/src/experimental/LearningOpenGL/Makefile +++ b/cad/src/experimental/LearningOpenGL/Makefile @@ -1,6 +1,6 @@ -# Makefile for the simulator -# Copyright 2006-2007 Nanorex, Inc. See LICENSE file for details. +# Copyright 2006-2008 Nanorex, Inc. See LICENSE file for details. # $Id$ +# modified from: Makefile for the simulator UNAME := $(shell uname) # dotted python version (2.3, 2.4) @@ -32,20 +32,24 @@ CFLAGS:=$(shell python distutils_compile_options.py compiler_so) ifeq ($(strip $(UNAME)),Darwin) #---------------------------------------- Mac CFLAGS+=-I/System/Library/Frameworks/Python.framework/Versions/$(PYDVER)/lib/python$(PYDVER)/config \ - -I/System/Library/Frameworks/Python.framework/Versions/$(PYDVER)/include/python$(PYDVER)/ + -I/System/Library/Frameworks/Python.framework/Versions/$(PYDVER)/include/python$(PYDVER)/ \ + -DMACOSX -I/System/Library/Frameworks/OpenGL.framework/Headers LDFLAGS=-Wl,-F. -framework Python +## LDFLAGS+=-L/usr/X11R6/lib -lGL +LDFLAGS+=-framework OpenGL +LDFLAGS+=-L/usr/lib -lm LDSHARED=gcc -bundle else #---------------------------------------- Unix PYBASE:=$(shell which python | sed "s%/bin/python%%") CFLAGS+=-I$(PYBASE)/include/python$(PYDVER) LDFLAGS=-L$(PYBASE)/lib/python$(PYDVER)/config -lm -lpython$(PYDVER) +LDFLAGS+=-L/usr/X11R6/lib -lGL +LDFLAGS+=-L/usr/lib -lm LDSHARED=gcc -shared #---------------------------------------- End of Unix endif PYREXC=$(shell python -c "import findpyrex; print findpyrex.find_pyrexc()") -LDFLAGS+=-L/usr/X11R6/lib -lGL -LDFLAGS+=-L/usr/lib -lm CFLAGS+=-fno-strict-aliasing -DNDEBUG -g -Wall -Wmissing-prototypes \ -Wstrict-prototypes -fPIC # These CFLAGS and LDFLAGS are not used by distutils. If asked to |