Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-02 05:17:03 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

compilation with g++ for jsbsim

Browse Source
This commit is contained in:
Gautier Hattenberger
2009-03-05 14:37:19 +00:00
parent 04a3158ba2
commit a148ff9094
1 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/Makefile.sim
+30 -1
View File
@@ -27,7 +27,11 @@
SRC_ARCH = $(PAPARAZZI_SRC)/sw/airborne/sim SRC_ARCH = $(PAPARAZZI_SRC)/sw/airborne/sim
ifneq ($(SIM_TYPE),JSBSIM)
CC = gcc CC = gcc
else
CC = g++
endif
OCAMLC = ocamlc OCAMLC = ocamlc
SIMDIR = $(PAPARAZZI_SRC)/sw/simulator SIMDIR = $(PAPARAZZI_SRC)/sw/simulator
CAMLINCLUDES = -I +lablgtk2 -I $(PAPARAZZI_SRC)/sw/lib/ocaml -I $(SIMDIR) -I +xml-light CAMLINCLUDES = -I +lablgtk2 -I $(PAPARAZZI_SRC)/sw/lib/ocaml -I $(SIMDIR) -I +xml-light
@@ -42,7 +46,9 @@ Q=@
# End of configuration part. # End of configuration part.
# #
ifneq ($(SIM_TYPE),JSBSIM)
INCLUDES += -I `ocamlc -where` INCLUDES += -I `ocamlc -where`
endif
CFLAGS = \ CFLAGS = \
-W -Wall \ -W -Wall \
@@ -53,8 +59,10 @@ CFLAGS = \
# meschach prototypes trigger numerous warnings # meschach prototypes trigger numerous warnings
ifneq ($(SIM_TYPE),BOOZ) ifneq ($(SIM_TYPE),BOOZ)
ifneq ($(SIM_TYPE),JSBSIM)
CFLAGS += -Wstrict-prototypes CFLAGS += -Wstrict-prototypes
endif endif
endif
LDFLAGS = -lm \ LDFLAGS = -lm \
@@ -62,6 +70,9 @@ LDFLAGS = -lm \
ifeq ($(SIM_TYPE),BOOZ) ifeq ($(SIM_TYPE),BOOZ)
LDFLAGS += $($(TARGET).LDFLAGS) LDFLAGS += $($(TARGET).LDFLAGS)
endif endif
ifeq ($(SIM_TYPE),JSBSIM)
LDFLAGS += $($(TARGET).LDFLAGS)
endif
# #
# General rules # General rules
# #
@@ -79,11 +90,16 @@ $(OBJDIR)/simsitl : $($(TARGET).objs)
@echo LD $@ @echo LD $@
$(Q)$(CC) -o $@ $($(TARGET).objs) $(LDFLAGS) $(Q)$(CC) -o $@ $($(TARGET).objs) $(LDFLAGS)
else else
ifeq ($(SIM_TYPE),JSBSIM)
$(OBJDIR)/simsitl : $($(TARGET).objs)
@echo LD $@
$(Q)$(CC) $(CFLAGS) -o $@ $($(TARGET).objs) $(LDFLAGS)
else
$(OBJDIR)/simsitl : $($(TARGET).objs) $(SITLCMA) $(SIMSITLML) $(OBJDIR)/simsitl : $($(TARGET).objs) $(SITLCMA) $(SIMSITLML)
@echo LD $@ @echo LD $@
$(Q)$(OCAMLC) -g -custom $(CAMLINCLUDES) -o $@ unix.cma str.cma xml-light.cma glibivy-ocaml.cma lib-pprz.cma lablgtk.cma $($(TARGET).objs) $(MYGTKINITCMO) $(SITLCMA) $(SIMSITLML) $(Q)$(OCAMLC) -g -custom $(CAMLINCLUDES) -o $@ unix.cma str.cma xml-light.cma glibivy-ocaml.cma lib-pprz.cma lablgtk.cma $($(TARGET).objs) $(MYGTKINITCMO) $(SITLCMA) $(SIMSITLML)
endif endif
endif
# The id of the A/C is hardcoded in the code (to be improved with dynlink ?) # The id of the A/C is hardcoded in the code (to be improved with dynlink ?)
@@ -94,16 +110,29 @@ $(SIMSITLML) : $(SIMDIR)/simsitl.ml
%.s: %.c %.s: %.c
$(CC) $(CFLAGS) -S -o $@ $< $(CC) $(CFLAGS) -S -o $@ $<
%.s: %.cpp
$(CC) $(CFLAGS) -S -o $@ $<
$(OBJDIR)/%.s: %.c $(OBJDIR)/%.s: %.c
@echo CC $@ @echo CC $@
$(Q)test -d $(dir $@) || mkdir -p $(dir $@) $(Q)test -d $(dir $@) || mkdir -p $(dir $@)
$(CC) $(CFLAGS) -S -o $@ $< $(CC) $(CFLAGS) -S -o $@ $<
$(OBJDIR)/%.s: %.cpp
@echo CC $@
$(Q)test -d $(dir $@) || mkdir -p $(dir $@)
$(CC) $(CFLAGS) -S -o $@ $<
$(OBJDIR)/%.o: %.c $(OBJDIR)/../Makefile.ac $(OBJDIR)/%.o: %.c $(OBJDIR)/../Makefile.ac
@echo CC $@ @echo CC $@
$(Q)test -d $(dir $@) || mkdir -p $(dir $@) $(Q)test -d $(dir $@) || mkdir -p $(dir $@)
$(Q)$(CC) $(CFLAGS) -c -o $@ $< $(Q)$(CC) $(CFLAGS) -c -o $@ $<
$(OBJDIR)/%.o: %.cpp $(OBJDIR)/../Makefile.ac
@echo CC $@
$(Q)test -d $(dir $@) || mkdir -p $(dir $@)
$(Q)$(CC) $(CFLAGS) -c -o $@ $<
avr_clean: avr_clean:
rm -rf $(OBJDIR) rm -rf $(OBJDIR)