--- deliantra/Deliantra-Client/Makefile.PL	2007/12/26 20:46:39	1.96
+++ deliantra/Deliantra-Client/Makefile.PL	2008/09/24 02:09:51	1.113
@@ -1,5 +1,8 @@
+use Config;
 use ExtUtils::MakeMaker;
 
+my $lddlflags = $Config{lddlflags};
+
 sub manifest_resources {
    open my $manifest, "MANIFEST" or die "Couldn't open MANIFEST: $!";
    map { chomp; $_ } grep /^resources\//, <$manifest>
@@ -13,7 +16,7 @@
 
 *** other dependencies:
 *** pango-1.12.3, glib-2.10
-*** libsdl, libSDL_mixer, libSDL_image
+*** libsdl-1.2.10, libSDL_mixer, libSDL_image
 
 *** Pod::POM, Compress::LZF, BDB, Deliantra, EV, AnyEvent perl modules
 
@@ -34,10 +37,17 @@
    $INC  = "-I/gtk/include -I/gtk/include/pango-1.0 -I/gtk/include/glib-2.0 -I/gtk/lib/glib-2.0/include/ -I/gtk/include/freetype2";
    $LIBS = "-L/gtk/lib -lSDL -lSDL_image -lSDL_mixer -lpango-1.0 -lpangoft2-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lfreetype -lfontconfig -lopengl32 -lwininet",
 } else {
-   $INC  = join " ", qx<sdl-config --cflags>, qx<pkg-config pangoft2 --cflags>;
-   $LIBS = join " ", qx<sdl-config --libs>, "-lSDL_image -lSDL_mixer", qx<pkg-config pangoft2 --libs>, "-lGL";
+   $INC       = join " ", qx<sdl-config --cflags>, qx<pkg-config pangoft2 --cflags>;
+   $LIBS      = join "", map " $_ ",
+                   qx<sdl-config --libs>,
+                   "-lSDL_image -lSDL_mixer",
+                   qx<pkg-config pangoft2 --libs>,
+                   "-L/usr/X11/lib -lGL";
+
+   $_ =~ s/\n/ /g for $INC, $LIBS;
 
-   $INC =~ s/\n/ /g for $INC, $LIBS;
+   # for extra horrid macosx joys
+   $lddlflags .= " $1" while $LIBS =~ s/ (-Wl,\S+) / /;
 }
 
 WriteMakefile(
@@ -49,41 +59,43 @@
     NAME => "Deliantra::Client",
     INC => $INC,
     LIBS => [$LIBS],
+    LDDLFLAGS => $lddlflags,
     EXE_FILES => [qw(bin/deliantra)],
-    VERSION_FROM => "dc.pm",
+    VERSION_FROM => "DC.pm",
     PREREQ_PM => {
-       BDB           => 1.4,
-       Deliantra     => 1.13,
+       BDB           => 1.71,
+       Deliantra     => 1.22,
        Time::HiRes   => 0,
-       EV            => 1.72,
-       AnyEvent      => 2.6,
-       Compress::LZF => 1.6,
+       EV            => 3.42,
+       AnyEvent      => 4.22,
+       Compress::LZF => 3.41,
        Pod::POM      => 0.15,
        LWP           => 0,
-       JSON::XS      => 2.01,
+       JSON::XS      => 2.2222,
     },
     depend    => {
        "Client.o" => 'glfunc.h pangoopengl.h pango-font.c pango-fontmap.c pango-render.c texcache.c rendercache.c',
     },
     clean     => { FILES => 'docwiki.pst' },
     PM => {
-       'dc.pm'                    => '$(INST_LIBDIR)/Client/private/dc.pm',
-       'dc/Protocol.pm'           => '$(INST_LIBDIR)/Client/private/dc/Protocol.pm',
-       'dc/OpenGL.pm'             => '$(INST_LIBDIR)/Client/private/dc/OpenGL.pm',
-       'dc/Texture.pm'            => '$(INST_LIBDIR)/Client/private/dc/Texture.pm',
-       'dc/DB.pm'                 => '$(INST_LIBDIR)/Client/private/dc/DB.pm',
-       'dc/UI.pm'                 => '$(INST_LIBDIR)/Client/private/dc/UI.pm',
-       'dc/UI/Canvas.pm'          => '$(INST_LIBDIR)/Client/private/dc/UI/Canvas.pm',
-       'dc/UI/Dockable.pm'        => '$(INST_LIBDIR)/Client/private/dc/UI/Dockable.pm',
-       'dc/UI/Inventory.pm'       => '$(INST_LIBDIR)/Client/private/dc/UI/Inventory.pm',
-       'dc/UI/SpellList.pm'       => '$(INST_LIBDIR)/Client/private/dc/UI/SpellList.pm',
-       'dc/UI/Canvas.pm'          => '$(INST_LIBDIR)/Client/private/dc/UI/Canvas.pm',
-       'dc/UI/ChatView.pm'        => '$(INST_LIBDIR)/Client/private/dc/UI/ChatView.pm',
-       'dc/UI/MessageWindow.pm'   => '$(INST_LIBDIR)/Client/private/dc/UI/MessageWindow.pm',
-       'dc/Item.pm'               => '$(INST_LIBDIR)/Client/private/dc/Item.pm',
-       'dc/Pod.pm'                => '$(INST_LIBDIR)/Client/private/dc/Pod.pm',
-       'dc/MapWidget.pm'          => '$(INST_LIBDIR)/Client/private/dc/MapWidget.pm',
-       'dc/Macro.pm'              => '$(INST_LIBDIR)/Client/private/dc/Macro.pm',
+       'DC.pm'                    => '$(INST_LIBDIR)/Client/private/DC.pm',
+       'DC/Protocol.pm'           => '$(INST_LIBDIR)/Client/private/DC/Protocol.pm',
+       'DC/OpenGL.pm'             => '$(INST_LIBDIR)/Client/private/DC/OpenGL.pm',
+       'DC/Texture.pm'            => '$(INST_LIBDIR)/Client/private/DC/Texture.pm',
+       'DC/DB.pm'                 => '$(INST_LIBDIR)/Client/private/DC/DB.pm',
+       'DC/UI.pm'                 => '$(INST_LIBDIR)/Client/private/DC/UI.pm',
+       'DC/MessageDistributor.pm' => '$(INST_LIBDIR)/Client/private/DC/MessageDistributor.pm',
+       'DC/UI/Canvas.pm'          => '$(INST_LIBDIR)/Client/private/DC/UI/Canvas.pm',
+       'DC/UI/Dockable.pm'        => '$(INST_LIBDIR)/Client/private/DC/UI/Dockable.pm',
+       'DC/UI/Dockbar.pm'         => '$(INST_LIBDIR)/Client/private/DC/UI/Dockbar.pm',
+       'DC/UI/Inventory.pm'       => '$(INST_LIBDIR)/Client/private/DC/UI/Inventory.pm',
+       'DC/UI/SpellList.pm'       => '$(INST_LIBDIR)/Client/private/DC/UI/SpellList.pm',
+       'DC/UI/Canvas.pm'          => '$(INST_LIBDIR)/Client/private/DC/UI/Canvas.pm',
+       'DC/UI/ChatView.pm'        => '$(INST_LIBDIR)/Client/private/DC/UI/ChatView.pm',
+       'DC/Item.pm'               => '$(INST_LIBDIR)/Client/private/DC/Item.pm',
+       'DC/Pod.pm'                => '$(INST_LIBDIR)/Client/private/DC/Pod.pm',
+       'DC/MapWidget.pm'          => '$(INST_LIBDIR)/Client/private/DC/MapWidget.pm',
+       'DC/Macro.pm'              => '$(INST_LIBDIR)/Client/private/DC/Macro.pm',
        'docwiki.pst'              => '$(INST_LIBDIR)/Client/private/resources/docwiki.pst',
        (map +($_ => "\$(INST_LIBDIR)/Client/private/$_"), manifest_resources),
     }