summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 8 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 2316a01..281f72f 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,9 @@ ifeq ($(os),Darwin)
LD = g++ -dynamiclib -single_module
LDFLAGS = -L$(IVY_PATH) -L/sw/lib -framework OpenGL -framework AGL -framework Carbon
else
+ PERHAPS64 := $(shell uname --machine | perl -ne "print /64/ ? '64' : '';")
+ LIB:= lib$(PERHAPS64)
+ XTLIB = -L/usr/X11R6/$(LIB)
CPPFLAGS = -MMD -I/usr/X11R6/include
DSO_EXT = .so
LD = g++ -shared -fPIC
@@ -17,6 +20,7 @@ else
ifndef PREFIX
PREFIX=/usr
endif
+ LDFLAGS = -L$(PREFIX)/$(LIB) $(XTLIB)
endif
@@ -44,9 +48,6 @@ LIBIVY_DEPLIBS = -livy
LIBIVY_GLFW_SHARED = $(LIBIVY_GLFW)$(DSO_EXT)
LIBIVY_GLFW_DEPLIBS = -lglfw -livy -lX11 -lXext -lXxf86vm -lGL -lpthread
-PERHAPS64 := $(shell uname --machine | perl -ne "print /64/ ? '64' : '';")
-LIB:= lib$(PERHAPS64)
-XTLIB = -L/usr/X11R6/$(LIB)/
#a mettre dans les makefiles generant les executables
#LLDLIBS= -rpath. -L. -lTextureLabel -lInventor -lInventorXt -lXm -lXt -lttf -lGL -lGLU -lm
@@ -83,10 +84,10 @@ install:
install -m 0644 Ivy*.h $(DESTDIR)$(PREFIX)/include/Ivy
# libs
mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)
- install -m 0644 $(LIBIVY_STATIC) $(DESTDIR)$(PREFIX)/$(LIB)
- install -m 0644 $(LIBIVY_GLFW_STATIC) $(DESTDIR)$(PREFIX)/$(LIB)
- install -m 0644 $(LIBIVY_SHARED) $(DESTDIR)$(PREFIX)/$(LIB)
- install -m 0644 $(LIBIVY_GLFW_SHARED) $(DESTDIR)$(PREFIX)/$(LIB)
+ install -m 0644 $(LIBIVY_STATIC) $(DESTDIR)$(PREFIX)/$(LIB)/$(DEBUG)
+ install -m 0644 $(LIBIVY_GLFW_STATIC) $(DESTDIR)$(PREFIX)/$(LIB)/$(DEBUG)
+ install -m 0644 $(LIBIVY_SHARED) $(DESTDIR)$(PREFIX)/$(LIB)/$(DEBUG)
+ install -m 0644 $(LIBIVY_GLFW_SHARED) $(DESTDIR)$(PREFIX)/$(LIB)/$(DEBUG)
LLDLIBS = -L $(XTLIB) -Wl,-rpath,$(XTLIB) -L. -Wl,-rpath,. -L$(IVY_PATH)/src