summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorNicolas "Pixel" Noble <pixel@nobis-crew.org>2010-08-16 19:29:02 +0200
committerNicolas "Pixel" Noble <pixel@nobis-crew.org>2010-08-16 20:13:17 +0200
commitcd0c7dd3505591a04c62e2914dd38cd638a4df69 (patch)
tree57ba371508615c1c1bb44fa2f8d765c996b66cbd /Makefile
parent4cc6214a4c05086b4a6d75422c7505aa098f51cc (diff)
Bumping oracle instant client to 11.2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 0f4086d..73fee18 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ INCLUDES = \
-I ../tinyxml \
-I /usr/include/mysql \
-I /usr/include/FTGL -I /usr/include/freetype2 \
--I /usr/include/oracle/11.1.0.1/client/ \
+-I /usr/include/oracle/11.2.0.1.0/client/ \
-I ../PSX-Bundle/includes \
-I../lua-modules-iup/im/include -I../lua-modules-iup/cd/include -I../lua-modules-iup/iup/include \
@@ -83,7 +83,7 @@ CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
BASIC_LDFLAGS += $(ARCH_FLAGS) $(LIBS)
-LDFLAGS += $(BASIC_LDFLAGS) $(LDFLAGS_READLINE) -L/usr/lib/oracle/11.1.0.1/client/lib $(LUAJIT)
+LDFLAGS += $(BASIC_LDFLAGS) $(LDFLAGS_READLINE) -L/usr/lib/oracle/11.2.0.1.0/client/lib $(LUAJIT)
vpath %.c ../Baltisot/lib:../Baltisot/src:../mogltk/lib:../tinyxml:../lua-modules/src:src
@@ -226,7 +226,7 @@ lua-interface: lua-interface-mesa.$(SHARED_EXT) lua-interface-main.o
$(LD) -o $@ -L. lua-interface.$(SHARED_EXT) lua-interface-main.o
lua-interface-dbg: $(ALL_OBJECTS) $(DEBUG_OBJECTS)
- $(LD) -o lua-interface-dbg $(ALL_OBJECTS) $(DEBUG_OBJECTS) $(LDFLAGS) $(LDFLAGS_MESA) -locci -lclntsh ../lua-modules-iup/luaiup.a -lXm -lXpm -lXmu -lXt -lXext -lX11 -lm
+ $(LD) -o lua-interface-dbg $(ALL_OBJECTS) $(DEBUG_OBJECTS) $(LDFLAGS) $(LDFLAGS_MESA) -locci -lclntsh -lnnz11 ../lua-modules-iup/luaiup.a -lXm -lXpm -lXmu -lXt -lXext -lX11 -lm
clean:
rm -f lua-interface-mesa lua-interface-gl *.o *.dep *.so *.dylib