Skip to content

Commit 0ec0548

Browse files
committed
Remove platform linux32 from build.pl
1 parent 8f6ba1e commit 0ec0548

File tree

2 files changed

+3
-26
lines changed

2 files changed

+3
-26
lines changed

Makefile.gnu

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ GTK3_LIBRARIES = -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-
1010
CXXFLAGS += -O2 -g -fpermissive -Wno-deprecated-declarations $(GTK3_INCLUDE) $(P4PLUGIN_INCLUDE)
1111
LDFLAGS += -g
1212
LIBRARIES = -lstdc++ -lrt $(GTK3_LIBRARIES)
13+
PLATFORM = linux64
1314

1415
COMMON_MODULES = $(COMMON_SRCS:.c=.o)
1516
COMMON_MODULES := $(COMMON_MODULES:.cpp=.o)

build.pl

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,6 @@
7878
TestWin32();
7979
}
8080
}
81-
elsif ($target eq "linux32")
82-
{
83-
unless ($test)
84-
{
85-
BuildLinux ($target);
86-
}
87-
else
88-
{
89-
TestLinux ($target);
90-
}
91-
}
9281
elsif ($target eq "linux64")
9382
{
9483
unless ($test)
@@ -137,7 +126,7 @@ ()
137126
sub BuildMac
138127
{
139128
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");
141130
}
142131

143132
sub TestMac
@@ -172,31 +161,18 @@ sub TestWin32
172161

173162
sub BuildLinux ($)
174163
{
175-
my $platform = shift;
176-
177164
my $cflags = '-O3 -fPIC -fexceptions -fvisibility=hidden -DLINUX';
178165
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-
}
186166

187167
$ENV{'CFLAGS'} = $cflags;
188168
$ENV{'CXXFLAGS'} = $cxxflags;
189-
$ENV{'LDFLAGS'} = $ldflags;
190-
$ENV{'PLATFORM'} = $platform;
191169

192170
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");
194172
}
195173

196174
sub TestLinux ($)
197175
{
198-
my $platform = shift;
199-
200176
$ENV{'P4DEXEC'} = "PerforceBinaries/linux64/p4d";
201177
$ENV{'P4EXEC'} = "PerforceBinaries/linux64/p4";
202178
$ENV{'P4PLUGIN'} = "Build/linux64/PerforcePlugin";

0 commit comments

Comments
 (0)