Skip to content

Commit 3d850fe

Browse files
committed
[skip-ci] Fix stressGUI and Makefile.win32
Discovered when running `stressGUI`: - Fix a couple of PATHs in `stressGUI.cxx` - Fix the compilation of `Aclock`, `Hello`, and `Tetris` and add support for `Win64` in `test/Makefile.win32` - Fix the following error with `tutorials/gui/Slider3Demo.C`: ``` tutorials\gui\Slider3Demo.C:198:21: error: call to member function 'SetPosition' is ambiguous ```
1 parent a5111eb commit 3d850fe

File tree

3 files changed

+31
-14
lines changed

3 files changed

+31
-14
lines changed

test/Makefile.win32

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,25 @@ ExeSuf = .exe
4747
DllSuf = dll
4848
OutPutOpt = -out:
4949

50+
!IF "$(PLATFORM)" == "x86"
51+
CPU=i386
52+
DLLENTRY = @12
53+
MACHINE=IX86
54+
!endif
55+
56+
!IF "$(PLATFORM)" == "x64"
57+
CPU=x86_64
58+
MACHINE=AMD64
59+
DLLENTRY =
60+
!ENDIF
61+
5062
# Win32 system with Microsoft Visual C/C++
5163

5264
APPVER = 5.01
5365
cc = cl
5466
link = link
5567
implib = lib
5668
lflags = $(lflags) /INCREMENTAL:NO /NOLOGO
57-
DLLENTRY = @12
5869
conlflags = $(lflags) -subsystem:console
5970
guilflags = $(lflags) -subsystem:windows
6071
dlllflags = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll
@@ -334,13 +345,13 @@ all: $(PROGRAMS)
334345

335346
$(EVENTSO): $(EVENTO)
336347
BINDEXPLIB $* $(EVENTO) > $*.def
337-
lib -nologo -MACHINE:IX86 $(EVENTO) -def:$*.def $(OutPutOpt)$(EVENTLIB)
348+
lib -nologo -MACHINE:$(MACHINE) $(EVENTO) -def:$*.def $(OutPutOpt)$(EVENTLIB)
338349
$(LD) $(SOFLAGS) $(LDFLAGS) $(EVENTO) $*.exp $(LIBS) $(OutPutOpt)$(EVENTSO)
339350
@echo "$(EVENTSO) done"
340351

341352
$(EVENTMTSO): $(EVENTMTO)
342353
BINDEXPLIB $* $(EVENTMTO) > $*.def
343-
lib -nologo -MACHINE:IX86 $(EVENTMTO) -def:$*.def $(OutPutOpt)$(EVENTMTLIB)
354+
lib -nologo -MACHINE:$(MACHINE) $(EVENTMTO) -def:$*.def $(OutPutOpt)$(EVENTMTLIB)
344355
$(LD) $(SOFLAGS) $(LDFLAGS) $(EVENTMTO) $*.exp $(LIBS) $(OutPutOpt)$(EVENTMTSO)
345356
@echo "$(EVENTMTSO) done"
346357

@@ -511,15 +522,21 @@ $(BENCH): $(BENCHO) $(TBENCHSO)
511522

512523
Hello: $(HELLOSO)
513524
$(HELLOSO): $(HELLOO)
514-
$(LD) $(SOFLAGS) $(LDFLAGS) $(HELLOO) $(GLIBS) $(OutPutOpt)$@
525+
BINDEXPLIB $* $(HELLOO) > $*.def
526+
lib -nologo -MACHINE:$(MACHINE) $(HELLOO) -def:$*.def $(OutPutOpt)Hello.lib
527+
$(LD) $(SOFLAGS) $(LDFLAGS) $(HELLOO) $*.exp $(GLIBS) $(OutPutOpt)$@
515528

516529
Aclock: $(ACLOCKSO)
517530
$(ACLOCKSO): $(ACLOCKO)
518-
$(LD) $(SOFLAGS) $(LDFLAGS) $(ACLOCKO) $(GLIBS) $(OutPutOpt)$@
531+
BINDEXPLIB $* $(ACLOCKO) > $*.def
532+
lib -nologo -MACHINE:$(MACHINE) $(ACLOCKO) -def:$*.def $(OutPutOpt)Aclock.lib
533+
$(LD) $(SOFLAGS) $(LDFLAGS) $(ACLOCKO) $*.exp $(GLIBS) $(OutPutOpt)$@
519534

520535
Tetris: $(TETRISSO)
521536
$(TETRISSO): $(TETRISO)
522-
$(LD) $(SOFLAGS) $(LDFLAGS) $(TETRISO) $(GLIBS) $(OutPutOpt)$@
537+
BINDEXPLIB $* $(TETRISO) > $*.def
538+
lib -nologo -MACHINE:$(MACHINE) $(TETRISO) -def:$*.def $(OutPutOpt)Tetris.lib
539+
$(LD) $(SOFLAGS) $(LDFLAGS) $(TETRISO) $*.exp $(GLIBS) $(OutPutOpt)$@
523540

524541
$(TBENCHSO): $(TBENCHO)
525542
$(LD) $(SOFLAGS) $(LDFLAGS) $(TBENCHO) $(LIBS) $(OutPutOpt)$@

test/stressGUI.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2185,7 +2185,7 @@ void testSplitFrame()
21852185
first->GetFirst()->VSplit();
21862186
first->GetSecond()->VSplit();
21872187
first->GetSecond()->GetSecond()->SetEditable();
2188-
new TGTextEditor("stressGUI.cxx", gClient->GetRoot());
2188+
new TGTextEditor(Form("%s/test/stressGUI.cxx", gRootSys.Data()), gClient->GetRoot());
21892189
first->GetSecond()->GetSecond()->SetEditable(kFALSE);
21902190
mf->MapSubwindows();
21912191
mf->Resize(600, 400);
@@ -2282,9 +2282,9 @@ void testPaletteEditor()
22822282

22832283
void testHtmlBrowser()
22842284
{
2285-
TGHtmlBrowser *b = new TGHtmlBrowser("http://bellenot.web.cern.ch/bellenot/Public/html_test/html_test.html");
2285+
TGHtmlBrowser *b = new TGHtmlBrowser("https://bellenot.web.cern.ch/public/html_test/html_test.html");
22862286
ProcessFrame((TGMainFrame*)b, "HTML Browser 1");
2287-
b->Selected("http://bellenot.web.cern.ch/bellenot/Public/html_test/gallery/");
2287+
b->Selected("https://bellenot.web.cern.ch/public/html_test/gallery/");
22882288
ProcessFrame((TGMainFrame*)b, "HTML Browser 2");
22892289
b->CloseWindow();
22902290
}

tutorials/gui/Slider3Demo.C

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,15 @@ void TTripleSliderDemo::DoText(const char * /*text*/)
195195

196196
switch (id) {
197197
case HId1:
198-
fHslider1->SetPosition(atof(fTbh1->GetString()),
199-
fHslider1->GetMaxPosition());
198+
fHslider1->SetPosition((Float_t)atof(fTbh1->GetString()),
199+
(Float_t)fHslider1->GetMaxPosition());
200200
break;
201201
case HId2:
202-
fHslider1->SetPointerPosition(atof(fTbh2->GetString()));
202+
fHslider1->SetPointerPosition((Float_t)atof(fTbh2->GetString()));
203203
break;
204204
case HId3:
205-
fHslider1->SetPosition(fHslider1->GetMinPosition(),
206-
atof(fTbh1->GetString()));
205+
fHslider1->SetPosition((Float_t)fHslider1->GetMinPosition(),
206+
(Float_t)atof(fTbh1->GetString()));
207207
break;
208208
default:
209209
break;

0 commit comments

Comments
 (0)