Skip to content

Commit 83ead4e

Browse files
isabekovisabekov
committed
General refactoring. Makefile is shortened.
1 parent 9d5762b commit 83ead4e

33 files changed

+153
-253
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*.o
2+
*.bit
3+
*.exe

‎Makefile

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,19 @@
1-
GCC = g++ -I.
2-
DEFINES =
3-
CPPFLAGS = -g -Wall -O2 -Wnarrowing -std=c++11
4-
INCPATH =
1+
CXX = g++
2+
CXXFLAGS = -c -g -Wall -O2 -Wnarrowing -std=c++11
53
LINK = g++
6-
LFLAGS = -g -O2
7-
LIBS = -L. -lftdi -lusb
4+
LFLAGS = -g -O2 -v
5+
LIBS = -lftdi
6+
VPATH = src
7+
SRC_FILES = butterfly.c jtag.c iobase.c ioftdi.c bitfile.c tools.c devicedb.c progalgspi.c progalgxc3s.c
8+
OBJ_FILES = $(patsubst %.c, %.o, $(addprefix $(VPATH)/, $(SRC_FILES)))
9+
DEP_FILES = $(OBJ_FILES:.o=.d)
810

9-
fireprog: butterfly.o jtag.o iobase.o ioftdi.o bitfile.o tools.o devicedb.o progalgspi.o progalgxc3s.o
10-
$(LINK) $(LIBS) $^ -o $@
11+
fireprog: $(OBJ_FILES)
12+
$(LINK) $(LFLAGS) $(LIBS) $^ -o $@
1113

12-
butterfly.o: butterfly.cpp io_exception.h jtag.h ioftdi.h devicedb.h progalgxc3s.h progalgspi.h bitfile.h
13-
$(GCC) -c $(CPPFLAGS) $(INCPATH) -o butterfly.o butterfly.cpp
14-
15-
bitfile.o: bitfile.cpp bitfile.h
16-
$(GCC) -c $(CPPFLAGS) $(INCPATH) -o bitfile.o bitfile.cpp
17-
18-
ioftdi.o: ioftdi.cpp ioftdi.h io_exception.h
19-
$(GCC) -c $(CPPFLAGS) $(INCPATH) -o ioftdi.o ioftdi.cpp
20-
21-
jtag.o: jtag.cpp jtag.h
22-
$(GCC) -c $(CPPFLAGS) $(INCPATH) -o jtag.o jtag.cpp
23-
24-
iobase.o: iobase.cpp iobase.h
25-
$(GCC) -c $(CPPFLAGS) $(INCPATH) -o iobase.o iobase.cpp
26-
27-
devicedb.o: devicedb.cpp devicedb.h devlist.h
28-
$(GCC) -c $(CPPFLAGS) $(INCPATH) -o devicedb.o devicedb.cpp
29-
30-
tools.o: tools.cpp tools.h config.h
31-
$(GCC) -c $(CPPFLAGS) $(INCPATH) -o tools.o tools.cpp
32-
33-
progalgxc3s.o: progalgxc3s.cpp progalgxc3s.h
34-
$(GCC) -c $(CPPFLAGS) $(INCPATH) -o progalgxc3s.o progalgxc3s.cpp
35-
36-
progalgspi.o: progalgspi.cpp progalgspi.h config.h
37-
$(GCC) -c $(CPPFLAGS) $(INCPATH) -o progalgspi.o progalgspi.cpp
14+
$(OBJ_FILES): %.o: %.cpp
15+
$(CXX) $(CXXFLAGS) -MMD -MF $(patsubst %.o,%.d,$@) -o $@ $<
3816

3917
clean:
40-
rm -rf *.o fireprog
18+
rm -f $(DEP_FILES) $(OBJ_FILES) fireprog
19+

‎Makefile.MacOS

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎Makefile.MacOS_libftd2xx

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
CXX = x86_64-apple-darwin15-g++
2+
CXXFLAGS = -c -g -O2 -Wno-narrowing -std=c++98 -mmacosx-version-min=10.8 -v
3+
INCPATH = -I ../libftd2xx/D2XX
4+
LINK = x86_64-apple-darwin15-g++
5+
LFLAGS = -g -O2 -v -static-libgcc -mmacosx-version-min=10.8 -lobjc -framework IOKit -framework CoreFoundation
6+
LIBS = -lftd2xx -L ../libftd2xx/D2XX
7+
VPATH = src
8+
SRC_FILES = butterfly.c jtag.c iobase.c ioftdi.c bitfile.c tools.c devicedb.c progalgspi.c progalgxc3s.c
9+
OBJ_FILES = $(patsubst %.c, %.o, $(addprefix $(VPATH)/, $(SRC_FILES)))
10+
DEP_FILES = $(OBJ_FILES:.o=.d)
11+
12+
13+
fireprog: $(OBJ_FILES)
14+
$(LINK) $(LFLAGS) $(LIBS) $^ -o $@
15+
16+
$(OBJ_FILES): %.o: %.cpp
17+
$(CXX) $(CXXFLAGS) $(INCPATH) -MMD -MF $(patsubst %.o,%.d,$@) -o $@ $<
18+
19+
clean:
20+
rm -f $(DEP_FILES) $(OBJ_FILES) fireprog
21+

‎Makefile.MinGW32Dynamic

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,25 @@
1-
GCC = /usr/bin/i686-w64-mingw32-g++
2-
WINDRES = /usr/bin/i686-w64-mingw32-windres
1+
CXX = i686-w64-mingw32-g++
2+
CXXFLAGS = -c -g -O2 -v
33
DEFINES = -DWINDOWS=1
4-
CPPFLAGS = -g -Wall -O2
5-
INCPATH = -I. -I ../libftd2xx/
6-
LINK = /usr/bin/i686-w64-mingw32-g++
7-
LFLAGS = -g -O2 -s
8-
LIBS = -L ../libftd2xx/i386/ -lftd2xx
4+
INCPATH = -I ../libftd2xx/
5+
WINDRES = i686-w64-mingw32-windres
6+
LINK = i686-w64-mingw32-g++
7+
LFLAGS = -g -O2 -v
8+
LIBS = -lftd2xx -L ../libftd2xx/i386/
9+
VPATH = src
10+
SRC_FILES = butterfly.c jtag.c iobase.c ioftdi.c bitfile.c tools.c devicedb.c progalgspi.c progalgxc3s.c
11+
OBJ_FILES = $(patsubst %.c, %.o, $(addprefix $(VPATH)/, $(SRC_FILES)))
12+
DEP_FILES = $(OBJ_FILES:.o=.d)
913

10-
fireprog.exe: butterfly.o jtag.o iobase.o ioftdi.o bitfile.o tools.o devicedb.o progalgspi.o progalgxc3s.o fireprog_res.o
11-
$(LINK) $(LFLAGS) $^ -o $@ $(LIBS)
1214

13-
butterfly.o: butterfly.cpp io_exception.h jtag.h ioftdi.h devicedb.h progalgxc3s.h progalgspi.h bitfile.h
14-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o butterfly.o butterfly.cpp
15+
fireprog.exe: $(OBJ_FILES) src/fireprog_res.o
16+
$(LINK) $^ -o $@ $(LFLAGS) $(LIBS)
1517

16-
bitfile.o: bitfile.cpp bitfile.h
17-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o bitfile.o bitfile.cpp
18+
$(OBJ_FILES): %.o: %.cpp
19+
$(CXX) $(CXXFLAGS) $(INCPATH) $(DEFINES) -MMD -MF $(patsubst %.o,%.d,$@) -o $@ $<
1820

19-
ioftdi.o: ioftdi.cpp ioftdi.h io_exception.h
20-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o ioftdi.o ioftdi.cpp
21-
22-
jtag.o: jtag.cpp jtag.h
23-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o jtag.o jtag.cpp
24-
25-
iobase.o: iobase.cpp iobase.h
26-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o iobase.o iobase.cpp
27-
28-
devicedb.o: devicedb.cpp devicedb.h devlist.h
29-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o devicedb.o devicedb.cpp
30-
31-
tools.o: tools.cpp tools.h config.h
32-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o tools.o tools.cpp
33-
34-
progalgxc3s.o: progalgxc3s.cpp progalgxc3s.h
35-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o progalgxc3s.o progalgxc3s.cpp
36-
37-
progalgspi.o: progalgspi.cpp progalgspi.h config.h
38-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o progalgspi.o progalgspi.cpp
39-
40-
fireprog_res.o: fireprog.rc fireprog.manifest
21+
src/fireprog_res.o: fireprog.rc fireprog.manifest
4122
$(WINDRES) --codepage=65001 -i $< -o $@
4223

4324
clean:
44-
rm -rf *.o *.exe
25+
rm -f $(DEP_FILES) $(OBJ_FILES) fireprog.exe src/fireprog_res.o

‎Makefile.MinGW32Static

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,25 @@
1-
GCC = /usr/bin/i686-w64-mingw32-g++
2-
WINDRES = /usr/bin/i686-w64-mingw32-windres
1+
CXX = i686-w64-mingw32-g++
2+
CXXFLAGS = -c -g -O2 -v
33
DEFINES = -DWINDOWS=1
4-
CPPFLAGS = -g -Wall -O2
5-
INCPATH = -I. -I ../libftd2xx/
6-
LINK = /usr/bin/i686-w64-mingw32-g++
7-
LFLAGS = -g -O2 -s -static
8-
LIBS = -L ../libftd2xx/i386/ -lftd2xx
4+
INCPATH = -I ../libftd2xx/
5+
WINDRES = i686-w64-mingw32-windres
6+
LINK = i686-w64-mingw32-g++
7+
LFLAGS = -g -O2 -v -static
8+
LIBS = -lftd2xx -L ../libftd2xx/Static/i386/
9+
VPATH = src
10+
SRC_FILES = butterfly.c jtag.c iobase.c ioftdi.c bitfile.c tools.c devicedb.c progalgspi.c progalgxc3s.c
11+
OBJ_FILES = $(patsubst %.c, %.o, $(addprefix $(VPATH)/, $(SRC_FILES)))
12+
DEP_FILES = $(OBJ_FILES:.o=.d)
913

10-
fireprog.exe: butterfly.o jtag.o iobase.o ioftdi.o bitfile.o tools.o devicedb.o progalgspi.o progalgxc3s.o fireprog_res.o
11-
$(LINK) $(LFLAGS) $^ -o $@ $(LIBS)
1214

13-
butterfly.o: butterfly.cpp io_exception.h jtag.h ioftdi.h devicedb.h progalgxc3s.h progalgspi.h bitfile.h
14-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o butterfly.o butterfly.cpp
15+
fireprog.exe: $(OBJ_FILES) src/fireprog_res.o
16+
$(LINK) $^ -o $@ $(LFLAGS) $(LIBS)
1517

16-
bitfile.o: bitfile.cpp bitfile.h
17-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o bitfile.o bitfile.cpp
18+
$(OBJ_FILES): %.o: %.cpp
19+
$(CXX) $(CXXFLAGS) $(INCPATH) $(DEFINES) -MMD -MF $(patsubst %.o,%.d,$@) -o $@ $<
1820

19-
ioftdi.o: ioftdi.cpp ioftdi.h io_exception.h
20-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o ioftdi.o ioftdi.cpp
21-
22-
jtag.o: jtag.cpp jtag.h
23-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o jtag.o jtag.cpp
24-
25-
iobase.o: iobase.cpp iobase.h
26-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o iobase.o iobase.cpp
27-
28-
devicedb.o: devicedb.cpp devicedb.h devlist.h
29-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o devicedb.o devicedb.cpp
30-
31-
tools.o: tools.cpp tools.h config.h
32-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o tools.o tools.cpp
33-
34-
progalgxc3s.o: progalgxc3s.cpp progalgxc3s.h
35-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o progalgxc3s.o progalgxc3s.cpp
36-
37-
progalgspi.o: progalgspi.cpp progalgspi.h config.h
38-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o progalgspi.o progalgspi.cpp
39-
40-
fireprog_res.o: fireprog.rc fireprog.manifest
21+
src/fireprog_res.o: fireprog.rc fireprog.manifest
4122
$(WINDRES) --codepage=65001 -i $< -o $@
4223

4324
clean:
44-
rm -rf *.o *.exe
25+
rm -f $(DEP_FILES) $(OBJ_FILES) fireprog.exe src/fireprog_res.o

‎Makefile.MinGW64Dynamic

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,25 @@
1-
GCC = /usr/bin/x86_64-w64-mingw32-g++
2-
WINDRES = /usr/bin/x86_64-w64-mingw32-windres
1+
CXX = x86_64-w64-mingw32-g++
2+
CXXFLAGS = -c -g -O2 -v
33
DEFINES = -DWINDOWS=1
4-
CPPFLAGS = -g -Wall -O2
5-
INCPATH = -I. -I ../libftd2xx/
6-
LINK = /usr/bin/x86_64-w64-mingw32-g++
7-
LFLAGS = -g -O2 -s
8-
LIBS = -L ../libftd2xx/amd64/ -lftd2xx
4+
INCPATH = -I ../libftd2xx/
5+
WINDRES = x86_64-w64-mingw32-windres
6+
LINK = x86_64-w64-mingw32-g++
7+
LFLAGS = -g -O2 -v
8+
LIBS = -lftd2xx -L ../libftd2xx/amd64/
9+
VPATH = src
10+
SRC_FILES = butterfly.c jtag.c iobase.c ioftdi.c bitfile.c tools.c devicedb.c progalgspi.c progalgxc3s.c
11+
OBJ_FILES = $(patsubst %.c, %.o, $(addprefix $(VPATH)/, $(SRC_FILES)))
12+
DEP_FILES = $(OBJ_FILES:.o=.d)
913

10-
fireprog.exe: butterfly.o jtag.o iobase.o ioftdi.o bitfile.o tools.o devicedb.o progalgspi.o progalgxc3s.o fireprog_res.o
11-
$(LINK) $(LFLAGS) $^ -o $@ $(LIBS)
1214

13-
butterfly.o: butterfly.cpp io_exception.h jtag.h ioftdi.h devicedb.h progalgxc3s.h progalgspi.h bitfile.h
14-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o butterfly.o butterfly.cpp
15+
fireprog.exe: $(OBJ_FILES) src/fireprog_res.o
16+
$(LINK) $^ -o $@ $(LFLAGS) $(LIBS)
1517

16-
bitfile.o: bitfile.cpp bitfile.h
17-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o bitfile.o bitfile.cpp
18+
$(OBJ_FILES): %.o: %.cpp
19+
$(CXX) $(CXXFLAGS) $(INCPATH) $(DEFINES) -MMD -MF $(patsubst %.o,%.d,$@) -o $@ $<
1820

19-
ioftdi.o: ioftdi.cpp ioftdi.h io_exception.h
20-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o ioftdi.o ioftdi.cpp
21-
22-
jtag.o: jtag.cpp jtag.h
23-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o jtag.o jtag.cpp
24-
25-
iobase.o: iobase.cpp iobase.h
26-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o iobase.o iobase.cpp
27-
28-
devicedb.o: devicedb.cpp devicedb.h devlist.h
29-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o devicedb.o devicedb.cpp
30-
31-
tools.o: tools.cpp tools.h config.h
32-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o tools.o tools.cpp
33-
34-
progalgxc3s.o: progalgxc3s.cpp progalgxc3s.h
35-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o progalgxc3s.o progalgxc3s.cpp
36-
37-
progalgspi.o: progalgspi.cpp progalgspi.h config.h
38-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o progalgspi.o progalgspi.cpp
39-
40-
fireprog_res.o: fireprog.rc fireprog.manifest
21+
src/fireprog_res.o: fireprog.rc fireprog.manifest
4122
$(WINDRES) --codepage=65001 -i $< -o $@
4223

4324
clean:
44-
rm -rf *.o *.exe
25+
rm -f $(DEP_FILES) $(OBJ_FILES) fireprog.exe src/fireprog_res.o

‎Makefile.MinGW64Static

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,25 @@
1-
GCC = /usr/bin/x86_64-w64-mingw32-g++
2-
WINDRES = /usr/bin/x86_64-w64-mingw32-windres
1+
CXX = x86_64-w64-mingw32-g++
2+
CXXFLAGS = -c -g -O2 -v
33
DEFINES = -DWINDOWS=1
4-
CPPFLAGS = -g -Wall -O2
5-
INCPATH = -I. -I ../libftd2xx/
6-
LINK = /usr/bin/x86_64-w64-mingw32-g++
7-
LFLAGS = -g -O2 -s -static
8-
LIBS = -L ../libftd2xx/amd64/ -lftd2xx
4+
INCPATH = -I ../libftd2xx/
5+
WINDRES = x86_64-w64-mingw32-windres
6+
LINK = x86_64-w64-mingw32-g++
7+
LFLAGS = -g -O2 -static
8+
LIBS = -lftd2xx -L ../libftd2xx/Static/amd64/
9+
VPATH = src
10+
SRC_FILES = butterfly.c jtag.c iobase.c ioftdi.c bitfile.c tools.c devicedb.c progalgspi.c progalgxc3s.c
11+
OBJ_FILES = $(patsubst %.c, %.o, $(addprefix $(VPATH)/, $(SRC_FILES)))
12+
DEP_FILES = $(OBJ_FILES:.o=.d)
913

10-
fireprog.exe: butterfly.o jtag.o iobase.o ioftdi.o bitfile.o tools.o devicedb.o progalgspi.o progalgxc3s.o fireprog_res.o
11-
$(LINK) $(LFLAGS) $^ -o $@ $(LIBS)
1214

13-
butterfly.o: butterfly.cpp io_exception.h jtag.h ioftdi.h devicedb.h progalgxc3s.h progalgspi.h bitfile.h
14-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o butterfly.o butterfly.cpp
15+
fireprog.exe: $(OBJ_FILES) src/fireprog_res.o
16+
$(LINK) $^ -o $@ $(LFLAGS) $(LIBS)
1517

16-
bitfile.o: bitfile.cpp bitfile.h
17-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o bitfile.o bitfile.cpp
18+
$(OBJ_FILES): %.o: %.cpp
19+
$(CXX) $(CXXFLAGS) $(INCPATH) $(DEFINES) -MMD -MF $(patsubst %.o,%.d,$@) -o $@ $<
1820

19-
ioftdi.o: ioftdi.cpp ioftdi.h io_exception.h
20-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o ioftdi.o ioftdi.cpp
21-
22-
jtag.o: jtag.cpp jtag.h
23-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o jtag.o jtag.cpp
24-
25-
iobase.o: iobase.cpp iobase.h
26-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o iobase.o iobase.cpp
27-
28-
devicedb.o: devicedb.cpp devicedb.h devlist.h
29-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o devicedb.o devicedb.cpp
30-
31-
tools.o: tools.cpp tools.h config.h
32-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o tools.o tools.cpp
33-
34-
progalgxc3s.o: progalgxc3s.cpp progalgxc3s.h
35-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o progalgxc3s.o progalgxc3s.cpp
36-
37-
progalgspi.o: progalgspi.cpp progalgspi.h config.h
38-
$(GCC) -c $(CPPFLAGS) $(INCPATH) $(DEFINES) -o progalgspi.o progalgspi.cpp
39-
40-
fireprog_res.o: fireprog.rc fireprog.manifest
21+
src/fireprog_res.o: fireprog.rc fireprog.manifest
4122
$(WINDRES) --codepage=65001 -i $< -o $@
4223

4324
clean:
44-
rm -rf *.o *.exe
25+
rm -f $(DEP_FILES) $(OBJ_FILES) fireprog.exe src/fireprog_res.o

0 commit comments

Comments
 (0)