stereoview

changeset 3:993fdfd41a04 tip

find changesets by author, revision, files, or words in the commit message
merged macosx makefile fixes
author John Tsiombikas <nuclear@member.fsf.org>
date Fri, 04 Mar 2011 15:51:37 +0200
parents 30c7a5df0523 59fd3f6948fe
children
files
diffstat 1 files changed, 9 insertions(+), 2 deletions(-) [+]
line diff
     1.1 --- a/Makefile	Fri Mar 04 15:51:03 2011 +0200
     1.2 +++ b/Makefile	Fri Mar 04 15:51:37 2011 +0200
     1.3 @@ -3,13 +3,20 @@
     1.4  bin = stereoview
     1.5  
     1.6  CXX = g++
     1.7 -CXXFLAGS = -pedantic -Wall -g `pkg-config --cflags henge2`
     1.8 -LDFLAGS = `pkg-config --libs henge2` $(libgl)
     1.9 +CXXFLAGS = -pedantic -Wall -g $(inc) `pkg-config --cflags henge2`
    1.10 +LDFLAGS = $(lib) `pkg-config --libs henge2` $(libgl)
    1.11  
    1.12  ifneq ($(shell uname -s), Darwin)
    1.13  	libgl = -lGL -lGLU -lglut
    1.14 +
    1.15 +	ifeq ($(shell uname -s), IRIX)
    1.16 +		inc = -I/usr/nekoware/include -I/usr/freeware/include
    1.17 +		lib = -L/usr/nekoware/lib -I/usr/freeware/lib
    1.18 +	endif
    1.19  else
    1.20  	libgl = -framework OpenGL -framework GLUT
    1.21 +	inc = -I/opt/local/include -I/sw/local/include
    1.22 +	lib = -L/opt/local/lib -L/sw/local/lib
    1.23  endif
    1.24  
    1.25  $(bin): $(obj)