TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-12-02 21:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
# Conflicts:
#	firmware/application/bitmap.hpp
#	firmware/application/receiver_model.cpp
#	firmware/application/receiver_model.hpp
#	firmware/application/touch.hpp
#	firmware/application/ui_setup.cpp
#	firmware/baseband/proc_ais.hpp
#	firmware/baseband/proc_ert.hpp
#	firmware/bootstrap/CMakeLists.txt
#	firmware/common/portapack_persistent_memory.cpp
#	firmware/common/portapack_persistent_memory.hpp
This commit is contained in:
furrtek
2016-08-17 02:55:34 +02:00
parent e686c7437e 16a6d7efe0
commit 45a754645e
43 changed files with 1089 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
firmware/application/Makefile
View File

@@ -4062,6 +4062,30 @@ ui_textentry.cpp.s:
cd /home/furrtek/portapack-hackrf && $(MAKE) -f firmware/application/CMakeFiles/application.elf.dir/build.make firmware/application/CMakeFiles/application.elf.dir/ui_textentry.cpp.s
.PHONY : ui_textentry.cpp.s
ui_touch_calibration.obj: ui_touch_calibration.cpp.obj
.PHONY : ui_touch_calibration.obj
# target to build an object file
ui_touch_calibration.cpp.obj:
cd /home/furrtek/portapack-hackrf && $(MAKE) -f firmware/application/CMakeFiles/application.elf.dir/build.make firmware/application/CMakeFiles/application.elf.dir/ui_touch_calibration.cpp.obj
.PHONY : ui_touch_calibration.cpp.obj
ui_touch_calibration.i: ui_touch_calibration.cpp.i
.PHONY : ui_touch_calibration.i
# target to preprocess a source file
ui_touch_calibration.cpp.i:
cd /home/furrtek/portapack-hackrf && $(MAKE) -f firmware/application/CMakeFiles/application.elf.dir/build.make firmware/application/CMakeFiles/application.elf.dir/ui_touch_calibration.cpp.i
.PHONY : ui_touch_calibration.cpp.i
ui_touch_calibration.s: ui_touch_calibration.cpp.s
.PHONY : ui_touch_calibration.s
# target to generate assembly for a file
ui_touch_calibration.cpp.s:
cd /home/furrtek/portapack-hackrf && $(MAKE) -f firmware/application/CMakeFiles/application.elf.dir/build.make firmware/application/CMakeFiles/application.elf.dir/ui_touch_calibration.cpp.s
.PHONY : ui_touch_calibration.cpp.s
ui_xylos.obj: ui_xylos.cpp.obj
.PHONY : ui_xylos.obj
@@ -4588,6 +4612,9 @@ help:
@echo "... ui_textentry.obj"
@echo "... ui_textentry.i"
@echo "... ui_textentry.s"
@echo "... ui_touch_calibration.obj"
@echo "... ui_touch_calibration.i"
@echo "... ui_touch_calibration.s"
@echo "... ui_xylos.obj"
@echo "... ui_xylos.i"
@echo "... ui_xylos.s"