Commit 1b085188 authored by Tobias WEBER's avatar Tobias WEBER

small bugfixes

parent 77f993c4
......@@ -47,7 +47,7 @@ include_directories("${Minuit2_INCLUDE_DIRS}")
file(GLOB lang "lang/*.cpp" "lang/*.h" "${PROJECT_SOURCE_DIR}/script.cc" "${PROJECT_SOURCE_DIR}/tokens.h")
file(GLOB runtime "runtime/*.cpp" "runtime/*.h")
file(GLOB tlibs
"../math/linalg2.cpp" "../math/rand.cpp" "../math/fourier.cpp"
"../math/linalg2.cpp" "../math/rand.cpp"
"../string/spec_char.cpp"
"../gfx/gnuplot.cpp"
"../file/file.cpp"
......@@ -55,17 +55,17 @@ file(GLOB tlibs
)
add_executable(hermelin
add_executable(hermelin
${lang} ${runtime} ${tlibs} "${PROJECT_SOURCE_DIR}/script.cc" "${PROJECT_SOURCE_DIR}/tokens.h"
)
target_link_libraries(hermelin
target_link_libraries(hermelin
${Boost_LIBRARIES} Threads::Threads ${Minuit2_LIBRARIES}
)
add_custom_command(TARGET hermelin POST_BUILD
COMMAND strip hermelin
add_custom_command(TARGET hermelin POST_BUILD
COMMAND strip hermelin
MAIN_DEPENDENCY hermelin
)
......
......@@ -20,7 +20,7 @@ module_init()
# omega = phi / tau
phi2dE(phi, tau)
{
{
return phi*hbar_mueVps / tau;
}
......
......@@ -89,7 +89,7 @@ all: hermelin
hermelin: obj/script.o obj/lexer.o obj/main.o obj/yylexer.o obj/symbol.o obj/node.o \
obj/node_eval.o obj/calls.o obj/handles.o \
obj/rand.o obj/fourier.o obj/script_helper.o \
obj/rand.o obj/script_helper.o \
obj/calls_basic.o obj/info.o \
obj/calls_plot.o obj/calls_math.o obj/calls_file.o obj/calls_thread.o \
obj/calls_fit.o obj/globals.o obj/flags.o \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment