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

Restoring original Makefiles, accidentally changed

Browse Source
This commit is contained in:
Bastian M. Wojek 2009-06-19 20:40:00 +00:00
parent b5016637fd
commit f7fa4696b2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/classes/Makefile.PMusr
View File

@ -44,7 +44,7 @@ endif
# -- Linux # -- Linux
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
CXX = g++-4.2.4 CXX = g++
CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC
PMUSRPATH = ../include PMUSRPATH = ../include
MNPATH = $(ROOTSYS)/include MNPATH = $(ROOTSYS)/include
@ -54,7 +54,7 @@ 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)
LD = g++-4.2.4 LD = g++
LDFLAGS = -O LDFLAGS = -O
SOFLAGS = -shared SOFLAGS = -shared
LEMLIB = libTLemRunHeader.so LEMLIB = libTLemRunHeader.so

4
src/classes/Makefile.PUserFcn
View File

@ -34,10 +34,10 @@ endif
# -- Linux # -- Linux
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
CXX = g++-4.3.3 CXX = g++
CXXFLAGS = -Wall -Wno-trigraphs -fPIC CXXFLAGS = -Wall -Wno-trigraphs -fPIC
INCLUDES = -I../include INCLUDES = -I../include
LD = g++-4.3.3 LD = g++
LDFLAGS = -g LDFLAGS = -g
SOFLAGS = -O -shared SOFLAGS = -O -shared
endif endif

4
src/musrgui/musrgui.pro
View File

@ -9,8 +9,8 @@ exists( /usr/bin/cygwin1.dll ) {
} }
INSTALLS += target INSTALLS += target
QMAKE_CC = gcc-4.2.4 QMAKE_CC = gcc
QMAKE_CXX = g++-4.2.4 QMAKE_CXX = g++
# install path for the XML configuration file # install path for the XML configuration file
unix:xml.path = $(ROOTSYS)/bin/ unix:xml.path = $(ROOTSYS)/bin/