1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
--- src/go4-6.0.0/Makefile.config 2019-10-25 12:45:46.709957747 +0200
+++ Makefile.config 2019-12-19 21:09:15.698546160 +0100
@@ -78,6 +78,7 @@
endif
endif
+INCLUDES += -I/usr/include
ifdef USEHDF5
INCLUDES += -I$(HDF5INCLUDEPATH)
@@ -130,7 +131,7 @@
QMAKEOPTFLAG = "CONFIG+=release"
-QMAKEFLAGS = "QMAKE_CXXFLAGS=$(WARNINGS) $(QTGO4DEFINITIONS)" "QMAKE_CXXFLAGS_RELEASE = -O2" "QMAKE_CFLAGS_RELEASE = -O2"
+QMAKEFLAGS = "QMAKE_CXXFLAGS=$(WARNINGS) $(QTGO4DEFINITIONS) -std=c++17" "QMAKE_CXXFLAGS_RELEASE = -O2" "QMAKE_CFLAGS_RELEASE = -O2"
ifeq ($(GO4_OS),Win32)
QMAKEFLAGS += "INCLUDEPATH+=$(shell cygpath -w $(ROOTINCPATH))" "DEPENDPATH+=$(shell cygpath -w $(ROOTINCPATH))"
@@ -277,7 +278,7 @@
-lMinuit \
$(if $(USESPECTRUM),-lSpectrum,) \
$(if $(USEXMLIO),-lXMLIO,) \
- -L$(GO4LIBPATH)
+ -Llib
ifneq ($(USERT),false)
LIBS_BASESET += -lrt
@@ -296,7 +297,7 @@
$(if $(USEDIM),-L$(DIMLIBPATH) -ldim,) \
$(if $(LINKX11),-L/usr/X11R6/lib/ -lX11,) \
$(if $(GO4_X11),-L/usr/lib/ -lX11,) \
- -L$(GO4LIBPATH) \
+ -L../../lib \
$(call go4ldname,Go4Fit) \
$(call go4ldname,Go4Base) \
$(call go4ldname,Go4ThreadManager) \
|