|
78 | 78 | TestWin32();
|
79 | 79 | }
|
80 | 80 | }
|
81 |
| -elsif ($target eq "linux32") |
82 |
| -{ |
83 |
| - unless ($test) |
84 |
| - { |
85 |
| - BuildLinux ($target); |
86 |
| - } |
87 |
| - else |
88 |
| - { |
89 |
| - TestLinux ($target); |
90 |
| - } |
91 |
| -} |
92 | 81 | elsif ($target eq "linux64")
|
93 | 82 | {
|
94 | 83 | unless ($test)
|
|
137 | 126 | sub BuildMac
|
138 | 127 | {
|
139 | 128 | rmtree("Build");
|
140 |
| - system("make" , "-f", "Makefile.osx", "all") && die ("Failed to build version control plugins"); |
| 129 | + system("make" , "-f", "Makefile.osx", "all") && die ("Failed to build PerforcePlugin for macOS"); |
141 | 130 | }
|
142 | 131 |
|
143 | 132 | sub TestMac
|
@@ -172,31 +161,18 @@ sub TestWin32
|
172 | 161 |
|
173 | 162 | sub BuildLinux ($)
|
174 | 163 | {
|
175 |
| - my $platform = shift; |
176 |
| - |
177 | 164 | my $cflags = '-O3 -fPIC -fexceptions -fvisibility=hidden -DLINUX';
|
178 | 165 | my $cxxflags = "$cflags -Wno-ctor-dtor-private";
|
179 |
| - my $ldflags = ''; |
180 |
| - |
181 |
| - if ($platform eq 'linux32') { |
182 |
| - $cflags = "$cflags -m32"; |
183 |
| - $cxxflags = "$cxxflags -m32"; |
184 |
| - $ldflags = '-m32'; |
185 |
| - } |
186 | 166 |
|
187 | 167 | $ENV{'CFLAGS'} = $cflags;
|
188 | 168 | $ENV{'CXXFLAGS'} = $cxxflags;
|
189 |
| - $ENV{'LDFLAGS'} = $ldflags; |
190 |
| - $ENV{'PLATFORM'} = $platform; |
191 | 169 |
|
192 | 170 | system ('make', '-f', 'Makefile.gnu', 'clean');
|
193 |
| - system ('make', '-f', 'Makefile.gnu') && die ("Failed to build $platform"); |
| 171 | + system ('make', '-f', 'Makefile.gnu') && die ("Failed to build PerforcePlugin for linux64"); |
194 | 172 | }
|
195 | 173 |
|
196 | 174 | sub TestLinux ($)
|
197 | 175 | {
|
198 |
| - my $platform = shift; |
199 |
| - |
200 | 176 | $ENV{'P4DEXEC'} = "PerforceBinaries/linux64/p4d";
|
201 | 177 | $ENV{'P4EXEC'} = "PerforceBinaries/linux64/p4";
|
202 | 178 | $ENV{'P4PLUGIN'} = "Build/linux64/PerforcePlugin";
|
|
0 commit comments