github.com/wfjm.w11
1
0
Fork 0
mirror of https://github.com/wfjm/w11.git synced 2026-01-12 00:43:01 +00:00
Code Issues Releases Wiki Activity

Makefile: drop boost includes and libs

Browse Source
This commit is contained in:
wfjm 2019-01-02 12:00:31 +01:00
parent 0e87dd8670
commit fefa952a4d
10 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@ -5,20 +5,23 @@ sudo: required
#
matrix:
include:
- name: "Ub 14.04 -- gcc 4.8"
- name: "Ub 14.04 -- gcc 4.8.4"
dist: trusty
env: MATRIX_EVAL="CC=gcc && CXX=g++"
- name: "Ub 14.04 -- gcc 7"
- name: "Ub 14.04 -- gcc 7.4.0"
dist: trusty
addons:
apt:
sources: ubuntu-toolchain-r-test
packages: g++-7
env: MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
- name: "Ub 14.04 -- clang"
- name: "Ub 16.04 -- clang 5.0.0"
dist: xenial
env: MATRIX_EVAL="CC=clang && CXX=clang++"
- name: "Ub 16.04 -- gcc"
- name: "Ub 16.04 -- gcc 5.4.0"
dist: xenial
env: MATRIX_EVAL="CC=gcc && CXX=g++"

3
Makefile
View File

@ -1,4 +1,4 @@
# $Id: Makefile 1098 2018-12-30 11:40:42Z mueller $
# $Id: Makefile 1100 2019-01-02 10:56:47Z mueller $
#
# 'Meta Makefile' for whole retro project
# allows to make all synthesis targets
@ -114,6 +114,7 @@ SIM_ise += rtl/sys_gen/w11a/nexys3/tb
SIM_viv += rtl/bplib/issi/tb
SIM_viv += rtl/bplib/micron/tb
SIM_viv += rtl/bplib/nxcramlib/tb
SIM_viv += rtl/bplib/mig/tb
SIM_viv += rtl/vlib/comlib/tb
SIM_viv += rtl/vlib/rlink/tb
SIM_viv += rtl/vlib/serport/tb

5
doc/CHANGELOG.md
View File

@ -36,7 +36,10 @@ The full set of tests is only run for tagged releases.
### Changes
- general
- travis: use -j 2
- travis:
- use make -j 2 and tbrun -j 2 (VM has 2 cores, one real, one HT)
- use xenial in matrix
- Makefile: drop boost includes and libs (boost not used anymore)
- tools changes
- viv_tools_build
- export log and rpt generated in OOC synthesis runs

6
tools/src/librlink/Makefile
View File

@ -1,7 +1,8 @@
# $Id: Makefile 733 2016-02-20 12:24:13Z mueller $
# $Id: Makefile 1100 2019-01-02 10:56:47Z mueller $
#
# Revision History:
# Date Rev Version Comment
# 2019-01-02 1100 1.1.2 drop boost includes and libs
# 2013-02-01 479 1.1.1 use checkpath_cpp.mk
# 2011-07-31 401 1.1 rename realclean->distclean
# 2011-07-01 386 1.0.1 add BOOSTINC
@ -18,9 +19,8 @@ SOMINV = 0
#
include ../checkpath_cpp.mk
#
INCLFLAGS = -I${RETROBASE}/tools/src -I${BOOSTINC}
INCLFLAGS = -I${RETROBASE}/tools/src
LDLIBS = -lusb-1.0
LDLIBS += -L${BOOSTLIB} -lboost_thread
LDLIBS += -L${RETROBASE}/tools/lib -lrtools
#
# Object files to be included

5
tools/src/librlinktpp/Makefile
View File

@ -1,7 +1,8 @@
# $Id: Makefile 733 2016-02-20 12:24:13Z mueller $
# $Id: Makefile 1100 2019-01-02 10:56:47Z mueller $
#
# Revision History:
# Date Rev Version Comment
# 2019-01-02 1100 1.1.5 drop boost includes
# 2014-11-08 602 1.1.4 add TCLLIB/TCLLIBNAME to LDLIBS
# 2013-02-01 479 1.1.3 use checkpath_cpp.mk
# 2013-01-27 478 1.1.2 add RtclRlinkPort
@ -22,7 +23,7 @@ SOMINV = 0
#
include ../checkpath_cpp.mk
#
INCLFLAGS = -I${RETROBASE}/tools/src -I${TCLINC} -I${BOOSTINC}
INCLFLAGS = -I${RETROBASE}/tools/src -I${TCLINC}
LDLIBS = -L${TCLLIB} -l${TCLLIBNAME}
LDLIBS += -L${RETROBASE}/tools/lib -lrtools -lrtcltools -lrlink
#

5
tools/src/librtcltools/Makefile
View File

@ -1,7 +1,8 @@
# $Id: Makefile 733 2016-02-20 12:24:13Z mueller $
# $Id: Makefile 1100 2019-01-02 10:56:47Z mueller $
#
# Revision History:
# Date Rev Version Comment
# 2019-01-02 1100 1.1.3 drop boost includes
# 2013-02-01 479 1.1.2 use checkpath_cpp.mk
# 2012-12-24 464 1.1.1 add TCLINC
# 2011-07-31 401 1.1 rename realclean->distclean
@ -19,7 +20,7 @@ SOMINV = 0
#
include ../checkpath_cpp.mk
#
INCLFLAGS = -I${RETROBASE}/tools/src -I${TCLINC} -I${BOOSTINC}
INCLFLAGS = -I${RETROBASE}/tools/src -I${TCLINC}
LDLIBS = -L${RETROBASE}/tools/lib -lrtools
#
# Object files to be included

6
tools/src/librtools/Makefile
View File

@ -1,7 +1,8 @@
# $Id: Makefile 851 2017-02-18 09:20:40Z mueller $
# $Id: Makefile 1100 2019-01-02 10:56:47Z mueller $
#
# Revision History:
# Date Rev Version Comment
# 2019-01-02 1100 1.1.3 drop boost includes and libs
# 2014-11-01 600 1.1.2 add -lboost_system (needed in boost 1.54)
# 2013-02-01 479 1.1.1 use checkpath_cpp.mk
# 2011-07-31 401 1.1 rename realclean->distclean
@ -19,9 +20,6 @@ SOMINV = 0
#
include ../checkpath_cpp.mk
#
INCLFLAGS = -I${BOOSTINC}
LDLIBS = -L${BOOSTLIB} -lboost_thread -lboost_system
#
# Object files to be included
#
OBJ_all = Rbits.o

5
tools/src/librutiltpp/Makefile
View File

@ -1,7 +1,8 @@
# $Id: Makefile 733 2016-02-20 12:24:13Z mueller $
# $Id: Makefile 1100 2019-01-02 10:56:47Z mueller $
#
# Revision History:
# Date Rev Version Comment
# 2019-01-02 1100 1.1.4 drop boost includes
# 2014-11-08 602 1.1.3 add TCLLIB/TCLLIBNAME to LDLIBS
# 2013-02-01 479 1.1.2 use checkpath_cpp.mk
# 2012-12-24 464 1.1.1 add TCLINC
@ -21,7 +22,7 @@ SOMINV = 0
#
include ../checkpath_cpp.mk
#
INCLFLAGS = -I${RETROBASE}/tools/src -I${TCLINC} -I${BOOSTINC}
INCLFLAGS = -I${RETROBASE}/tools/src -I${TCLINC}
LDLIBS = -lpthread
LDLIBS += -L${TCLLIB} -l${TCLLIBNAME}
LDLIBS += -L${RETROBASE}/tools/lib -lrtcltools

5
tools/src/librw11/Makefile
View File

@ -1,7 +1,8 @@
# $Id: Makefile 1063 2018-10-29 18:37:42Z mueller $
# $Id: Makefile 1100 2019-01-02 10:56:47Z mueller $
#
# Revision History:
# Date Rev Version Comment
# 2019-01-02 1100 1.0.2 drop boost includes
# 2013-02-01 479 1.0.1 correct so name; use checkpath_cpp.mk
# 2013-01-27 478 1.0 Initial version
#---
@ -16,7 +17,7 @@ SOMINV = 0
#
include ../checkpath_cpp.mk
#
INCLFLAGS = -I${RETROBASE}/tools/src -I${BOOSTINC}
INCLFLAGS = -I${RETROBASE}/tools/src
LDLIBS = -L${RETROBASE}/tools/lib -lrtools -lrlink
#
# Object files to be included

5
tools/src/librwxxtpp/Makefile
View File

@ -1,7 +1,8 @@
# $Id: Makefile 1063 2018-10-29 18:37:42Z mueller $
# $Id: Makefile 1100 2019-01-02 10:56:47Z mueller $
#
# Revision History:
# Date Rev Version Comment
# 2019-01-02 1100 1.0.3 drop boost includes
# 2014-11-08 602 1.0.2 add TCLLIB/TCLLIBNAME to LDLIBS
# 2013-02-01 479 1.0.1 correct so name (no digits allowed in tcl load...)
# 2013-01-27 478 1.0 Initial version
@ -17,7 +18,7 @@ SOMINV = 0
#
include ../checkpath_cpp.mk
#
INCLFLAGS = -I${RETROBASE}/tools/src -I${TCLINC} -I${BOOSTINC}
INCLFLAGS = -I${RETROBASE}/tools/src -I${TCLINC}
LDLIBS = -L${TCLLIB} -l${TCLLIBNAME}
LDLIBS += -L${RETROBASE}/tools/lib -lrtools -lrtcltools
LDLIBS += -lrlink -lrw11