diff options
-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 |