Skip to content
Snippets Groups Projects
Commit 21200862 authored by Bertrand Bellenot's avatar Bertrand Bellenot
Browse files

Fix failing compilation of stressHistoFit on Windows

git-svn-id: http://root.cern.ch/svn/root/trunk@31304 27541ba8-7e3a-0410-8455-c3a389f83636
parent 536096ee
No related branches found
No related tags found
No related merge requests found
......@@ -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)$@
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment