--- deliantra/Deliantra-Client/Makefile.PL	2006/04/17 21:42:50	1.24
+++ deliantra/Deliantra-Client/Makefile.PL	2006/06/20 08:49:39	1.49
@@ -5,17 +5,23 @@
 *** microsoft compatibility forced us to only support manual configuration
 *** by editing Makefile.PL. complain to microsoft.
 
-*** HINT: BerkeleyDB must be linked against version 4.4 or above of libdb
+*** opengl 1.1 is required to run this client
+*** opengl 1.2 is recommended to run this client
+*** opengl 2.0 helps some more....
+
+*** HINT: BerkeleyDB must be linked against version 4.3 or higher of libdb
 
 EOF
 
 if ($^O =~ /win32/i or $^O =~ /mswin/) {
-   warn "do manual configuration, please\n";
-   $INC  = "-I/usr/include/SDL -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2";
-   $LIBS = "-lSDL -lSDL_image -lSDL_mixer -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lfreetype -lz",
+   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",
 } 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>;
+   $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 =~ s/\n/ /g for $INC, $LIBS;
 }
 
 WriteMakefile(
@@ -25,22 +31,36 @@
 	            SUFFIX	=> '.gz',
 	           },
     NAME => "CFClient",
-    INC => '-I/usr/include/SDL -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2',
-    LIBS => ["-lSDL -lSDL_image -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lfreetype -lz"],
-    EXE_FILES => [qw(bin/pclient)],
+    INC => $INC,
+    LIBS => [$LIBS],
+    EXE_FILES => [qw(bin/cfplus)],
     VERSION_FROM => "CFClient.pm",
     PREREQ_PM => {
        BerkeleyDB    => 0.27,
-       SDL           => 2.1,
        Crossfire     => 0.1,
        Time::HiRes   => 0,
        Event         => 1.01,
        AnyEvent      => 0,
        Compress::LZF => 1.6,
+       Pod::POM      => 0.15,
     },
     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',
-       (map +($_ => "\$(INST_LIBDIR)/CFClient/$_"), <resources/*.ttf>, <resources/*.png>, <resources/sounds/*.wav>),
+       'CFClient/MapWidget.pm'          => '$(INST_LIBDIR)/CFClient/MapWidget.pm',
+       (map +($_ => "\$(INST_LIBDIR)/CFClient/$_"),
+          <resources/*.png>,
+          <resources/fonts/*.ttf>,
+          <resources/sounds/*.wav>,
+          <resources/sounds/*.ogg>,
+          <resources/sounds/config>,
+          <resources/music/*.ogg>,
+          <resources/ui/*.png>,
+          <resources/ui/resist/*.png>,
+          <resources/pod/*.pod>,
+       ),
     }
 );