--- deliantra/Deliantra-Client/Makefile.PL	2006/06/20 08:49:39	1.49
+++ deliantra/Deliantra-Client/Makefile.PL	2006/07/30 13:14:15	1.56
@@ -2,39 +2,46 @@
 
 print <<EOF;
 
-*** microsoft compatibility forced us to only support manual configuration
-*** by editing Makefile.PL. complain to microsoft.
-
 *** opengl 1.1 is required to run this client
 *** opengl 1.2 is recommended to run this client
 *** opengl 2.0 helps some more....
 
+*** other dependencies:
+*** pango-1.12.3, glib-2.10
+*** libsdl, libSDL_mixer, libSDL_image
+
+*** Pod::POM, Compress::LZF, BerkeleyDB, Crossfire, Event, AnyEvent perl modules
+
 *** HINT: BerkeleyDB must be linked against version 4.3 or higher of libdb
 
 EOF
 
 if ($^O =~ /win32/i or $^O =~ /mswin/) {
-   warn "\ndo manual configuration by editing Makefile.PL, please\n\n";
-   $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 -I/gtk/include/cairo";
-   $LIBS = "-L/gtk/lib -lSDL -lSDL_image -lSDL_mixer -lpangoft2-1.0 -lpangocairo-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lfreetype -lcairo -lfontconfig -lopengl32",
+   print <<EOF;
+*** microsoft compatibility forced us to only support manual configuration
+*** by editing Makefile.PL. complain to microsoft.
+
+EOF
+   $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",
 } else {
-   $INC  = join " ", qx<sdl-config --cflags>, qx<pkg-config pangoft2 --cflags>, qx<pkg-config pangocairo --cflags>;
-   $LIBS = join " ", qx<sdl-config --libs>, "-lSDL_image -lSDL_mixer", qx<pkg-config pangoft2 --libs>, qx<pkg-config pangocairo --libs>, "-lGL";
+   $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 =~ s/\n/ /g for $INC, $LIBS;
 }
 
 WriteMakefile(
     dist	=> {
-	            PREOP	=> 'pod2text CFClient.pm | tee README >$(DISTVNAME)/README; chmod -R u=rwX,go=rX . ;',
+	            PREOP	=> 'pod2text CFPlus.pm | tee README >$(DISTVNAME)/README; chmod -R u=rwX,go=rX . ;',
 	            COMPRESS	=> 'gzip -9v',
 	            SUFFIX	=> '.gz',
 	           },
-    NAME => "CFClient",
+    NAME => "CFPlus",
     INC => $INC,
     LIBS => [$LIBS],
     EXE_FILES => [qw(bin/cfplus)],
-    VERSION_FROM => "CFClient.pm",
+    VERSION_FROM => "CFPlus.pm",
     PREREQ_PM => {
        BerkeleyDB    => 0.27,
        Crossfire     => 0.1,
@@ -43,15 +50,21 @@
        AnyEvent      => 0,
        Compress::LZF => 1.6,
        Pod::POM      => 0.15,
+       JSON::PC      => 0.01,
+    },
+    depend    => {
+       "CFPlus.o" => 'glfunc.h pangoopengl.h pango-font.c pango-fontmap.c pango-render.c texcache.c',
     },
     PM => {
-       'CFClient.pm'                    => '$(INST_LIBDIR)/CFClient.pm',
-       'CFClient/Protocol.pm'           => '$(INST_LIBDIR)/CFClient/Protocol.pm',
-       'CFClient/OpenGL.pm'             => '$(INST_LIBDIR)/CFClient/OpenGL.pm',
-       'CFClient/Texture.pm'            => '$(INST_LIBDIR)/CFClient/Texture.pm',
-       'CFClient/UI.pm'                 => '$(INST_LIBDIR)/CFClient/UI.pm',
-       'CFClient/MapWidget.pm'          => '$(INST_LIBDIR)/CFClient/MapWidget.pm',
-       (map +($_ => "\$(INST_LIBDIR)/CFClient/$_"),
+       'CFPlus.pm'                    => '$(INST_LIBDIR)/CFPlus.pm',
+       'CFPlus/Protocol.pm'           => '$(INST_LIBDIR)/CFPlus/Protocol.pm',
+       'CFPlus/OpenGL.pm'             => '$(INST_LIBDIR)/CFPlus/OpenGL.pm',
+       'CFPlus/Texture.pm'            => '$(INST_LIBDIR)/CFPlus/Texture.pm',
+       'CFPlus/UI.pm'                 => '$(INST_LIBDIR)/CFPlus/UI.pm',
+       'CFPlus/Pod.pm'                => '$(INST_LIBDIR)/CFPlus/Pod.pm',
+       'CFPlus/MapWidget.pm'          => '$(INST_LIBDIR)/CFPlus/MapWidget.pm',
+       'CFPlus/BindingEditor.pm'      => '$(INST_LIBDIR)/CFPlus/BindingEditor.pm',
+       (map +($_ => "\$(INST_LIBDIR)/CFPlus/$_"),
           <resources/*.png>,
           <resources/fonts/*.ttf>,
           <resources/sounds/*.wav>,
@@ -61,6 +74,7 @@
           <resources/ui/*.png>,
           <resources/ui/resist/*.png>,
           <resources/pod/*.pod>,
+          <resources/pod/*.png>,
        ),
     }
 );