Skip to content

Commit

Permalink
Simplified Makefile.inc
Browse files Browse the repository at this point in the history
  • Loading branch information
pkubanek committed Dec 6, 2023
1 parent 98391ec commit f16b560
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ lib/libcRIOcpp.a: FORCE

# Other Targets
clean:
@$(foreach file,,echo '[RM ] ${file}'; $(RM) -r $(file);)
@$(foreach dir,src tests,$(MAKE) -C ${dir} $@;)

tests: tests/Makefile tests/*.cpp
Expand Down
10 changes: 6 additions & 4 deletions Makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ else
c_opts += -O3
endif

C := gcc -Wall ${c_opts}
CPP := g++ -std=c++17 -fPIE -Wall ${c_opts}

# compile x86 simulator or real cRIO stuff
ifdef SIMULATOR
C := gcc -Wall ${c_opts}
CPP := g++ -std=c++14 -fPIE -pedantic -Wall -Wno-vla ${c_opts} -DSIMULATOR
CPP += -pedantic -DSIMULATOR
else
C := gcc -Wall -fmessage-length=0 ${c_opts}
CPP := g++ -std=c++14 -fPIE -Wall -fmessage-length=0 ${c_opts}
C += -fmessage-length=0
CPP += -fmessage-length=0
m1m3cli := m1m3cli
endif

Expand Down
8 changes: 4 additions & 4 deletions doc/version-history.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ Version History
###############

v1.10.0
=======
--------

* handleMissingReply, MissingReply exception
* IRQTimeout handling

v1.9.0
======
------

* MPU changed to SerialMultiplex

v1.8.0
======
------

* LVDT ElectroMechanical readout

v1.7.0
======
------

* offsets,.. ILC commands
* improved re-heater gain management

0 comments on commit f16b560

Please sign in to comment.