Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[makefile] Fix compile for ARM (#3319)

Browse Source
This commit is contained in:
Freek van Tienen
2024-06-18 12:46:22 +02:00
committed by GitHub
parent 7c035434ef
commit 79dcf7bc4b
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/logalizer/Makefile
+3 -3
View File
@@ -33,12 +33,12 @@ LABLGTK2GLADE = $(shell ocamlfind query -p-format lablgtk2.glade 2>/dev/null)
ifeq ($(USE_LABELGTK),lablgtk2)
# only compile it lablgtk2.glade is installed
ifeq ($(LABLGTK2GLADE),)
XPKG = -package pprz.xlib,lablgtk2
XLINKPKG = $(XPKG) -linkpkg -dllpath-pkg pprz.xlib,pprzlink
XPKG = -package lablgtk2,pprz.xlib
XLINKPKG = $(XPKG) -linkpkg -dllpath-pkg pprz.xlib,pprzlink,$(USE_LABELGTK)
all : play plotter sd2log plotprofile openlog2tlm sdlogger_download
else
XPKG = -package lablgtk2,pprz.xlib,lablgtk2.glade
XLINKPKG = $(XPKG) -linkpkg -dllpath-pkg pprz.xlib,pprzlink
XLINKPKG = $(XPKG) -linkpkg -dllpath-pkg pprz.xlib,pprzlink,$(USE_LABELGTK)
all : play plotter logplotter sd2log plotprofile openlog2tlm sdlogger_download
endif
else # no gtk2
sw/supervision/Makefile
+5 -3
View File
@@ -49,12 +49,14 @@ PAPARAZZICENTERCMO = gtk_pc.cmo gtk_process.cmo pc_common.cmo pc_control_panel.c
# only compile it lablgtk2.glade is installed
ifneq ($(LABLGTK2GLADE),)
all: paparazzicenter
else # no lablgtk2 glade
all :
@echo Skipping legacy Paparazzi Center build, no lablgtk2-glade
endif
else # no gtk2
else # no lablgtk2
all :
@echo Skipping legacy Paparazzi Center build
@echo Skipping legacy Paparazzi Center build, no lablgtk2
endif
paparazzicenter : $(PAPARAZZICENTERCMO) $(LIBPPRZCMA) $(LIBPPRZLINKCMA) $(XLIBPPRZCMA)