From 538414ea2e5e7e9edcf86b4431c8e194ebd405df Mon Sep 17 00:00:00 2001 From: Pixel Date: Sat, 16 May 2009 01:05:42 -0700 Subject: Having oracle being optionnal. --- Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ffc0821..106e45b 100644 --- a/Makefile +++ b/Makefile @@ -19,8 +19,9 @@ CC = gcc CXX = g++ STRIP = strip +HAS_ORACLE=$(shell [ -d /usr/local/instantclient ] && echo true || echo false ]) + INCLUDES = \ --I ../Mesa-7.2/include \ -I../mogltk/include \ -I../Baltisot/include \ -I../Baltisot/lib/zlib/include \ @@ -128,7 +129,6 @@ dds.c WHOLE_SOURCES = \ $(CONFIGFILES_SOURCES) \ $(XML_SOURCES) \ -$(OCCI_SOURCES) \ $(HANDLE_SOURCES) \ $(HTTP_SOURCES) \ $(REGEX_SOURCES) \ @@ -139,10 +139,13 @@ $(GL_SOURCES) \ $(FTGL_SOURCES) \ $(OSMESA_SOURCES) \ +ifeq ($(HAVE_ORACLE),true) +WHOLE_SOURCES += $(OCCI_SOURCES) +endif + MODULES_LIST = \ luaconfigfiles.$(SHARED_EXT) \ luaxml.$(SHARED_EXT) \ -luaocci.$(SHARED_EXT) \ luahandle.$(SHARED_EXT) \ luahttp.$(SHARED_EXT) \ luaregex.$(SHARED_EXT) \ @@ -153,6 +156,10 @@ luaftgl.$(SHARED_EXT) \ lualibs.$(SHARED_EXT) \ luaosmesa.$(SHARED_EXT) \ +ifeq ($(HAVE_ORACLE),true) +MODULES_LIST += luaocci.$(SHARED_EXT) +endif + ALL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(WHOLE_SOURCES) $(LUA_LIB)))) ALL_DEPS = $(addsuffix .dep, $(notdir $(basename $(WHOLE_SOURCES)))) -- cgit v1.2.3 From 8355fcc5e6ecfc106ade0f4fdeaa97db9fa22f43 Mon Sep 17 00:00:00 2001 From: Pixel Date: Sat, 16 May 2009 08:22:14 +0000 Subject: Adding ImageMagick path. --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 106e45b..f12451b 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,8 @@ STRIP = strip HAS_ORACLE=$(shell [ -d /usr/local/instantclient ] && echo true || echo false ]) INCLUDES = \ +-I../Mesa-7.4.2/include \ +-I/usr/include/ImageMagick \ -I../mogltk/include \ -I../Baltisot/include \ -I../Baltisot/lib/zlib/include \ -- cgit v1.2.3