diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-02-19 04:34:29 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-02-19 04:34:29 +0000 |
commit | 2780d71d482410d0a05d416cfab4fbeab122441c (patch) | |
tree | 07fcb201aaacbd00c4d24274bca3529a0702f78c | |
parent | 02d5be21766fecb35e30a0ec5c8dc0d441b554d3 (diff) | |
download | netpbm-mirror-2780d71d482410d0a05d416cfab4fbeab122441c.tar.gz netpbm-mirror-2780d71d482410d0a05d416cfab4fbeab122441c.tar.xz netpbm-mirror-2780d71d482410d0a05d416cfab4fbeab122441c.zip |
Use Windows version of GetHostName instead of POSIX for Mingw
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1846 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rwxr-xr-x | buildtools/configure.pl | 3 | ||||
-rw-r--r-- | converter/ppm/ppmtompeg/Makefile | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/buildtools/configure.pl b/buildtools/configure.pl index 910a18d2..2179454b 100755 --- a/buildtools/configure.pl +++ b/buildtools/configure.pl @@ -2246,6 +2246,9 @@ if ($platform eq "GNU") { push(@config_mk, 'DLLVER=$(NETPBM_MAJOR_RELEASE)', "\n"); push(@config_mk, "LDSHLIB = " . '-shared -Wl,--image-base=0x10000000 -Wl,--enable-auto-import', "\n"); + if ($subplatform ne "cygwin") { + push(@config_mk, "MSVCRT = Y\n"); + } } elsif ($platform eq "BEOS") { push(@config_mk, "LDSHLIB = -nostart\n"); } elsif ($platform eq "OPENBSD") { diff --git a/converter/ppm/ppmtompeg/Makefile b/converter/ppm/ppmtompeg/Makefile index d3342c9a..49317287 100644 --- a/converter/ppm/ppmtompeg/Makefile +++ b/converter/ppm/ppmtompeg/Makefile @@ -56,7 +56,7 @@ ifeq ($(OMIT_NETWORK),y) else MP_OTHER_OBJS += parallel.o psocket.o endif -ifeq ($(WIN32),y) +ifeq ($(MSVCRT),y) MP_OTHER_OBJS += gethostname_win32.o else MP_OTHER_OBJS += gethostname.o |