detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-20 18:45:27 +01:00
Code Issues Actions Packages Releases Activity

project file finally ok

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@116 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
bergamaschi
2012-11-22 10:11:54 +00:00
parent 90e219d402
commit 95741a1c33
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorGui/Makefile
View File

@@ -1,6 +1,6 @@
PROG= $(DESTDIR)/slsDetectorGui PROG= $(DESTDIR)/slsDetectorGui
DIR= $(shell ls src/* slsDetectorPlotting/include/* slsDetectorPlotting/src/* include/* forms/include/*) #DIR= $(shell ls src/* slsDetectorPlotting/include/* slsDetectorPlotting/src/* include/ forms/*)
DESTDIR?=bin DESTDIR?=bin
DOCDIR?=docs DOCDIR?=docs
LIBDIR?=../slsDetectorSoftware LIBDIR?=../slsDetectorSoftware
@@ -17,7 +17,7 @@ clean:
Makefile.gui: mm Makefile.gui: mm
mm: mm:
qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)' qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)'
doc: doc:
cd manual && make DESTDIR=$(DOCDIR) cd manual && make DESTDIR=$(DOCDIR)

18
slsDetectorGui/slsDetectorGui.pro
View File

@@ -7,7 +7,17 @@ UI_HEADERS_DIR = forms/include
SLSDETLIB ?=../slsDetectorSoftware SLSDETLIB ?=../slsDetectorSoftware
RESOURCES += icons.qrc RESOURCES += icons.qrc
CONFIG += debug CONFIG += debug no_include_pwd
QMAKE_INCDIR_QT = $(QTDIR)/include/
QMAKE_LIBS_QT = -L$(QTDIR)/lib
QMAKE_LIBS = -L$(QTDIR)/lib
QMAKE_UIC = $(QTDIR)/bin/uic
QMAKE_MOC = $(QTDIR)/bin/moc
QMAKE_RCC = $(QTDIR)/bin/rcc
QMAKE_CXXFLAGS_WARN_ON = -w QMAKE_CXXFLAGS_WARN_ON = -w
QMAKE_CFLAGS_WARN_ON = -w QMAKE_CFLAGS_WARN_ON = -w
@@ -26,16 +36,14 @@ QMAKE_CLEAN += docs/*/*
#LIBS += -Wl,-Bstatic -L../slsDetectorSoftware -lSlsDetector -Wl,-Bdynamic\ #LIBS += -Wl,-Bstatic -L../slsDetectorSoftware -lSlsDetector -Wl,-Bdynamic\
# -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib # -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib
LIBS += -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib
DEPENDPATH += \ DEPENDPATH += \
slsDetectorPlotting/include\ slsDetectorPlotting/include\
include\ include\
forms/include forms/include
INCLUDEPATH = \
INCLUDEPATH += \
$(QWTDIR)/include\ $(QWTDIR)/include\
$(QWTDIR) \ $(QWTDIR) \
$(QWTDIR)/src\ $(QWTDIR)/src\