LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Changed the installation path of musrfit...

Browse Source
This commit is contained in:
Bastian M. Wojek 2009-06-12 10:59:59 +00:00
parent eb131cddbb
commit ac7ff10e32
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/classes/Makefile.PMusr
View File

@ -50,7 +50,7 @@ PMUSRPATH = ../include
MNPATH = $(ROOTSYS)/include MNPATH = $(ROOTSYS)/include
GSLPATH = /usr/include/gsl GSLPATH = /usr/include/gsl
BOOSTPATH = /usr/include BOOSTPATH = /usr/include
FFTW3PATH = /usr/local/include FFTW3PATH = /usr/include
LEMPATH = ../external/TLemRunHeader LEMPATH = ../external/TLemRunHeader
PSIBINPATH = ../external/MuSR_software/Class_MuSR_PSI PSIBINPATH = ../external/MuSR_software/Class_MuSR_PSI
INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(BOOSTPATH) -I$(LEMPATH) -I$(PSIBINPATH) -I$(FFTW3PATH) INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(BOOSTPATH) -I$(LEMPATH) -I$(PSIBINPATH) -I$(FFTW3PATH)
@ -174,7 +174,7 @@ musrlib: $(SHLIB)
$(LEMLIB): $(LEMOBJS) $(LEMLIB): $(LEMOBJS)
@echo "---> Building shared library $(LEMLIB) ..." @echo "---> Building shared library $(LEMLIB) ..."
/bin/rm -f $(LEMLIB) /bin/rm -f $(LEMLIB)
$(LD) $(SOFLAGS) $(LDFLAGS) $(LEMOBJS) -o $(LEMLIB) $(LD) $(SOFLAGS) $(LDFLAGS) $(LEMOBJS) -o $(LEMLIB) $(LIBS)
@echo "done" @echo "done"
$(SHLIB): $(OBJS) $(EXTOBJS) $(SHLIB): $(OBJS) $(EXTOBJS)

17
src/musrgui/musrgui.pro
View File

@ -1,17 +1,20 @@
TEMPLATE = app TEMPLATE = app
TARGET = musrgui TARGET = musrgui
target.path = $$(HOME)/analysis/bin unix:target.path = $(ROOTSYS)/bin
macx:target.path = /Applications
exists( /usr/bin/cygwin1.dll ) {
QMAKE_LFLAGS_SHAPP = -Wl,--enable-auto-import
TARGET = musrgui.exe
}
INSTALLS += target INSTALLS += target
QMAKE_CC = gcc QMAKE_CC = gcc
QMAKE_CXX = g++ QMAKE_CXX = g++
exists( /usr/bin/cygwin1.dll ) {
QMAKE_LFLAGS_SHAPP = -Wl,--enable-auto-import
}
# install path for the XML configuration file # install path for the XML configuration file
unix:xml.path = $$(HOME)/analysis/bin/ unix:xml.path = $(ROOTSYS)/bin/
win32:xml.path = $$(HOME)/analysis/bin/ macx:xml.path = $(ROOTSYS)/bin/
xml.files = musrgui_startup.xml xml.files = musrgui_startup.xml
INSTALLS += xml INSTALLS += xml