Skip to content
Snippets Groups Projects
Commit ab51fda9 authored by Lorenzo Moneta's avatar Lorenzo Moneta
Browse files

fix a warning in stressMathore and a problem making dictionary library on Windows

git-svn-id: http://root.cern.ch/svn/root/trunk@21313 27541ba8-7e3a-0410-8455-c3a389f83636
parent dd779f9d
No related branches found
No related tags found
No related merge requests found
...@@ -73,10 +73,10 @@ STRESSVECO = stressVector.$(ObjSuf) ...@@ -73,10 +73,10 @@ STRESSVECO = stressVector.$(ObjSuf)
STRESSVECS = stressVector.$(SrcSuf) STRESSVECS = stressVector.$(SrcSuf)
STRESSVEC = stressVector$(ExeSuf) STRESSVEC = stressVector$(ExeSuf)
STRESSMATHO = stressMathCore.$(ObjSuf)
STRESSMATHS = stressMathCore.$(SrcSuf)
ifneq ($(USE_REFLEX),) ifneq ($(USE_REFLEX),)
CXXFLAGS += -DUSE_REFLEX CXXFLAGS += -DUSE_REFLEX
STRESSMATHO = stressMathCore.$(ObjSuf) TrackMathCoreRflx.$(ObjSuf)
STRESSMATHS = stressMathCore.$(SrcSuf) TrackMathCoreRflx.$(SrcSuf)
ifeq ($(PLATFORM),win32) ifeq ($(PLATFORM),win32)
STRESSMATHLIBS = '$(ROOTSYS)/lib/libMathCore.lib' '$(ROOTSYS)/lib/libReflex.lib' '$(ROOTSYS)/lib/libCintex.lib' STRESSMATHLIBS = '$(ROOTSYS)/lib/libMathCore.lib' '$(ROOTSYS)/lib/libReflex.lib' '$(ROOTSYS)/lib/libCintex.lib'
else else
...@@ -88,8 +88,6 @@ TRACKMATHLIB = libTrackMathcoreRflx.$(DllSuf) ...@@ -88,8 +88,6 @@ TRACKMATHLIB = libTrackMathcoreRflx.$(DllSuf)
else else
STRESSMATHO = stressMathCore.$(ObjSuf)
STRESSMATHS = stressMathCore.$(SrcSuf)
ifeq ($(PLATFORM),win32) ifeq ($(PLATFORM),win32)
STRESSMATHLIBS = '$(ROOTSYS)/lib/libMathCore.lib' STRESSMATHLIBS = '$(ROOTSYS)/lib/libMathCore.lib'
...@@ -351,75 +349,8 @@ endif ...@@ -351,75 +349,8 @@ endif
@echo "$@ done" @echo "$@ done"
#ifneq ($(useReflex),)
libTrackMathCoreRflx.$(DllSuf): TrackMathCoreRflx.$(ObjSuf)
ifeq ($(ARCH),aix)
/usr/ibmcxx/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
else
ifeq ($(ARCH),aix5)
/usr/vacpp/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
else
ifeq ($(PLATFORM),macosx)
# We need to make both the .dylib and the .so
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
ifeq ($(MACOSX_MINOR),4)
ln -sf $@ $(subst .$(DllSuf),.so,$@)
else
$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ \
$(OutPutOpt) $(subst .$(DllSuf),.so,$@)
endif
else
ifeq ($(PLATFORM),win32)
bindexplib $* $^ > $*.def
lib -nologo -MACHINE:IX86 $^ -def:$*.def \
$(OutPutOpt)$(EVENTLIB)
$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(LIBS) \
$(OutPutOpt)$@
$(MT_DLL)
else
$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
endif
endif
endif
endif
@echo "$@ done"
#endif
libTrackMathCoreCint.$(DllSuf): TrackMathCoreCint.$(ObjSuf)
ifeq ($(ARCH),aix)
/usr/ibmcxx/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
else
ifeq ($(ARCH),aix5)
/usr/vacpp/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
else
ifeq ($(PLATFORM),macosx)
# We need to make both the .dylib and the .so
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
ifeq ($(MACOSX_MINOR),4)
ln -sf $@ $(subst .$(DllSuf),.so,$@)
else
$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ \
$(OutPutOpt) $(subst .$(DllSuf),.so,$@)
endif
else
ifeq ($(PLATFORM),win32)
bindexplib $* $^ > $*.def
lib -nologo -MACHINE:IX86 $^ -def:$*.def \
$(OutPutOpt)$(EVENTLIB)
$(LD) $(SOFLAGS) $(LDFLAGS) $^ $*.exp $(LIBS) \
$(OutPutOpt)$@
$(MT_DLL)
else
$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
endif
endif
endif
endif
@echo "$@ done"
$(TRACKMATHLIB): $(TRACKMATHOBJ) $(TRACKMATHLIB): $(TRACKMATHOBJ)
...@@ -439,19 +370,19 @@ else ...@@ -439,19 +370,19 @@ else
$(OutPutOpt) $(subst .$(DllSuf),.so,$@) $(OutPutOpt) $(subst .$(DllSuf),.so,$@)
endif endif
else else
$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(EXPLLINKLIBS) $(OutPutOpt)$@ $(LD) $(SOFLAGS) $(LDFLAGS) $^ $(EXPLLINKLIBS) $(STRESSMATHLIBS) $(OutPutOpt)$@
$(MT_DLL) $(MT_DLL)
#endif
endif endif
endif endif
endif endif
$(STRESSMATH): $(STRESSMATHO) $(TRACKMATHLIB) $(STRESSMATH): $(STRESSMATHO) $(TRACKMATHLIB)
ifeq ($(PLATFORM),win32) ifeq ($(PLATFORM),win32)
$(LD) $(LDFLAGS) $^ $(LIBS) $(STRESSMATHLIBS) $(OutPutOpt)$@ $(LD) $(LDFLAGS) $(STRESSMATHO) $(LIBS) $(STRESSMATHLIBS) $(OutPutOpt)$@
$(MT_EXE) $(MT_EXE)
else else
$(LD) $(LDFLAGS) $^ $(LIBS) $(STRESSMATHLIBS) $(OutPutOpt)$@ $(LD) $(LDFLAGS) $(STRESSMATHO) $(LIBS) $(STRESSMATHLIBS) $(OutPutOpt)$@
endif endif
@echo "$@ done" @echo "$@ done"
......
...@@ -542,7 +542,7 @@ int stressMathMore(double nscale = 1) { ...@@ -542,7 +542,7 @@ int stressMathMore(double nscale = 1) {
TBenchmark bm; TBenchmark bm;
bm.Start("stressMathMore"); bm.Start("stressMathMore");
int n = nscale*100; int n = int(nscale*100);
iret |= testGammaFunction(n); iret |= testGammaFunction(n);
iret |= testBetaFunction(n); iret |= testBetaFunction(n);
......
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