fixed setup.py build

3 files changed, 11 insertions, 8 deletions

diff --git a/config.h.in b/config.h.in
index 9f122a03..69f02ee1 100644
--- a/config.h.in
+++ b/config.h.in
@@ -277,11 +277,6 @@
 #endif
 #endif
 
-// supply a substitute calloc function if necessary
-#ifndef HAVE_CALLOC
-#define calloc rfx_calloc_replacement
-#endif
-
 //#ifdef HAVE_BUILTIN_EXPECT
 #if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
 # define likely(x)      __builtin_expect((x), 1)
diff --git a/lib/mem.h b/lib/mem.h
index ee60920b..f41167a7 100644
--- a/lib/mem.h
+++ b/lib/mem.h
@@ -14,9 +14,12 @@ void* rfx_alloc(int size);
 void* rfx_calloc(int size);
 void* rfx_realloc(void*data, int size);
 void rfx_free(void*data);
+
 #ifndef HAVE_CALLOC
 void* rfx_calloc_replacement(int nmemb, int size);
+#define calloc rfx_calloc_replacement
 #endif
+
 #ifdef MEMORY_INFO
 long rfx_memory_used();
 char* rfx_memory_used_str();
diff --git a/setup.py b/setup.py
index 5ebbdcdc..85804ac0 100644
--- a/setup.py
+++ b/setup.py
@@ -256,7 +256,7 @@ rfxswf_sources = [
 "lib/modules/swfcgi.c", "lib/modules/swfdraw.c", "lib/modules/swfdump.c", "lib/modules/swffilter.c",
 "lib/modules/swffont.c", "lib/modules/swfobject.c", "lib/modules/swfrender.c", "lib/modules/swfshape.c",
 "lib/modules/swfsound.c", "lib/modules/swftext.c", "lib/modules/swftools.c",
-"lib/rfxswf.c", "lib/drawer.c", "lib/MD5.c", "lib/h.263/dct.c", "lib/h.263/h263tables.c",
+"lib/rfxswf.c", "lib/drawer.c", "lib/h.263/dct.c", "lib/h.263/h263tables.c",
 "lib/h.263/swfvideo.c", "lib/action/assembler.c", "lib/action/compile.c",
 "lib/action/lex.swf4.c", "lib/action/lex.swf5.c", "lib/action/libming.c",
 "lib/action/swf4compiler.tab.c", "lib/action/swf5compiler.tab.c", "lib/action/actioncompiler.c",
@@ -265,7 +265,9 @@ rfxswf_sources = [
 "lib/as3/initcode.c", "lib/as3/parser.tab.c", "lib/as3/registry.c", "lib/as3/tokenizer.yy.c",
 ]
 libpdf_sources = [
-"lib/pdf/GFXOutputDev.cc", "lib/pdf/InfoOutputDev.cc", "lib/pdf/BitmapOutputDev.cc",
+"lib/pdf/VectorGraphicOutputDev.cc", 
+"lib/pdf/CharOutputDev.cc",
+"lib/pdf/InfoOutputDev.cc", "lib/pdf/BitmapOutputDev.cc",
 "lib/pdf/FullBitmapOutputDev.cc", "lib/pdf/pdf.cc", "lib/pdf/fonts.c", "lib/pdf/xpdf/GHash.cc",
 "lib/pdf/xpdf/GList.cc", "lib/pdf/xpdf/GString.cc", "lib/pdf/xpdf/gmem.cc", "lib/pdf/xpdf/gfile.cc",
 "lib/pdf/xpdf/FoFiTrueType.cc", "lib/pdf/xpdf/FoFiType1.cc", "lib/pdf/xpdf/FoFiType1C.cc",
@@ -285,7 +287,10 @@ libpdf_sources = [
 "lib/pdf/xpdf/SplashFTFontFile.cc", "lib/pdf/xpdf/SplashFTFont.cc"]
 
 libgfx_sources = [
-"lib/gfxtools.c", "lib/gfxfont.c", "lib/gfxpoly.c",
+"lib/gfxtools.c", "lib/gfxfont.c",
+"lib/gfxpoly/active.c", "lib/gfxpoly/convert.c", "lib/gfxpoly/moments.c",
+"lib/gfxpoly/poly.c", "lib/gfxpoly/renderpoly.c", "lib/gfxpoly/stroke.c",
+"lib/gfxpoly/wind.c", "lib/gfxpoly/xrow.c",
 "lib/devices/dummy.c", "lib/devices/file.c", "lib/devices/render.c", "lib/devices/text.c", "lib/devices/record.c",
 "lib/devices/ops.c", "lib/devices/polyops.c", "lib/devices/bbox.c", "lib/devices/rescale.c",
 "lib/art/art_affine.c", "lib/art/art_alphagamma.c", "lib/art/art_bpath.c", "lib/art/art_gray_svp.c",