From 9d0fe9414f3e38e9439c5ce8a72a3dff1a984314 Mon Sep 17 00:00:00 2001
From: fourdan
Date: Wed, 31 May 2006 13:02:34 +0000
Subject: Wrong path in platform test.

---
 Makefile | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7817c6f..118ace9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,19 +4,19 @@
 os=$(shell uname -s)
 
 ifeq ($(os),Darwin)
-IVY_PATH := $(HOME)/src-ext/ivy-c-3.6/src
-CPPFLAGS = -MMD  -I$(IVY_PATH)
-DSO_EXT = .dylib
-LD = g++ -dynamiclib -single_module
-LDFLAGS = -L$(IVY_PATH) -L/sw/lib -framework OpenGL -framework AGL -framework Carbon
+    IVY_PATH := $(HOME)/src-ext/ivy-c-3.6/src
+    CPPFLAGS = -MMD  -I$(IVY_PATH)
+    DSO_EXT = .dylib
+    LD = g++ -dynamiclib -single_module
+    LDFLAGS = -L$(IVY_PATH) -L/sw/lib -framework OpenGL -framework AGL -framework Carbon
 else
-CPPFLAGS = -MMD -I/usr/X11R6/include
-DSO_EXT = .so
-LD = g++ -shared -fPIC
-#PREFIX=/usr/local
-ifndef PREFIX
-PREFIX=/usr
-endif
+    CPPFLAGS = -MMD -I/usr/X11R6/include
+    DSO_EXT = .so
+    LD = g++ -shared -fPIC
+    #PREFIX=/usr/local
+    ifndef PREFIX
+        PREFIX=/usr
+    endif
 endif
 
 
@@ -47,9 +47,9 @@ LIBIVY_GLFW_DEPLIBS = -lglfw  -livy -lX11  -lXext -lXxf86vm -lGL -lpthread
 PERHAPS64= `uname -m | perl -ne "print /64/ ? '64' : '';"`
 
 ifeq ($(PERHAPS64), '64')
-	LIB=lib
+    LIB=lib64
 else
-        LIB=lib64
+    LIB=lib
 endif
 
 XTLIB = -L/usr/X11R6/$(LIB)/
@@ -59,9 +59,9 @@ XTLIB = -L/usr/X11R6/$(LIB)/
 
 
 ifdef DEBUG
-CC= g++ -fPIC -g -Wall -pg $(CPPFLAGS)
+    CC= g++ -fPIC -g -Wall -pg $(CPPFLAGS)
 else
-CC= g++ -fPIC -O2  -Wall $(CPPFLAGS)
+    CC= g++ -fPIC -O2  -Wall $(CPPFLAGS)
 endif
 
 default: $(LIBIVY_STATIC) $(LIBIVY_GLFW_STATIC) $(LIBIVY_SHARED) $(LIBIVY_GLFW_SHARED)
@@ -97,7 +97,7 @@ install:
 LLDLIBS = -L $(XTLIB) -Wl,-rpath,$(XTLIB)  -L. -Wl,-rpath,. -L$(IVY_PATH)/src
 
 testIvy : testIvy.cxx
-	g++  -g  $(XTLIBS) $(LLDLIBS)  -o $@  testIvy.cxx  -lIvy -lxtivy -lXt -lX11
+	g++  -g  $(XTLIB) $(LLDLIBS)  -o $@  testIvy.cxx  -lIvy -lxtivy -lXt -lX11
 
 
 distclean clean : 
-- 
cgit v1.1