mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-04 16:31:17 -05:00
Makefiles should create EXE_DIR if it does not exist.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3503 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
560d20cc9d
commit
34a7d4befa
@ -2,7 +2,16 @@
|
|||||||
# Windows re-direct:
|
# Windows re-direct:
|
||||||
# C> make > junk1 2>&1
|
# C> make > junk1 2>&1
|
||||||
|
|
||||||
|
# Set paths
|
||||||
|
EXE_DIR = ../../wsjtx_install
|
||||||
|
INCPATH = -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/QtCore' \
|
||||||
|
-I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include' \
|
||||||
|
-I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/ActiveQt' \
|
||||||
|
-I'release' -I'.' -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/mkspecs/win32-g++'
|
||||||
|
|
||||||
|
# Compilers
|
||||||
CC = gcc
|
CC = gcc
|
||||||
|
CXX = g++
|
||||||
FC = g95
|
FC = g95
|
||||||
|
|
||||||
FFLAGS = -O2 -fbounds-check -Wall -Wno-precision-loss -fno-second-underscore
|
FFLAGS = -O2 -fbounds-check -Wall -Wno-precision-loss -fno-second-underscore
|
||||||
@ -47,9 +56,10 @@ libjt9.a: $(OBJS1)
|
|||||||
OBJS2 = jt9.o jt9a.o jt9b.o jt9c.o ipcomm.o sec_midn.o cutil.o
|
OBJS2 = jt9.o jt9a.o jt9b.o jt9c.o ipcomm.o sec_midn.o cutil.o
|
||||||
LIBS2 = -L'c:/QtSDK/Desktop/Qt/4.7.4/mingw/lib' -lQtCore4
|
LIBS2 = -L'c:/QtSDK/Desktop/Qt/4.7.4/mingw/lib' -lQtCore4
|
||||||
jt9.exe: $(OBJS2) libjt9.a
|
jt9.exe: $(OBJS2) libjt9.a
|
||||||
g++ -o jt9.exe $(OBJS2) $(LIBS2) libjt9.a ../libfftw3f_win.a \
|
$(CXX) -o jt9.exe $(OBJS2) $(LIBS2) libjt9.a ../libfftw3f_win.a \
|
||||||
c:/MinGW/lib/libf95.a
|
c:/MinGW/lib/libf95.a
|
||||||
cp jt9.exe ../../wsjtx_install
|
mkdir -p $(EXE_DIR)
|
||||||
|
cp jt9.exe $(EXE_DIR)
|
||||||
|
|
||||||
OBJS3 = jt9sim.o
|
OBJS3 = jt9sim.o
|
||||||
jt9sim.exe: $(OBJS3) libjt9.a
|
jt9sim.exe: $(OBJS3) libjt9.a
|
||||||
@ -63,11 +73,6 @@ OBJS5 = jt65.o
|
|||||||
jt65.exe: $(OBJS5) libjt9.a
|
jt65.exe: $(OBJS5) libjt9.a
|
||||||
$(FC) -o jt65.exe $(OBJS5) libjt9.a ../libfftw3f_win.a
|
$(FC) -o jt65.exe $(OBJS5) libjt9.a ../libfftw3f_win.a
|
||||||
|
|
||||||
INCPATH = -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/QtCore' \
|
|
||||||
-I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include' \
|
|
||||||
-I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/ActiveQt' \
|
|
||||||
-I'release' -I'.' -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/mkspecs/win32-g++'
|
|
||||||
|
|
||||||
sync9.o: sync9.f90 jt9sync.f90
|
sync9.o: sync9.f90 jt9sync.f90
|
||||||
$(FC) $(FFLAGS) -c sync9.f90
|
$(FC) $(FFLAGS) -c sync9.f90
|
||||||
|
|
||||||
@ -90,7 +95,7 @@ unpackmsg.o: unpackmsg.f90
|
|||||||
$(FC) -c -O0 -fbounds-check -Wall -Wno-precision-loss unpackmsg.f90
|
$(FC) -c -O0 -fbounds-check -Wall -Wno-precision-loss unpackmsg.f90
|
||||||
|
|
||||||
ipcomm.o: ipcomm.cpp
|
ipcomm.o: ipcomm.cpp
|
||||||
g++ -c $(INCPATH) ipcomm.cpp
|
$(CXX) -c $(INCPATH) ipcomm.cpp
|
||||||
|
|
||||||
sec_midn.o: sec_midn.f90
|
sec_midn.o: sec_midn.f90
|
||||||
$(FC) -c -fno-second-underscore sec_midn.f90
|
$(FC) -c -fno-second-underscore sec_midn.f90
|
||||||
|
@ -1,4 +1,9 @@
|
|||||||
|
# Set paths
|
||||||
|
EXE_DIR = ../../wsjtx_install
|
||||||
|
INCPATH = -I'/usr/include/qt4' -I'/usr/include/qt4/QtCore'
|
||||||
|
|
||||||
CC = gcc
|
CC = gcc
|
||||||
|
CXX = g++
|
||||||
FC = gfortran
|
FC = gfortran
|
||||||
|
|
||||||
FFLAGS = -O2 -fbounds-check -Wall -Wno-conversion -fno-second-underscore
|
FFLAGS = -O2 -fbounds-check -Wall -Wno-conversion -fno-second-underscore
|
||||||
@ -44,8 +49,9 @@ libjt9.a: $(OBJS1)
|
|||||||
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
|
||||||
g++ -o jt9 $(OBJS2) libjt9.a -lfftw3f -lgfortran -lQtCore
|
$(CXX) -o jt9 $(OBJS2) libjt9.a -lfftw3f -lgfortran -lQtCore
|
||||||
cp jt9 ../../wsjtx_install
|
mkdir -p $(EXE_DIR)
|
||||||
|
cp jt9 $(EXE_DIR)
|
||||||
|
|
||||||
OBJS3 = jt9sim.o
|
OBJS3 = jt9sim.o
|
||||||
jt9sim: $(OBJS3) libjt9.a
|
jt9sim: $(OBJS3) libjt9.a
|
||||||
@ -55,16 +61,6 @@ OBJS4 = jt9code.o
|
|||||||
jt9code: $(OBJS4) libjt9.a
|
jt9code: $(OBJS4) libjt9.a
|
||||||
$(FC) -o jt9code $(OBJS4) libjt9.a
|
$(FC) -o jt9code $(OBJS4) libjt9.a
|
||||||
|
|
||||||
#INCPATH = -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/QtCore' \
|
|
||||||
# -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include' \
|
|
||||||
# -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/ActiveQt' \
|
|
||||||
# -I'release' -I'.' -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/mkspecs/win32-g++'
|
|
||||||
|
|
||||||
INCPATH = -I'/usr/include/qt4' -I'/usr/include/qt4/QtCore'
|
|
||||||
|
|
||||||
#jt9.o: jt9.f90
|
|
||||||
# $(FC) -O0 -c jt9.f90
|
|
||||||
|
|
||||||
sync9.o: sync9.f90 jt9sync.f90
|
sync9.o: sync9.f90 jt9sync.f90
|
||||||
$(FC) $(FFLAGS) -c sync9.f90
|
$(FC) $(FFLAGS) -c sync9.f90
|
||||||
|
|
||||||
@ -84,7 +80,7 @@ redsync.o: redsync.f90 jt9sync.f90
|
|||||||
$(FC) $(FFLAGS) -c redsync.f90
|
$(FC) $(FFLAGS) -c redsync.f90
|
||||||
|
|
||||||
ipcomm.o: ipcomm.cpp
|
ipcomm.o: ipcomm.cpp
|
||||||
g++ -c $(INCPATH) ipcomm.cpp
|
$(CXX) -c $(INCPATH) ipcomm.cpp
|
||||||
|
|
||||||
sec_midn.o: sec_midn.f90
|
sec_midn.o: sec_midn.f90
|
||||||
$(FC) -c -fno-second-underscore sec_midn.f90
|
$(FC) -c -fno-second-underscore sec_midn.f90
|
||||||
|
@ -25,7 +25,6 @@ program jt9
|
|||||||
if(arg(1:2).eq.'-s') then
|
if(arg(1:2).eq.'-s') then
|
||||||
! Multiple instances:
|
! Multiple instances:
|
||||||
call getarg(2,arg)
|
call getarg(2,arg)
|
||||||
i0=len(trim(arg))
|
|
||||||
call jt9a(trim(arg))
|
call jt9a(trim(arg))
|
||||||
go to 999
|
go to 999
|
||||||
endif
|
endif
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
//------------------------------------------------------------ MainWindow
|
//------------------------------------------------------------- MainWindow
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
#include "ui_mainwindow.h"
|
#include "ui_mainwindow.h"
|
||||||
#include "devsetup.h"
|
#include "devsetup.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user