From 212008626312836456cf94d5f0c8b783ee932c2d Mon Sep 17 00:00:00 2001
From: Bertrand Bellenot <Bertrand.Bellenot@cern.ch>
Date: Thu, 19 Nov 2009 07:41:21 +0000
Subject: [PATCH] Fix failing compilation of stressHistoFit on Windows
git-svn-id: http://root.cern.ch/svn/root/trunk@31304 27541ba8-7e3a-0410-8455-c3a389f83636
---
test/Makefile | 4 ++--
test/Makefile.win32 | 17 +++++++++++++++--
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/test/Makefile b/test/Makefile
index a2527ab641e..4c9dbb64674 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -485,7 +485,7 @@ $(STRESSFIT): $(STRESSFITO)
$(STRESSHISTOFIT): $(STRESSHISTOFITO)
ifeq ($(PLATFORM),win32)
- $(LD) $(LDFLAGS) $^ $(LIBS) '$(ROOTSYS)/lib/libGeom.lib' $(OutPutOpt)$@
+ $(LD) $(LDFLAGS) $^ $(LIBS) '$(ROOTSYS)/lib/libUnuran.lib' $(OutPutOpt)$@
$(MT_EXE)
else
$(LD) $(LDFLAGS) $^ $(LIBS) -lUnuran $(OutPutOpt)$@
@@ -494,7 +494,7 @@ endif
$(STRESSTMVA): $(STRESSTMVAO)
ifeq ($(PLATFORM),win32)
- $(LD) $(LDFLAGS) $^ $(LIBS) '$(ROOTSYS)/lib/libTMVA.lib' '$(ROOTSYS)/lib/libMinuit.lib' '$(ROOTSYS)/lib/libMLP.lib' '$(ROOTSYS)/lib/libTreePlayer.lib' '$(ROOTSYS)/lib/libXMLIO.lib' $(OutPutOpt)$@
+ $(LD) $(LDFLAGS) $^ $(LIBS) '$(ROOTSYS)/lib/libTMVA.lib' '$(ROOTSYS)/lib/libMinuit.lib' '$(ROOTSYS)/lib/libMLP.lib' '$(ROOTSYS)/lib/libTreePlayer.lib' '$(ROOTSYS)/lib/libXMLIO.lib' $(OutPutOpt)$@
$(MT_EXE)
else
$(LD) $(LDFLAGS) $^ $(LIBS) -lTMVA -lMinuit -lMLP -lTreePlayer -lXMLIO $(OutPutOpt)$@
diff --git a/test/Makefile.win32 b/test/Makefile.win32
index 42276bea3c2..4e00db0ceb9 100644
--- a/test/Makefile.win32
+++ b/test/Makefile.win32
@@ -226,6 +226,14 @@ STRESSFITO = stressFit.$(ObjSuf)
STRESSFITS = stressFit.$(SrcSuf)
STRESSFIT = stressFit$(ExeSuf)
+!if exist("$(ROOTSYS)\lib\libUnuran.lib")
+!if exist("$(ROOTSYS)\lib\libminuit2.lib")
+STRESSHISTOFITO = stressHistoFit.$(ObjSuf)
+STRESSHISTOFITS = stressHistoFit.$(SrcSuf)
+STRESSHISTOFIT = stressHistoFit$(ExeSuf)
+!endif
+!endif
+
STRESSTMVAO = stressTMVA.$(ObjSuf)
STRESSTMVAS = stressTMVA.$(SrcSuf)
STRESSTMVA = stressTMVA$(ExeSuf)
@@ -281,7 +289,7 @@ OBJS = $(EVENTO) $(MAINEVENTO) $(HWORLDO) $(HSIMPLEO) $(MINEXAMO) \
$(STRESSSHAPESO) $(TCOLLBMO) $(STRESSGEOMETRYO) $(STRESSLO) \
$(STRESSGO) $(STRESSSPO) $(TESTBITSO) $(STRESSTMVAO) \
$(CTORTUREO) $(QPRANDOMO) $(THREADSO) $(STRESSVECO) \
- $(STRESSMATHO) $(STRESSFITO) $(STRESSHEPIXO) \
+ $(STRESSMATHO) $(STRESSFITO) $(STRESSHISTOFITO) $(STRESSHEPIXO) \
$(STRESSENTRYLISTO) $(STRESSROOFITO) $(STRESSPROOFO) \
$(STRESSMATHMOREO) $(STRESSITERO) $(STRESSHISTO) \
$(GUITESTO) $(GUIVIEWERO) $(TETRISO)
@@ -291,7 +299,7 @@ PROGRAMS = $(EVENT) $(HWORLD) $(HSIMPLE) $(MINEXAM) $(TSTRING) \
$(HELLOSO) $(ACLOCKSO) $(STRESS) $(TBENCHSO) $(BENCH) \
$(STRESSSHAPES) $(STRESSGEOMETRY) $(STRESSL) $(STRESSG) \
$(TESTBITS) $(CTORTURE) $(QPRANDOM) $(THREADS) $(STRESSSP) \
- $(STRESSVEC) $(STRESSFIT) $(STRESSHEPIX) $(STRESSENTRYLIST) \
+ $(STRESSVEC) $(STRESSFIT) $(STRESSHISTOFIT) $(STRESSHEPIX) $(STRESSENTRYLIST) \
$(STRESSROOFIT) $(STRESSPROOF) $(STRESSMATH) $(STRESSTMVA) \
$(STRESSMATHMORE) $(STRESSITER) $(STRESSHIST) \
$(GUITEST) $(GUIVIEWER) $(TETRISSO)
@@ -451,6 +459,11 @@ $(STRESSFIT): $(STRESSFITO)
$(MT_EXE)
@echo "$@ done"
+$(STRESSHISTOFIT): $(STRESSHISTOFITO)
+ $(LD) $(LDFLAGS) $(STRESSHISTOFITO) $(LIBS) $(ROOTSYS)\lib\libUnuran.lib $(OutPutOpt)$@
+ $(MT_EXE)
+ @echo "$@ done"
+
$(STRESSTMVA): $(STRESSTMVAO)
$(LD) $(LDFLAGS) $(STRESSTMVAO) $(LIBS) $(ROOTSYS)\lib\libTMVA.lib $(ROOTSYS)\lib\libMinuit.lib $(ROOTSYS)\lib\libMLP.lib $(ROOTSYS)\lib\libTreePlayer.lib $(OutPutOpt)$@
$(MT_EXE)
--
GitLab