|
Lines 15-20
Link Here
|
| 15 |
defaults to unix. |
15 |
defaults to unix. |
| 16 |
--gtk=(1|2) specify which gtk has been used to compile |
16 |
--gtk=(1|2) specify which gtk has been used to compile |
| 17 |
wxwindows, default 1. Only used on unix |
17 |
wxwindows, default 1. Only used on unix |
|
|
18 |
--unicode=(0|1) override autodetection of wxwindows unicode usage |
| 18 |
--debug enables debug output and assertations |
19 |
--debug enables debug output and assertations |
| 19 |
EOF |
20 |
EOF |
| 20 |
} |
21 |
} |
|
Lines 28-33
Link Here
|
| 28 |
"platform=s" => \$platform, # string |
29 |
"platform=s" => \$platform, # string |
| 29 |
"debug" => \$debug, # flag |
30 |
"debug" => \$debug, # flag |
| 30 |
"gtk=s" => \$gtk_vers, #string |
31 |
"gtk=s" => \$gtk_vers, #string |
|
|
32 |
"unicode=s" => \$unicode, # string |
| 31 |
"help" => \$help); # flag |
33 |
"help" => \$help); # flag |
| 32 |
|
34 |
|
| 33 |
if (!$result) { |
35 |
if (!$result) { |
|
Lines 57-63
Link Here
|
| 57 |
$_ = `wx-config --version`; |
59 |
$_ = `wx-config --version`; |
| 58 |
|
60 |
|
| 59 |
chomp; |
61 |
chomp; |
| 60 |
$wxversion=$_; |
62 |
#$wxversion=$_; |
| 61 |
m/^(\d).(\d).(\d)/; |
63 |
m/^(\d).(\d).(\d)/; |
| 62 |
#$wxmajor=$1; |
64 |
#$wxmajor=$1; |
| 63 |
#$wxminor=$2; |
65 |
#$wxminor=$2; |
|
Lines 78-83
Link Here
|
| 78 |
chomp($WXWIN_CFLAGS); |
80 |
chomp($WXWIN_CFLAGS); |
| 79 |
chomp($WXWIN_LFLAGS); |
81 |
chomp($WXWIN_LFLAGS); |
| 80 |
|
82 |
|
|
|
83 |
if (!defined($unicode)) { |
| 84 |
if ($WXWIN_LFLAGS =~ /gtk2u/) { |
| 85 |
$unicode = 1; |
| 86 |
} else { |
| 87 |
$unicode = 0; |
| 88 |
} |
| 89 |
} |
| 90 |
|
| 91 |
if ($unicode) { |
| 92 |
$WXWIN_CFLAGS =~ s/gtk2-/gtk2u-/g; |
| 93 |
$WXWIN_LFLAGS =~ s/gtk2-/gtk2u-/g; |
| 94 |
} else { |
| 95 |
$WXWIN_CFLAGS =~ s/gtk2u-/gtk2-/g; |
| 96 |
$WXWIN_LFLAGS =~ s/gtk2u-/gtk2-/g; |
| 97 |
} |
| 98 |
|
| 81 |
my $EXTRA_CFLAGS; |
99 |
my $EXTRA_CFLAGS; |
| 82 |
if ($debug) { |
100 |
if ($debug) { |
| 83 |
# $WXWIN_CFLAGS="$WXWIN_CFLAGS -D__WXDEBUG__"; |
101 |
# $WXWIN_CFLAGS="$WXWIN_CFLAGS -D__WXDEBUG__"; |
|
Lines 96-104
Link Here
|
| 96 |
$XRC_LFLAGS="-lwx_gtk_xrc-$wxrelease"; |
114 |
$XRC_LFLAGS="-lwx_gtk_xrc-$wxrelease"; |
| 97 |
$WXWIN_CFLAGS = $WXWIN_CFLAGS . " " . `gtk-config --cflags`; |
115 |
$WXWIN_CFLAGS = $WXWIN_CFLAGS . " " . `gtk-config --cflags`; |
| 98 |
} else { |
116 |
} else { |
| 99 |
$XRC_LFLAGS="-lwx_gtk2_xrc-$wxrelease"; |
117 |
$XRC_LFLAGS="-lwx_gtk2" . ($unicode ? "u" : "") ."_xrc-$wxrelease"; |
| 100 |
$WXWIN_CFLAGS = $WXWIN_CFLAGS . " " . `pkg-config --cflags-only-I gtk+-2.0`; |
118 |
$WXWIN_CFLAGS = $WXWIN_CFLAGS . " " . `pkg-config --cflags-only-I gtk+-2.0`; |
| 101 |
} |
119 |
} |
|
|
120 |
chomp($WXWIN_CFLAGS); |
| 102 |
} |
121 |
} |
| 103 |
|
122 |
|
| 104 |
# check for external vigra |
123 |
# check for external vigra |
|
Lines 120-125
Link Here
|
| 120 |
|
139 |
|
| 121 |
print "\nConfiguration summary for hugin:\n"; |
140 |
print "\nConfiguration summary for hugin:\n"; |
| 122 |
print " platform: $platform\n"; |
141 |
print " platform: $platform\n"; |
|
|
142 |
print " gtk version: $gtk_vers\n"; |
| 143 |
print " using unicode library versions: " . ($unicode ? "yes" : "no") . "\n"; |
| 123 |
print " prefix: $prefix\n"; |
144 |
print " prefix: $prefix\n"; |
| 124 |
if ($debug) { |
145 |
if ($debug) { |
| 125 |
print " debug: enabled\n"; |
146 |
print " debug: enabled\n"; |
|
Lines 165-170
Link Here
|
| 165 |
|
186 |
|
| 166 |
while (<CONF_T>) { |
187 |
while (<CONF_T>) { |
| 167 |
s/__PREFIX__/$prefix/g; |
188 |
s/__PREFIX__/$prefix/g; |
|
|
189 |
s/__WXWIN_CFLAGS__/$WXWIN_CFLAGS/g; |
| 190 |
s/__WXWIN_LFLAGS__/$WXWIN_LFLAGS/g; |
| 168 |
print CONF; |
191 |
print CONF; |
| 169 |
} |
192 |
} |
| 170 |
close (CONF_T); |
193 |
close (CONF_T); |
