From 43342e8b6faa93fa07c9de2092eee9fc2aa6d3aa Mon Sep 17 00:00:00 2001 From: Hideki Shimizu Date: Fri, 24 Jan 2020 14:12:34 +0900 Subject: [PATCH] debug print.h --- .gitignore | 1 + include/TSMerger.h | 2 +- makefile | 8 ++++---- src/main.cpp | 3 +-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 8c6a4dd..78711f7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ objs run *.root dict/* +lib/* tmp diff --git a/include/TSMerger.h b/include/TSMerger.h index 0e99738..4f1e94e 100644 --- a/include/TSMerger.h +++ b/include/TSMerger.h @@ -7,7 +7,7 @@ #include -#include "Print.h" +#include "print.h" #include #include diff --git a/makefile b/makefile index 23c31a2..736addc 100644 --- a/makefile +++ b/makefile @@ -35,8 +35,8 @@ PYTHON = python3 # Don't change the following #--------------------------------------------------------------- -GCC = g++ -CFLAGS = -g -MMD -MP -Wall -O2 $(shell root-config --cflags) +GCC = /bin/g++ -std=c++11 +CFLAGS = -g -fPIC -MMD -MP -Wall -O2 $(shell root-config --cflags) LDFLAGS = $(shell root-config --libs) LIBS = lib/libclass.so @@ -67,8 +67,8 @@ default: class: $(PYTHON) $(CLASSDIR)/make_dict.py $(CLASSDIR)/include - rootcint -f $(CLASSDIR)/$(DICTNAME).cxx -c $(CLASSES) $(DICTDIR)/Linkdef.h - $(GCC) `root-config --cflags --libs` -shared $(CLASSDIR)/$(DICTNAME).cxx $(CLASSESCPP) -o $(CLASSLIB)/libclass.so + rootcling -f $(CLASSDIR)/$(DICTNAME).cxx -c $(CLASSES) $(DICTDIR)/Linkdef.h + $(GCC) -fPIC `root-config --cflags --libs` -shared $(CLASSDIR)/$(DICTNAME).cxx $(CLASSESCPP) -o $(CLASSLIB)/libclass.so rm $(CLASSDIR)/Dict.cxx mv $(CLASSDIR)/$(DICTNAME)_rdict.pcm $(CLASSLIB)/ # echo "Make completed" diff --git a/src/main.cpp b/src/main.cpp index eef5ab6..148e9e9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,7 +3,7 @@ #include "TSTreeObject.h" -#include "Print.h" +#include "print.h" #include "utils.h" #include "classdef.h" @@ -105,7 +105,6 @@ int main(int argc, char **argv) start = std::chrono::system_clock::now(); - TFile *file1 = new TFile("test1.root"); TTree *tree1 = (TTree*)file1->Get("tree"); TSTreeObject t1(tree1, "classA"); -- GitLab