summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.mingw3216
1 files changed, 6 insertions, 10 deletions
diff --git a/Makefile.mingw32 b/Makefile.mingw32
index 9086e56..70210b8 100644
--- a/Makefile.mingw32
+++ b/Makefile.mingw32
@@ -34,11 +34,11 @@ INCLUDES = \
-I ../tinyxml \
-I ../mysql-5.0.51b-win32/include \
-I ../ftgl-win32/include -I ../freetype-win32/include/freetype2 \
--I /usr/include/oracle/11.1.0.1/client/ \
-I ../Baltisot/MSVC/regex \
-I ../gnuwin32/include \
-I ../pthreads-w32-2-8-0-release/ \
--I ../gnuwin32/include/ImageMagick
+-I ../gnuwin32/include/ImageMagick \
+-I ../occi-gateway/ \
HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_MALLOC_H -DHAVE_BYTESWAP_H -DUSE_OSMESA -DHAVE_MYSQL
@@ -50,7 +50,7 @@ LDFLAGS += -g -fexceptions -shared ../lua-interface/lua-interface.a -Wl,--export
vpath %.c ../Baltisot/lib:../Baltisot/src:src:../mogltk/lib:../tinyxml
vpath %.cc ../Baltisot/lib:../Baltisot/src:src:../mogltk/lib:../tinyxml
-vpath %.cpp ../Baltisot/lib:../Baltisot/src:src:../mogltk/lib:../tinyxml
+vpath %.cpp ../Baltisot/lib:../Baltisot/src:src:../mogltk/lib:../tinyxml:../occi-gateway
vpath %.lua ../Baltisot/lib:../Baltisot/src
CONFIGFILES_SOURCES = \
@@ -72,8 +72,9 @@ XML_LIBS =
OCCI_SOURCES = \
plugin-luaocci.cc \
LuaOCCI.cc \
+OCCI-mingw32gateway.cpp \
-OCCI_LIBS = -locci -lclntsh
+OCCI_LIBS = ../gnuwin32/lib/OCCI-MSVCgateway.lib
HANDLE_SOURCES = \
plugin-luahandle.cc \
@@ -148,9 +149,6 @@ $(FTGL_SOURCES) \
$(OSMESA_SOURCES) \
$(SQL_SOURCES) \
-
-#$(OCCI_SOURCES) \
-
MODULES_LIST = \
luaconfigfiles.dll \
lualibs.dll \
@@ -163,9 +161,7 @@ luagl.dll \
luaftgl.dll \
luaosmesa.dll \
luasql.dll \
-
-
-#luaocci.dll \
+luaocci.dll \
ALL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(WHOLE_SOURCES) $(LUA_LIB))))
ALL_DEPS = $(addsuffix .dep, $(notdir $(basename $(WHOLE_SOURCES))))