From 584e6d1d3bfe49b8c6e35773e239046e1b712aa8 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sat, 15 Mar 2014 16:09:51 +0800 Subject: [PATCH] Usermode/Applications - C++ support --- Usermode/Applications/Makefile.tpl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Usermode/Applications/Makefile.tpl b/Usermode/Applications/Makefile.tpl index efcb57de..a6c8508c 100644 --- a/Usermode/Applications/Makefile.tpl +++ b/Usermode/Applications/Makefile.tpl @@ -51,7 +51,7 @@ $(_BIN): $(OUTPUTDIR)Libs/acess.ld $(OUTPUTDIR)Libs/crt0.o $(_LIBS) $(OBJ) $V$(LD) -g $(LDFLAGS) -o $@ $(CRTBEGIN) $(OBJ) $(LIBGCC_PATH) $(CRTEND) $V$(DISASM) $(_BIN) > $(_OBJPREFIX)$(BIN).dsm -$(OBJ): $(_OBJPREFIX)%.o: %.c +$(_OBJPREFIX)%.o: %.c @echo [CC] -o $@ ifneq ($(_OBJPREFIX),) @mkdir -p $(dir $@) @@ -59,6 +59,13 @@ endif $V$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ $V$(CC) -M -MP -MT $@ $(CPPFLAGS) $< -o $(_OBJPREFIX)$*.dep +$(_OBJPREFIX)%.o: %.cpp + @echo [CXX] -o $@ +ifneq ($(_OBJPREFIX),) + @mkdir -p $(dir $@) +endif + $V$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@ -MQ $@ -MP -MD -MF $(_OBJPREFIX)$*.dep + $(OUTPUTDIR)Libs/libld-acess.so: @make -C $(ACESSDIR)/Usermode/Libraries/ld-acess.so_src/ $(OUTPUTDIR)Libs/%: -- 2.20.1