Fixing the win32 backport.

1 files changed, 10 insertions, 8 deletions

diff --git a/Makefile.mingw32 b/Makefile.mingw32
index 26d4018..3195896 100644
--- a/Makefile.mingw32
+++ b/Makefile.mingw32
@@ -4,14 +4,15 @@ LD = i586-mingw32msvc-g++
 STRIP = i586-mingw32msvc-strip
 
 INCLUDES = \
--I ../Mesa-7.0.2/include \
+-I ../Mesa-7.0.3-win32/include \
 -I../mogltk/include \
 -I../Baltisot/include \
 -I../Baltisot/lib/zlib/include \
 -I../Baltisot/lib/lua/include -I../Baltisot/lib/lua/includes \
 -I ../tinyxml \
 -I /usr/include/mysql \
--I /usr/include/FTGL -I /usr/include/freetype2 \
+-I ../ftgl-win32/include -I ../freetype-win32/include/freetype2 \
+-I ../Mesa-win32/include \
 -I /usr/include/oracle/11.1.0.1/client/ \
 -I ../Baltisot/MSVC/regex \
 
@@ -87,18 +88,19 @@ tasklib.lua \
 ajaxlib.lua \
 htmllib.lua \
 xmllib.lua \
+httplib.lua \
 
 GL_SOURCES = \
 plugin-luagl.cc \
 LuaGL.cc \
 
-GL_LIBS = ../Mesa-7.0.2/lib/libGLU.a ../Mesa-7.0.2/lib/libOSMesa.a
+GL_LIBS = ../Mesa-7.0.3-win32/lib/libGLU.a ../Mesa-7.0.3-win32/lib/libOSMesa.a
 
 FTGL_SOURCES = \
 plugin-luaftgl.cc \
 LuaFTGL.cc \
 
-FTGL_LIBS = -lfreetype -lftgl
+FTGL_LIBS = ../ftgl-win32/lib/ftgl-mingw32.a ../freetype-win32/lib/libfreetype.dll.a
 
 WHOLE_SOURCES = \
 $(CONFIGFILES_SOURCES) \
@@ -108,12 +110,12 @@ $(TASK_SOURCES) \
 $(HANDLE_SOURCES) \
 $(HTTP_SOURCES) \
 $(REGEX_SOURCES) \
+$(GL_SOURCES) \
+$(FTGL_SOURCES) \
 
 
 #$(OCCI_SOURCES) \
 #$(SQL_SOURCES) \
-#$(GL_SOURCES) \
-#$(FTGL_SOURCES) \
 
 MODULES_LIST = \
 luaconfigfiles.dll \
@@ -123,12 +125,12 @@ luatask.dll \
 luahandle.dll \
 luahttp.dll \
 luaregex.dll \
+luagl.dll \
+luaftgl.dll \
 
 
 #luaocci.dll \
 #luasql.dll \
-#luagl.dll \
-#luaftgl.dll \
 
 ALL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(WHOLE_SOURCES) $(LUA_LIB))))
 ALL_DEPS = $(addsuffix .dep, $(notdir $(basename $(WHOLE_SOURCES))))