comparison Makefile @ 396:922535948800 prerelease

merge

 endif
 
 OUTPUT_FILE?=$(PROJECT_DIR)/$(PROJECT)
 COMMAND_LINE_OPTIONS?=$(CL)
 RUN_COMMAND?=$(OUTPUT_FILE) $(COMMAND_LINE_OPTIONS)
+RUN_IDE_COMMAND?=stdbuf -i0 -o0 -e0 $(RUN_COMMAND)
 BELA_STARTUP_SCRIPT?=/root/BeagleRT_startup.sh
 BELA_AUDIO_THREAD_NAME?=bela-audio 
 SCREEN_NAME?=Bela
 BELA_IDE_STARTUP_SCRIPT?=/root/BeagleRT_node.sh
 BELA_IDE_HOME?=/root/Bela/IDE

 	@echo ' '
 
 # Rule for user-supplied C++ files
 $(PROJECT_DIR)/build/%.o: $(PROJECT_DIR)/%.cpp
 	@echo 'Building $(notdir $<)...'
-	@echo 'Invoking: C++ Compiler $(CXX)'
+#	@echo 'Invoking: C++ Compiler $(CXX)'
 	@$(CXX) $(SYNTAX_FLAG) $(INCLUDES) $(CPP_FLAGS) -Wall -c -fmessage-length=0 -U_FORTIFY_SOURCE -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo ' ...done'
 	@echo ' '
 
 # Rule for user-supplied C files

 # function, and conditionally call one of two recursive make targets depending on whether
 # we want to link in the default main file or not. The kludge is the mess of a shell script
 # line below. Surely there's a better way to do this?
 $(OUTPUT_FILE): $(CORE_ASM_OBJS) $(CORE_OBJS) $(PROJECT_OBJS) $(STATIC_LIBS) $(DEFAULT_MAIN_OBJS)
 	$(eval DEFAULT_MAIN_CONDITIONAL := $(shell bash -c 'if [ `nm $(PROJECT_OBJS) | grep -w T | grep -w main | wc -l` == '0' ]; then echo "$(DEFAULT_MAIN_OBJS)"; else echo ""; fi'))
-	@echo 'Invoking: C++ linker'
+	@echo 'Linking...'
 	@$(CXX) $(SYNTAX_FLAG) -L/usr/xenomai/lib -L/usr/arm-linux-gnueabihf/lib -L/usr/arm-linux-gnueabihf/lib/xenomai -L/usr/lib/arm-linux-gnueabihf -pthread -Wpointer-arith -o "$(PROJECT_DIR)/$(PROJECT)" $(CORE_ASM_OBJS) $(CORE_OBJS) $(DEFAULT_MAIN_CONDITIONAL) $(ASM_OBJS) $(C_OBJS) $(CPP_OBJS) $(STATIC_LIBS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@sync
+	@echo ' ...done'
+	
 # Other Targets:
 # This rule compiles c and c++ source files without output or linking
 SYNTAX: $(C_OBJS) $(CPP_OBJS)
 
 projectclean:## Remove the project's build objects & binary

 
 runfg: run
 run: ## Run PROJECT in the foreground
 run: stop Bela
 	@echo "Running $(RUN_COMMAND)"
-	@cd $(PROJECT_DIR) && $(RUN_COMMAND)
+	@cd $(PROJECT_DIR) && sync& $(RUN_COMMAND)
+runide: ## Run PROJECT for IDE (foreground, without stop or build, suppressed output, no buffering)
+runide: Bela
+	@cd $(PROJECT_DIR) && sync& $(RUN_IDE_COMMAND)
 runscreen: ## Run PROJECT in the background (detached screen)
 runscreen: stop $(OUTPUT_FILE)
 	@echo "Running $(RUN_COMMAND) in a screen"
 	@cd $(PROJECT_DIR) && screen -S $(SCREEN_NAME) -d -m $(RUN_COMMAND)
 runscreenfg: ## Run PROJECT in a screen in the foreground (can detach with ctrl-a ctrl-d)