X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=bindings%2Fperl-shared%2Fntmake.pl;h=047b76f2719ac1b0d48dd4b1d755dcfb77142df5;hp=75321fd52eb202f220fd718cac543cecd4601db8;hb=dfcae0db78ac857b019daf726c315fbcc21ff0a3;hpb=60cb4a9ef5e96016fe5de251234e424987839f6d

diff --git a/bindings/perl-shared/ntmake.pl b/bindings/perl-shared/ntmake.pl
index 75321fd..047b76f 100644
--- a/bindings/perl-shared/ntmake.pl
+++ b/bindings/perl-shared/ntmake.pl
@@ -2,23 +2,24 @@ use ExtUtils::MakeMaker;
 use Config;
 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
 # the contents of the Makefile that is written.
-# This file is current set to compile with ActiveState 5xx builds
-# (perl 5.005_03). Hopefully this lowest common denominator
-# approach will work with newer ActiveState builds (i.e. 6xx).
+# Run VCVARS32.BAT before generating makefile/compiling.
 WriteMakefile(
     'NAME'	=> 'RRDs',
     'VERSION_FROM' => 'RRDs.pm',
 #    'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
+# keep compatible w/ ActiveState 5xx builds
     'DEFINE'	   => "-DPERLPATCHLEVEL=5",
 
-   'INC'	=> '-I../../src/ -I../../libraries/freetype-2.0.5/include -I ../../libraries/libart_lgpl-2.3.7 -I ../../libraries/zlib-1.1.4 -I ../../libraries/libpng-1.2.0',
-   'OPTIMIZE' => '-O2 -MT',
-# change this path to refer to your libc.lib
-    'MYEXTLIB'  => '"$(VCINSTALLDIR)/vc7/lib/libcmt.lib" ../../src/debug/rrd.lib ../../libraries/libart_lgpl-2.3.7/debug/libart.lib ../../libraries/zlib-1.1.4/debug/zlib.lib ../../libraries/libpng-1.2.0/debug/png.lib ../../libraries/freetype-2.0.5/debug/freetype.lib', 
-#   'MYEXTLIB'  => '"$(VCINSTALLDIR)/vc7/lib/libcmt.lib" ../../src/release/rrd.lib ../../libraries/libart_lgpl-2.3.7/release/libart.lib ../../libraries/zlib-1.1.4/release/zlib.lib ../../libraries/libpng-1.2.0\release\png.lib ../../libraries/freetype-2.0.5/release/freetype.lib', 
+   'INC'	=> '-I../../src/ "-I/Program Files/GnuWin32/include"',
+# Since we are now using GnuWin32 libraries dynamically (instead of static
+# complile with code redistributed with rrdtool), use /MD instead of /MT.
+# Yes, this means we need msvcrt.dll but GnuWin32 dlls already require it
+# and it is available on most versions of Windows.
+   'OPTIMIZE' => '-O2 -MD',
+   'LIBS'  => '../../src/release/rrd.lib "/Program Files/GnuWin32/lib/libart_lgpl.lib" "/Program Files/GnuWin32/lib/libz.lib" "/Program Files/GnuWin32/lib/libpng.lib" "/Program Files/GnuWin32/lib/libfreetype.lib"', 
     'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' },
     ($] ge '5.005') ? (
-        'AUTHOR' => 'Tobias Oetiker (oetiker@ee.ethz.ch)',
+        'AUTHOR' => 'Tobias Oetiker (tobi@oetiker.ch)',
         'ABSTRACT' => 'Round Robin Database Tool',
     ) : ()