diff options
| author | fourdan | 2006-05-31 13:02:34 +0000 |
|---|---|---|
| committer | fourdan | 2006-05-31 13:02:34 +0000 |
| commit | 9d0fe9414f3e38e9439c5ce8a72a3dff1a984314 (patch) | |
| tree | 6412cb5cd7beec7c0be2a84dfb014a3afea91852 | |
| parent | 381dd924e602689904a1ea54b5e4439c905ed76f (diff) | |
| download | ivy-cplusplus-9d0fe9414f3e38e9439c5ce8a72a3dff1a984314.zip ivy-cplusplus-9d0fe9414f3e38e9439c5ce8a72a3dff1a984314.tar.gz ivy-cplusplus-9d0fe9414f3e38e9439c5ce8a72a3dff1a984314.tar.bz2 ivy-cplusplus-9d0fe9414f3e38e9439c5ce8a72a3dff1a984314.tar.xz | |
Wrong path in platform test.
| -rw-r--r-- | Makefile | 34 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 23 insertions, 17 deletions
@@ -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 : diff --git a/debian/changelog b/debian/changelog index 505abeb..ef47acd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ivy-cpp (1.0-3) unstable; urgency=low + + * Build for x86_64/Mandriva + + -- Olivier Fourdan <fourdan@lerak.tls.cena.fr> Wed, 31 May 2006 14:56:02 +0200 + ivy-cpp (1.0-2) unstable; urgency=low * Include deps patch from Yannick. |