diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-04-13 20:01:18 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-04-13 20:01:18 +0000 |
commit | cb0bf68aa475ddb96b0ecc3ac3676ad9f5598b59 (patch) | |
tree | a55bb883fb941ff7a483bcb76138d70b2149822b /buildtools | |
parent | 24d2e20391c5949c20bc419ab9e4974541011294 (diff) | |
download | netpbm-mirror-cb0bf68aa475ddb96b0ecc3ac3676ad9f5598b59.tar.gz netpbm-mirror-cb0bf68aa475ddb96b0ecc3ac3676ad9f5598b59.tar.xz netpbm-mirror-cb0bf68aa475ddb96b0ecc3ac3676ad9f5598b59.zip |
Add Windows icon capability, centralize make rule for link of programs
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2182 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'buildtools')
-rwxr-xr-x | buildtools/configure.pl | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/buildtools/configure.pl b/buildtools/configure.pl index 056b705d..44493ca1 100755 --- a/buildtools/configure.pl +++ b/buildtools/configure.pl @@ -1048,6 +1048,19 @@ sub getSse($) { } +sub getIcon($$) { + + my ($platform, $wantIconR) = @_; + + if ($platform eq 'WINDOWS') { + print("Include an icon in each executable?\n"); + $$wantIconR = promptYesNo("y"); + } else { + $$wantIconR = $FALSE; + } +} + + # TODO: These should do test compiles to see if the headers are in the # default search path, both to create a default to offer and to issue a @@ -2082,6 +2095,8 @@ getSse(\my $wantSse); findProcessManagement(\my $dontHaveProcessMgmt); +getIcon($platform, \my $wantIcon); + #****************************************************************************** # # FIND THE PREREQUISITE LIBRARIES @@ -2370,6 +2385,9 @@ if ($platform eq "GNU") { if ($subplatform ne "cygwin") { push(@config_mk, "MSVCRT = Y\n"); } + if ($wantIcon) { + push(@config_mk, 'WINICON_OBJECT = $(BUILDDIR)/icon.netpbm.o'); + } } elsif ($platform eq "BEOS") { push(@config_mk, "LDSHLIB = -nostart\n"); } elsif ($platform eq "OPENBSD") { |