diff options
| author | pixel <pixel> | 2008-08-06 11:58:06 +0000 |
|---|---|---|
| committer | pixel <pixel> | 2008-08-06 11:58:06 +0000 |
| commit | b7014aad09a7f5653e2931858a1c148a15f21352 (patch) | |
| tree | f5d5b27ca0fa8128deed1ac8a4d3a858f0c25eb7 /Makefile.mingw32 | |
| parent | f3c88af7e5db334fbce6cc4399e6b7e41dc33812 (diff) | |
Adding win32 osmesa / imagemagick support, and cleaning up a bit.
Diffstat (limited to 'Makefile.mingw32')
| -rw-r--r-- | Makefile.mingw32 | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/Makefile.mingw32 b/Makefile.mingw32 index 3195896..eea0337 100644 --- a/Makefile.mingw32 +++ b/Makefile.mingw32 @@ -4,23 +4,25 @@ LD = i586-mingw32msvc-g++ STRIP = i586-mingw32msvc-strip INCLUDES = \ --I ../Mesa-7.0.3-win32/include \ +-I ../Mesa-7.0.3-mingw32/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 ../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 \ +-I ../gnuwin32/include \ +-I ../pthreads-w32-2-8-0-release/ \ +-I ../gnuwin32/include/ImageMagick -HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_MALLOC_H -DHAVE_BYTESWAP_H +HAVES = -DHAVE_VSSCANF -DHAVE_LIBJPEG -DHAVE_MALLOC_H -DHAVE_BYTESWAP_H -DUSE_OSMESA CPPFLAGS += $(INCLUDES) -g -DSTDC_HEADERS -DREADLINE_STATIC -DHOOK_STDS -DWORDS_LITTLEENDIAN -fexceptions -march=i686 $(HAVES) -LDFLAGS += -g -fexceptions -shared -L/usr/lib/oracle/11.1.0.1/client/lib ../lua-interface/lua-interface.a -Wl,--export-dynamic -Wl,--enable-auto-image-base --export-all-symbols -Wl,--enable-auto-import +LDFLAGS += -g -fexceptions -shared ../lua-interface/lua-interface.a -Wl,--export-dynamic -Wl,--enable-auto-image-base --export-all-symbols -Wl,--enable-auto-import \ + -L ../freetype-win32/lib -L ../gnuwin32/lib -L ../ftgl-win32/lib/ vpath %.c ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml vpath %.cc ../Baltisot/lib:../Baltisot/src:../Baltisot/lib/zlib/src:../Baltisot/lib/lua/src:../Baltisot/lib/lua/src/LuaLib:src:../paperIdol/src:../mogltk/lib:../tinyxml @@ -94,13 +96,19 @@ GL_SOURCES = \ plugin-luagl.cc \ LuaGL.cc \ -GL_LIBS = ../Mesa-7.0.3-win32/lib/libGLU.a ../Mesa-7.0.3-win32/lib/libOSMesa.a +GL_LIBS = FTGL_SOURCES = \ plugin-luaftgl.cc \ LuaFTGL.cc \ -FTGL_LIBS = ../ftgl-win32/lib/ftgl-mingw32.a ../freetype-win32/lib/libfreetype.dll.a +FTGL_LIBS = -lftgl-mingw32 -lfreetype.dll + +OSMESA_SOURCES = \ +plugin-luaosmesa.cc \ +dds.c \ + +OSMESA_LIBS = -lMagick++ -lMagickWand -lMagickCore -lbz2.dll -lz.dll -lfreetype.dll -lgdi32 -ljpeg.dll -lpng.dll ../pthreads-w32-2-8-0-release/libpthreadGC2.a WHOLE_SOURCES = \ $(CONFIGFILES_SOURCES) \ @@ -112,6 +120,7 @@ $(HTTP_SOURCES) \ $(REGEX_SOURCES) \ $(GL_SOURCES) \ $(FTGL_SOURCES) \ +$(OSMESA_SOURCES) \ #$(OCCI_SOURCES) \ @@ -127,6 +136,7 @@ luahttp.dll \ luaregex.dll \ luagl.dll \ luaftgl.dll \ +luaosmesa.dll \ #luaocci.dll \ @@ -174,6 +184,9 @@ luaftgl.dll: $(addsuffix .o, $(notdir $(basename $(FTGL_SOURCES)))) lualibs.dll: $(addsuffix .o, $(notdir $(basename $(LUALIBS_SOURCES) $(LUA_LIB)))) $(LD) -o $@ $+ $(LUALIBS_LIBS) $(LDFLAGS) +luaosmesa.dll: $(addsuffix .o, $(notdir $(basename $(OSMESA_SOURCES)))) + $(LD) -o $@ $+ $(OSMESA_LIBS) $(LDFLAGS) + clean: rm -f *.o *.dep *.dll |