Added recource file to qmake project file.

Made 'lib' makefiles a bit more portable.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3976 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2014-04-02 17:37:18 +00:00
parent 8e3e86ac71
commit 542c85d8f6
3 changed files with 38 additions and 26 deletions

View File

@ -3,15 +3,20 @@
# C> make > junk1 2>&1 # C> make > junk1 2>&1
# Set paths # Set paths
EXE_DIR = ../../wsjtx_install EXE_DIR = ..\\..\\wsjtx_install
QT_DIR = C:/wsjt-env/Qt5/5.2.1/mingw48_32
INCPATH = -I'C:/wsjt-env/Qt5/5.2.1/mingw48_32/include/QtCore' \ INCPATH = -I${QT_DIR}/include/QtCore -I${QT_DIR}/include
-I'C:/wsjt-env/Qt5/5.2.1/mingw48_32/include/'
# Compilers # Compilers
CC = gcc CC = gcc
CXX = g++ CXX = g++
FC = g95 FC = gfortran
AR = ar cr
RANLIB = ranlib
MKDIR = mkdir -p
CP = cp
RM = rm -f
FFLAGS = -O2 -fbounds-check -Wall -Wno-precision-loss -fno-second-underscore FFLAGS = -O2 -fbounds-check -Wall -Wno-precision-loss -fno-second-underscore
CFLAGS = -I. -fbounds-check -mno-stack-arg-probe CFLAGS = -I. -fbounds-check -mno-stack-arg-probe
@ -50,16 +55,16 @@ OBJS1 = prog_args.o options.o pctile.o graycode.o sort.o ssort.o chkmsg.o \
flat3.o polfit.o determ.o baddata.o flat3.o polfit.o determ.o baddata.o
libjt9.a: $(OBJS1) libjt9.a: $(OBJS1)
ar cr libjt9.a $(OBJS1) $(AR) libjt9.a $(OBJS1)
ranlib libjt9.a $(RANLIB) libjt9.a
OBJS2 = jt9.o jt9a.o jt9b.o jt9c.o ipcomm.o sec_midn.o usleep.o OBJS2 = jt9.o jt9a.o jt9b.o jt9c.o ipcomm.o sec_midn.o usleep.o
LIBS2 = -L'C:/wsjt-env/Qt5/5.2.1/mingw48_32/lib' -lQt5Core LIBS2 = -L${QT_DIR}/lib -lQt5Core
jt9.exe: $(OBJS2) libjt9.a jt9.exe: $(OBJS2) libjt9.a
$(CXX) -o jt9.exe -static $(OBJS2) $(LIBS2) libjt9.a \ $(CXX) -o jt9.exe -static $(OBJS2) $(LIBS2) libjt9.a \
../libfftw3f_win.a c:/MinGW/lib/libf95.a ../libfftw3f_win.a $(shell $(FC) -print-file-name=lib$(FC).a)
mkdir -p $(EXE_DIR) -$(MKDIR) $(EXE_DIR)
cp jt9.exe $(EXE_DIR) $(CP) jt9.exe $(EXE_DIR)
OBJS3 = jt9sim.o OBJS3 = jt9sim.o
jt9sim.exe: $(OBJS3) libjt9.a jt9sim.exe: $(OBJS3) libjt9.a
@ -68,7 +73,7 @@ jt9sim.exe: $(OBJS3) libjt9.a
OBJS4 = jt9code.o OBJS4 = jt9code.o
jt9code.exe: $(OBJS4) libjt9.a jt9code.exe: $(OBJS4) libjt9.a
$(FC) -o jt9code.exe $(OBJS4) libjt9.a $(FC) -o jt9code.exe $(OBJS4) libjt9.a
cp jt9code.exe $(EXE_DIR) $(CP) jt9code.exe $(EXE_DIR)
OBJS5 = jt65.o OBJS5 = jt65.o
jt65.exe: $(OBJS5) libjt9.a jt65.exe: $(OBJS5) libjt9.a
@ -79,13 +84,13 @@ OBJS7 = astrosub.o astro0.o astro.o tm2.o grid2deg.o sun.o moondop.o \
dcoord.o dcoord.o
libastro.a: $(OBJS7) libastro.a: $(OBJS7)
ar cr libastro.a $(OBJS7) $(AR) libastro.a $(OBJS7)
ranlib libastro.a $(RANLIB) libastro.a
OBJS6 = jt65code.o OBJS6 = jt65code.o
jt65code.exe: $(OBJS6) libjt9.a jt65code.exe: $(OBJS6) libjt9.a
$(FC) -o jt65code.exe $(OBJS6) libjt9.a $(FC) -o jt65code.exe $(OBJS6) libjt9.a
cp jt65code.exe $(EXE_DIR) $(CP) jt65code.exe $(EXE_DIR)
sync9.o: sync9.f90 jt9sync.f90 sync9.o: sync9.f90 jt9sync.f90
$(FC) $(FFLAGS) -c sync9.f90 $(FC) $(FFLAGS) -c sync9.f90
@ -133,4 +138,4 @@ decode_rs.o: decode_rs.c
.PHONY : clean .PHONY : clean
clean: clean:
rm -f *.o libjt9.a wsjtx.exe jt9sim.exe jt9.exe jt65.exe $(RM) *.o libjt9.a wsjtx.exe jt9sim.exe jt9.exe jt65.exe

View File

@ -1,10 +1,16 @@
# Set paths # Set paths
EXE_DIR = ../../wsjtx_install EXE_DIR = ../../wsjtx_install
INCPATH = -I/usr/include/qt5 -I/usr/include/qt5/QtCore QT_DIR = /usr/include/qt5
INCPATH = -I${QT_DIR} -I${QT_DIR}/QtCore
CC = gcc CC = gcc
CXX = g++ CXX = g++
FC = gfortran FC = gfortran
AR = ar cr
MKDIR = mkdir -p
CP = cp
RANLIB = ranlib
RM = rm -f
FFLAGS = -O2 -fbounds-check -Wall -Wno-conversion -fno-second-underscore \ FFLAGS = -O2 -fbounds-check -Wall -Wno-conversion -fno-second-underscore \
-fPIE -DUNIX -fPIE -DUNIX
@ -45,15 +51,15 @@ OBJS1 = prog_args.o options.o pctile.o graycode.o sort.o ssort.o chkmsg.o \
flat3.o polfit.o determ.o baddata.o flat3.o polfit.o determ.o baddata.o
libjt9.a: $(OBJS1) libjt9.a: $(OBJS1)
ar cr libjt9.a $(OBJS1) $(AR) libjt9.a $(OBJS1)
ranlib libjt9.a $(RANLIB) libjt9.a
OBJS2 = jt9.o jt9a.o jt9b.o jt9c.o OBJS2 = jt9.o jt9a.o jt9b.o jt9c.o
jt9: $(OBJS2) libjt9.a jt9: $(OBJS2) libjt9.a
$(CXX) -o jt9 $(OBJS2) -L. -ljt9 -lQt5Core -lfftw3f `$(FC) -print-file-name=libgfortran.so` $(CXX) -o jt9 $(OBJS2) -L. -ljt9 -lQt5Core -lfftw3f `$(FC) -print-file-name=libgfortran.so`
mkdir -p $(EXE_DIR) $(MKDIR) -p $(EXE_DIR)
cp jt9 $(EXE_DIR) $(CP) jt9 $(EXE_DIR)
OBJS3 = jt9sim.o OBJS3 = jt9sim.o
jt9sim: $(OBJS3) libjt9.a jt9sim: $(OBJS3) libjt9.a
@ -62,12 +68,12 @@ jt9sim: $(OBJS3) libjt9.a
OBJS4 = jt9code.o OBJS4 = jt9code.o
jt9code: $(OBJS4) libjt9.a jt9code: $(OBJS4) libjt9.a
$(FC) -o jt9code $(OBJS4) -L. -ljt9 $(FC) -o jt9code $(OBJS4) -L. -ljt9
cp jt9code $(EXE_DIR) $(CP) jt9code $(EXE_DIR)
OBJS6 = jt65code.o OBJS6 = jt65code.o
jt65code: $(OBJS6) libjt9.a jt65code: $(OBJS6) libjt9.a
$(FC) -o jt65code $(OBJS6) libjt9.a $(FC) -o jt65code $(OBJS6) libjt9.a
cp jt65code $(EXE_DIR) $(CP) jt65code $(EXE_DIR)
sync9.o: sync9.f90 jt9sync.f90 sync9.o: sync9.f90 jt9sync.f90
$(FC) $(FFLAGS) -c sync9.f90 $(FC) $(FFLAGS) -c sync9.f90
@ -105,4 +111,4 @@ decode_rs.o: decode_rs.c
.PHONY : clean .PHONY : clean
clean: clean:
rm -f *.o libjt9.a wsjtx jt9sim jt9 jt9code $(RM) *.o libjt9.a wsjtx jt9sim jt9 jt9code

View File

@ -109,6 +109,7 @@ FORMS += mainwindow.ui about.ui Configuration.ui widegraph.ui astro.ui \
logqso.ui wf_palette_design_dialog.ui logqso.ui wf_palette_design_dialog.ui
RC_FILE = wsjtx.rc RC_FILE = wsjtx.rc
RESOURCES = wsjtx.qrc
unix { unix {
LIBS += -L lib -ljt9 LIBS += -L lib -ljt9
@ -117,9 +118,9 @@ LIBS += -lfftw3f $$system($$F90 -print-file-name=libgfortran.so)
} }
win32 { win32 {
INCLUDEPATH += ${HAMLIB_DIR}/include INCLUDEPATH += $(HAMLIB_DIR)/include
LIBS += -L${HAMLIB_DIR}/lib -lhamlib LIBS += -L$(HAMLIB_DIR)/lib -lhamlib
#LIBS += -L${HAMLIB_DIR}/lib -lhamlib #LIBS += -L$(HAMLIB_DIR)/lib -lhamlib
LIBS += -L./lib -lastro -ljt9 LIBS += -L./lib -lastro -ljt9
LIBS += -L. -lfftw3f_win LIBS += -L. -lfftw3f_win
LIBS += -lwsock32 LIBS += -lwsock32