Quantum Leaps il y a 10 ans
Parent
commit
ab798060d2

+ 24 - 26
examples/arm-cm/blinky_ek-tm4c123gxl/win32-qv/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, Blinky example, Win32-QV console, MinGW
+# Product: Makefile for QP/C, Blinky console, Win32-QV, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := blinky
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../../..
 endif
@@ -85,16 +85,16 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	bsp.c \
 	main.c \
 	blinky.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS :=
 
 LIB_DIRS  :=
@@ -135,11 +135,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -154,21 +154,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -217,21 +217,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -258,6 +255,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 22 - 24
examples/arm-cm/blinky_ek-tm4c123gxl/win32/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, Blinky example, Win32 console, MinGW
-# Last updated for version 5.4.0
-# Last updated on  2015-06-02
+# Product: Makefile for QP/C, Blinky console, Win32, MinGW
+# Last updated for version 5.4.2
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := blinky
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../../..
 endif
@@ -135,11 +135,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -154,21 +154,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -217,21 +217,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -258,6 +255,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 24 - 26
examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, DPP, Win32-QV GUI, MinGW
+# Product: Makefile for QP/C, DPP-GUI, Win32-QV, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := dpp-gui
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../../..
 endif
@@ -85,17 +85,17 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	bsp.c \
 	main.c \
 	philo.c \
 	table.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS := \
 	dpp-gui.rc
 
@@ -137,11 +137,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -156,21 +156,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -219,21 +219,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -260,6 +257,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 24 - 26
examples/arm-cm/dpp_ek-tm4c123gxl/win32/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, DPP, Win32 GUI, MinGW
+# Product: Makefile for QP/C, DPP-GUI, Win32, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := dpp-gui
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../../..
 endif
@@ -85,17 +85,17 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	bsp.c \
 	main.c \
 	philo.c \
 	table.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS := \
 	dpp-gui.rc
 
@@ -137,11 +137,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -156,21 +156,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -219,21 +219,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -260,6 +257,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 27 - 29
examples/arm-cm/game_ek-lm3s811/win32-qv/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, "Fly 'n' Shoot" game, Win32-QV GUI, MinGW
+# Product: Makefile for QP/C, Game-GUI, Win32-QV, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := game-gui
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../../..
 endif
@@ -85,20 +85,20 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	bsp.c \
 	main.c \
 	mine1.c \
-	mine2.c \
-	missile.c \
-	ship.c \
+	mine2.c \
+	missile.c \
+	ship.c \
 	tunnel.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS := \
 	game-gui.rc
 
@@ -140,11 +140,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -159,21 +159,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -222,21 +222,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -263,6 +260,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 27 - 29
examples/arm-cm/game_ek-lm3s811/win32/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, "Fly 'n' Shoot" game, Win32 GUI, MinGW
+# Product: Makefile for QP/C, Game-GUI, Win32, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := game-gui
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../../..
 endif
@@ -85,20 +85,20 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	bsp.c \
 	main.c \
 	mine1.c \
-	mine2.c \
-	missile.c \
-	ship.c \
+	mine2.c \
+	missile.c \
+	ship.c \
 	tunnel.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS := \
 	game-gui.rc
 
@@ -140,11 +140,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -159,21 +159,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -222,21 +222,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -263,6 +260,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 99 - 69
examples/win32-qv/dpp/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Generic Makefile for QP/C application, Win32-QV, MinGW compiler
-# Last updated for version 5.4.0
-# Last updated on  2015-04-07
+# Product: Makefile for QP/C, DPP console, Win32-QV, MinGW
+# Last updated for version 5.4.2
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -48,68 +48,83 @@
 #    http://sourceforge.net/projects/qpc/files/Qtools/
 #
 
-##############################################################################
-#
-# NOTE: Typically, you should have no need to change anything in this Makefile
+#-----------------------------------------------------------------------------
+# project name
 #
-##############################################################################
-
+PROJECT     := dpp
 
 #-----------------------------------------------------------------------------
+# project directories
+#
+
 # location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../..
 endif
 
-#-----------------------------------------------------------------------------
-# MinGW toolset (NOTE: assumed to be on your PATH)
-#
-# NOTE:
-# MinGW toolset is included in the Qtools collection for Windows, see:
-#    http://sourceforge.net/projects/qpc/files/Qtools/
+# QP port used in this project
+QP_PORT_DIR := $(QPC)/ports/win32-qv
 
-CC    := gcc
-CPP   := g++
-LINK  := gcc    # for C programs
-#LINK  := g++   # for C++ programs
+# list of all source directories used by this project
+VPATH = \
+	. \
 
-# basic utilities (included in Qtools for Windows), see:
-#    http://sourceforge.net/projects/qpc/files/Qtools
+# list of all include directories needed by this project
+INCLUDES  = \
+	-I. \
+	-I$(QPC)/include
 
-MKDIR := mkdir
-RM    := rm
+# list of resource include directories needed by this project
+RCINCLUDES = \
+	-IRes
 
 
 #-----------------------------------------------------------------------------
-# directories
+# files
 #
-# Project name is derived from the directory name
-PROJECT := $(notdir $(CURDIR))
 
-QP_PORT_DIR := $(QPC)/ports/win32-qv
-APP_DIR     := .
+# C source files...
+C_SRCS := \
+	bsp.c \
+	main.c \
+	philo.c \
+	table.c
+
+# C++ source files...
+CPP_SRCS :=	
 
-VPATH = $(APP_DIR)
+# Resource files...
+RC_SRCS :=
 
-# include directories
-INCLUDES  = -I. \
-	-I$(QPC)/include \
-	-I$(QP_PORT_DIR)
+LIB_DIRS  :=
+LIBS      :=
 
-# defines
-DEFINES =
+# defines...
+# QP_API_VERSION controls the QP API compatibility; 9999 means the latest API
+DEFINES   := -DQP_API_VERSION=9999
 
 #-----------------------------------------------------------------------------
-# files
+# MinGW toolset (NOTE: assumed to be on your PATH)
 #
+# NOTE:
+# MinGW toolset is included in the Qtools collection for Windows, see:
+#    http://sourceforge.net/projects/qpc/files/Qtools/
+#
+# NOTE:
+# This Makefile assumes that the windres utility is available on the
+# PATH (NOTE: windres is available in the Qtools collection for Windows)
+#
+CC    := gcc
+CPP   := g++
+LINK  := gcc    # for C programs
+#LINK  := g++   # for C++ programs
+RC    := windres
 
-# C source files
-C_SRCS := $(wildcard *.c)
-
-# C++ source files
-CPP_SRCS := $(wildcard *.cpp)
+# basic utilities (included in Qtools for Windows), see:
+#    http://sourceforge.net/projects/qpc/files/Qtools
 
-LD_SCRIPT :=
+MKDIR := mkdir
+RM    := rm
 
 #-----------------------------------------------------------------------------
 # build options for various configurations
@@ -119,16 +134,14 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -O2 -ffunction-sections -fdata-sections \
-	$(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -O2 -ffunction-sections -fdata-sections \
-	$(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
-BIN_DIR := spy
-
 # make sure that QTOOLS exists...
 ifeq ("$(wildcard $(QTOOLS))","")
 $(error QTOOLS not found. Please install Qtools and define QTOOLS env. variable)
@@ -138,32 +151,44 @@ INCLUDES +=	-I$(QTOOLS)/qspy/include
 VPATH    += $(QTOOLS)/qspy/source
 C_SRCS   += qspy.c
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	$(INCLUDES) $(DEFINES) -DQ_SPY
+BIN_DIR := spy
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	$(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
+
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	$(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	$(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-endif
+endif  # .....................................................................
 
+LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
 
-LINKFLAGS = -L$(QP_PORT_DIR)/mingw/$(BIN_DIR) \
-	-Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections
+# is it a GUI application (any GUI resources provided?) ...
+ifneq (,$(RC_SRCS))
+LINKFLAGS += -mwindows
+DEFINES += -DWIN32_GUI
+endif
 
 #-----------------------------------------------------------------------------
 
-C_OBJS       := $(patsubst %.c,%.o,$(C_SRCS))
-CPP_OBJS     := $(patsubst %.cpp,%.o,$(CPP_SRCS))
+# combine all the soruces...
+INCLUDES  += -I$(QP_PORT_DIR)
+LIB_DIRS  += -L$(QP_PORT_DIR)/$(BIN_DIR)
+LIBS      += -lqp
+
+C_OBJS       := $(patsubst %.c,   %.o, $(C_SRCS))
+CPP_OBJS     := $(patsubst %.cpp, %.o, $(CPP_SRCS))
+RC_OBJS      := $(patsubst %.rc,  %.o, $(RC_SRCS))
 
 TARGET_BIN   := $(BIN_DIR)/$(PROJECT).bin
 TARGET_EXE   := $(BIN_DIR)/$(PROJECT).exe
@@ -171,6 +196,7 @@ C_OBJS_EXT   := $(addprefix $(BIN_DIR)/, $(C_OBJS))
 C_DEPS_EXT   := $(patsubst %.o, %.d, $(C_OBJS_EXT))
 CPP_OBJS_EXT := $(addprefix $(BIN_DIR)/, $(CPP_OBJS))
 CPP_DEPS_EXT := $(patsubst %.o, %.d, $(CPP_OBJS_EXT))
+RC_OBJS_EXT  := $(addprefix $(BIN_DIR)/, $(RC_OBJS))
 
 # create $(BIN_DIR) if it does not exist
 ifeq ("$(wildcard $(BIN_DIR))","")
@@ -187,23 +213,23 @@ all: $(TARGET_EXE)
 $(TARGET_BIN): $(TARGET_EXE)
 	$(BIN) -O binary $< $@
 
-$(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT)
-	$(LINK) $(LINKFLAGS) -o $@ $^ -lqp
-
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
+$(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
+	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
+
+$(BIN_DIR)/%.o : %.cpp
+	$(CPP) $(CPPFLAGS) -c $< -o $@
 
 $(BIN_DIR)/%.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-$(BIN_DIR)/%.o : %.cpp
-	$(CPP) $(CPPFLAGS) -c $< -o $@
+$(BIN_DIR)/%.o : %.rc
+	$(RC) $(RCINCLUDES) -i $< -o $@
 
 # include dependency files only if our goal depends on their existence
 ifneq ($(MAKECMDGOALS),clean)
@@ -228,3 +254,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
+	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
+	@echo LIB_DIRS = $(LIB_DIRS)
+	@echo LIBS     = $(LIBS)

+ 26 - 27
examples/win32-qv/reminder2/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, Reminder2 example, Win32-QV console, MinGW
+# Product: Makefile for QP/C, Reminder2 Pattern console, Win32-QV, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := reminder2
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../..
 endif
@@ -66,7 +66,8 @@ endif
 QP_PORT_DIR := $(QPC)/ports/win32-qv
 
 # list of all source directories used by this project
-VPATH = .
+VPATH = \
+	. \
 
 # list of all include directories needed by this project
 INCLUDES  = \
@@ -82,15 +83,15 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	bsp.c \
 	reminder2.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS :=
 
 LIB_DIRS  :=
@@ -131,11 +132,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -150,21 +151,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -213,21 +214,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -254,6 +252,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 9 - 5
examples/win32-qv/reminder2/reminder2.c

@@ -103,13 +103,15 @@ QState Cruncher_processing(Cruncher * const me, QEvt const * const e) {
                 status = Q_HANDLED();
             }
             else {
-                printf("pi=%16.14f\n", 4.0*me->sum);
+                printf("pi=%16.14f\n", 4.0*me->sum);
+                fflush(stdout);
                 status = Q_TRAN(&Cruncher_processing);
             }
             break;
         }
         case ECHO_SIG: {
-            printf("Echo! pi=%16.14f\n", 4.0*me->sum);
+            printf("Echo! pi=%16.14f\n", 4.0*me->sum);
+            fflush(stdout);
             status = Q_HANDLED();
             break;
         }
@@ -129,7 +131,8 @@ QState Cruncher_final(Cruncher * const me, QEvt const * const e) {
     QState status;
     switch (e->sig) {
         case Q_ENTRY_SIG: {
-            printf("final-ENTRY;\n");
+            printf("final-ENTRY;\n");
+            fflush(stdout);
             QF_stop(); /* terminate the application */
             status = Q_HANDLED();
             break;
@@ -154,8 +157,9 @@ int main(int argc, char *argv[]) {
     printf("Reminder state pattern\nQP version: %s\n"
            "Press 'e' to echo the current value...\n"
            "Press ESC to quit...\n",
-           QP_versionStr);
-
+           QP_versionStr);
+    fflush(stdout);
+
     Cruncher_ctor(&l_cruncher);
 
     BSP_init(argc, argv); /* initialize the BSP */

+ 26 - 27
examples/win32/calc/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, Calc example, Win32 console, MinGW
+# Product: Makefile for QP/C, Calc console, Win32, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := calc
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../..
 endif
@@ -66,7 +66,8 @@ endif
 QP_PORT_DIR := $(QPC)/ports/win32
 
 # list of all source directories used by this project
-VPATH = .
+VPATH = \
+	. \
 
 # list of all include directories needed by this project
 INCLUDES  = \
@@ -82,16 +83,16 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	bsp.c \
 	main.c \
 	calc.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS :=
 
 LIB_DIRS  :=
@@ -132,11 +133,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -151,21 +152,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -214,21 +215,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -255,6 +253,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 26 - 27
examples/win32/calc2/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, Calc2 example, Win32 console, MinGW
+# Product: Makefile for QP/C, Calc2 console, Win32, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := calc2
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../..
 endif
@@ -66,7 +66,8 @@ endif
 QP_PORT_DIR := $(QPC)/ports/win32
 
 # list of all source directories used by this project
-VPATH = .
+VPATH = \
+	. \
 
 # list of all include directories needed by this project
 INCLUDES  = \
@@ -82,16 +83,16 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	bsp.c \
 	main.c \
 	calc2.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS :=
 
 LIB_DIRS  :=
@@ -132,11 +133,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -151,21 +152,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -214,21 +215,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -255,6 +253,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 26 - 27
examples/win32/comp/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, Orthogonal Component, Win32 console, MinGW
+# Product: Makefile for QP/C, Orthogonal Component console, Win32, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := comp
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../..
 endif
@@ -66,7 +66,8 @@ endif
 QP_PORT_DIR := $(QPC)/ports/win32
 
 # list of all source directories used by this project
-VPATH = .
+VPATH = \
+	. \
 
 # list of all include directories needed by this project
 INCLUDES  = \
@@ -82,16 +83,16 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	bsp.c \
 	alarm.c \
 	comp.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS :=
 
 LIB_DIRS  :=
@@ -132,11 +133,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -151,21 +152,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -214,21 +215,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -255,6 +253,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 27 - 28
examples/win32/comp_qm/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, Orthogonal Component with QM, Win32 console, MinGW
+# Product: Makefile for QP/C, Orthogonal Component console, Win32, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := comp_qm
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../..
 endif
@@ -66,7 +66,8 @@ endif
 QP_PORT_DIR := $(QPC)/ports/win32
 
 # list of all source directories used by this project
-VPATH = .
+VPATH = \
+	. \
 
 # list of all include directories needed by this project
 INCLUDES  = \
@@ -82,17 +83,17 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	bsp.c \
 	main.c \
-	alarm.c \
+	alarm.c \
 	clock.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS :=
 
 LIB_DIRS  :=
@@ -133,11 +134,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -152,21 +153,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -215,21 +216,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -256,6 +254,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 28 - 29
examples/win32/defer/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, Deferred Event example, Win32 console, MinGW
+# Product: Makefile for QP/C, Deferred Event console, Win32, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := defer
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../..
 endif
@@ -66,7 +66,8 @@ endif
 QP_PORT_DIR := $(QPC)/ports/win32
 
 # list of all source directories used by this project
-VPATH = .
+VPATH = \
+	. \
 
 # list of all include directories needed by this project
 INCLUDES  = \
@@ -82,22 +83,22 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	bsp.c \
 	defer.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS :=
 
 LIB_DIRS  :=
 LIBS      :=
 
-# defines
-# DQP_API_VERSION controls the QP API compatibility; 9999 means the latest API
+# defines...
+# QP_API_VERSION controls the QP API compatibility; 9999 means the latest API
 DEFINES   := -DQP_API_VERSION=9999
 
 #-----------------------------------------------------------------------------
@@ -131,11 +132,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -150,21 +151,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -213,21 +214,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -254,6 +252,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 27 - 28
examples/win32/dpp/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, DPP example, Win32 console, MinGW
+# Product: Makefile for QP/C, DPP console, Win32, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := dpp
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../..
 endif
@@ -66,7 +66,8 @@ endif
 QP_PORT_DIR := $(QPC)/ports/win32
 
 # list of all source directories used by this project
-VPATH = .
+VPATH = \
+	. \
 
 # list of all include directories needed by this project
 INCLUDES  = \
@@ -82,17 +83,17 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	bsp.c \
 	main.c \
-	philo.c \
+	philo.c \
 	table.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS :=
 
 LIB_DIRS  :=
@@ -133,11 +134,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -152,21 +153,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -215,21 +216,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -256,6 +254,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 26 - 27
examples/win32/history_qhsm/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, History with QHsm example, Win32 console, MinGW
+# Product: Makefile for QP/C, History with QHsm console, Win32, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := history_qhsm
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../..
 endif
@@ -66,7 +66,8 @@ endif
 QP_PORT_DIR := $(QPC)/ports/win32
 
 # list of all source directories used by this project
-VPATH = .
+VPATH = \
+	. \
 
 # list of all include directories needed by this project
 INCLUDES  = \
@@ -82,15 +83,15 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	main.c \
 	history.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS :=
 
 LIB_DIRS  :=
@@ -131,11 +132,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -150,21 +151,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -213,21 +214,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -254,6 +252,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 26 - 27
examples/win32/history_qmsm/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, History with QMsm example, Win32 console, MinGW
+# Product: Makefile for QP/C, History with QMsm console, Win32, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := history_qmsm
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../..
 endif
@@ -66,7 +66,8 @@ endif
 QP_PORT_DIR := $(QPC)/ports/win32
 
 # list of all source directories used by this project
-VPATH = .
+VPATH = \
+	. \
 
 # list of all include directories needed by this project
 INCLUDES  = \
@@ -82,15 +83,15 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	main.c \
 	history.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS :=
 
 LIB_DIRS  :=
@@ -131,11 +132,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -150,21 +151,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -213,21 +214,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -254,6 +252,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 26 - 27
examples/win32/qhsmtst/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, QHsmTst example, Win32 console, MinGW
+# Product: Makefile for QP/C, QHsmTst console, Win32, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := qhsmtst
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../..
 endif
@@ -66,7 +66,8 @@ endif
 QP_PORT_DIR := $(QPC)/ports/win32
 
 # list of all source directories used by this project
-VPATH = .
+VPATH = \
+	. \
 
 # list of all include directories needed by this project
 INCLUDES  = \
@@ -82,15 +83,15 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	main.c \
 	qhsmtst.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS :=
 
 LIB_DIRS  :=
@@ -131,11 +132,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -150,21 +151,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -213,21 +214,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -254,6 +252,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 26 - 27
examples/win32/qmsmtst/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, QMsmTst example, Win32 console, MinGW
+# Product: Makefile for QP/C, QMsmTst console, Win32, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := qmsmtst
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../..
 endif
@@ -66,7 +66,8 @@ endif
 QP_PORT_DIR := $(QPC)/ports/win32
 
 # list of all source directories used by this project
-VPATH = .
+VPATH = \
+	. \
 
 # list of all include directories needed by this project
 INCLUDES  = \
@@ -82,15 +83,15 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	main.c \
 	qmsmtst.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS :=
 
 LIB_DIRS  :=
@@ -131,11 +132,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -150,21 +151,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -213,21 +214,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -254,6 +252,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 26 - 27
examples/win32/reminder/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, Reminder example, Win32 console, MinGW
+# Product: Makefile for QP/C, Reminder Pattern console, Win32, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := reminder
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../..
 endif
@@ -66,7 +66,8 @@ endif
 QP_PORT_DIR := $(QPC)/ports/win32
 
 # list of all source directories used by this project
-VPATH = .
+VPATH = \
+	. \
 
 # list of all include directories needed by this project
 INCLUDES  = \
@@ -82,15 +83,15 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	bsp.c \
 	reminder.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS :=
 
 LIB_DIRS  :=
@@ -131,11 +132,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -150,21 +151,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -213,21 +214,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -254,6 +252,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 26 - 27
examples/win32/reminder2/Makefile

@@ -1,7 +1,7 @@
 ##############################################################################
-# Product: Makefile for QP/C, Reminder2 example, Win32 console, MinGW
+# Product: Makefile for QP/C, Reminder2 Pattern console, Win32, MinGW
 # Last updated for version 5.4.2
-# Last updated on  2015-06-03
+# Last updated on  2015-06-05
 #
 #                    Q u a n t u m     L e a P s
 #                    ---------------------------
@@ -57,7 +57,7 @@ PROJECT     := reminder2
 # project directories
 #
 
-# location of the QP-nano framework (if not provided in an environemnt var.)
+# location of the QP/C framework (if not provided in an environemnt var.)
 ifeq ($(QPC),)
 QPC := ../../..
 endif
@@ -66,7 +66,8 @@ endif
 QP_PORT_DIR := $(QPC)/ports/win32
 
 # list of all source directories used by this project
-VPATH = .
+VPATH = \
+	. \
 
 # list of all include directories needed by this project
 INCLUDES  = \
@@ -82,15 +83,15 @@ RCINCLUDES = \
 # files
 #
 
-# C source files
+# C source files...
 C_SRCS := \
 	bsp.c \
 	reminder2.c
 
-# C++ source files
+# C++ source files...
 CPP_SRCS :=	
 
-# Resource files
+# Resource files...
 RC_SRCS :=
 
 LIB_DIRS  :=
@@ -131,11 +132,11 @@ ifeq (rel, $(CONF)) # Release configuration ..................................
 
 BIN_DIR := rel
 
-CFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
-CPPFLAGS = -c -Wall -W -ffunction-sections -fdata-sections \
-	-Os -fno-strict-aliasing $(INCLUDES) $(DEFINES) -DNDEBUG
+CPPFLAGS = -ffunction-sections -fdata-sections \
+	-Os -Wall -W $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -150,21 +151,21 @@ C_SRCS   += qspy.c
 
 BIN_DIR := spy
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES) -DQ_SPY
 
 else  # default Debug configuration ..........................................
 
 BIN_DIR := dbg
 
-CFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
-CPPFLAGS = -c -Wall -W -g -ffunction-sections -fdata-sections \
-	-O $(INCLUDES) $(DEFINES)
+CPPFLAGS = -g -ffunction-sections -fdata-sections \
+	-O -Wall -W $(INCLUDES) $(DEFINES)
 
 endif  # .....................................................................
 
@@ -213,21 +214,18 @@ $(TARGET_BIN): $(TARGET_EXE)
 $(TARGET_EXE) : $(C_OBJS_EXT) $(CPP_OBJS_EXT) $(RC_OBJS_EXT)
 	$(LINK) $(LINKFLAGS) $(LIB_DIRS) -o $@ $^ $(LIBS)
 
-$(BIN_DIR)/%.d : %.c
-	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
-
 $(BIN_DIR)/%.d : %.cpp
 	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
 
-$(BIN_DIR)/%.o : %.s
-	$(AS) $(ASFLAGS) $< -o $@
-
-$(BIN_DIR)/%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
 
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) -c $< -o $@
 
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(BIN_DIR)/%.o : %.rc
 	$(RC) $(RCINCLUDES) -i $< -o $@
 
@@ -254,6 +252,7 @@ show:
 	@echo C_OBJS_EXT   = $(C_OBJS_EXT)
 	@echo C_DEPS_EXT   = $(C_DEPS_EXT)
 	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo CPP_OBJS_EXT = $(CPP_OBJS_EXT)
 	@echo RC_OBJS_EXT  = $(RC_OBJS_EXT)
 	@echo LIB_DIRS = $(LIB_DIRS)
 	@echo LIBS     = $(LIBS)

+ 9 - 5
examples/win32/reminder2/reminder2.c

@@ -103,13 +103,15 @@ QState Cruncher_processing(Cruncher * const me, QEvt const * const e) {
                 status = Q_HANDLED();
             }
             else {
-                printf("pi=%16.14f\n", 4.0*me->sum);
+                printf("pi=%16.14f\n", 4.0*me->sum);
+                fflush(stdout);
                 status = Q_TRAN(&Cruncher_processing);
             }
             break;
         }
         case ECHO_SIG: {
-            printf("Echo! pi=%16.14f\n", 4.0*me->sum);
+            printf("Echo! pi=%16.14f\n", 4.0*me->sum);
+            fflush(stdout);
             status = Q_HANDLED();
             break;
         }
@@ -129,7 +131,8 @@ QState Cruncher_final(Cruncher * const me, QEvt const * const e) {
     QState status;
     switch (e->sig) {
         case Q_ENTRY_SIG: {
-            printf("final-ENTRY;\n");
+            printf("final-ENTRY;\n");
+            fflush(stdout);
             QF_stop(); /* terminate the application */
             status = Q_HANDLED();
             break;
@@ -154,8 +157,9 @@ int main(int argc, char *argv[]) {
     printf("Reminder state pattern\nQP version: %s\n"
            "Press 'e' to echo the current value...\n"
            "Press ESC to quit...\n",
-           QP_versionStr);
-
+           QP_versionStr);
+    fflush(stdout);
+
     Cruncher_ctor(&l_cruncher);
 
     BSP_init(argc, argv); /* initialize the BSP */

+ 16 - 19
ports/win32-qv/win32_gui.c

@@ -1,10 +1,10 @@
 /**
 * @file
 * @brief Win32 GUI facilities for building realistic embedded front panels
-* @ingroup ports
 * @cond
 ******************************************************************************
-* Last Update: 2015-03-02
+* Last Updated for Version: 5.4.2
+* Date of the Last Update:  2015-06-04
 *
 *                    Q u a n t u m     L e a P s
 *                    ---------------------------
@@ -13,28 +13,25 @@
 * Copyright (C) Quantum Leaps, LLC. All rights reserved.
 *
 * This program is open source software: you can redistribute it and/or
-* modify it under the terms of the following MIT License (MIT).
+* modify it under the terms of the GNU General Public License as published
+* by the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
 *
-* Permission is hereby granted, free of charge, to any person obtaining a
-* copy of this software and associated documentation files (the "Software"),
-* to deal in the Software without restriction, including without limitation
-* the rights to use, copy, modify, merge, publish, distribute, sublicense,
-* and/or sell copies of the Software, and to permit persons to whom the
-* Software is furnished to do so, subject to the following conditions:
+* Alternatively, this program may be distributed and modified under the
+* terms of Quantum Leaps commercial licenses, which expressly supersede
+* the GNU General Public License and are specifically designed for
+* licensees interested in retaining the proprietary status of their code.
 *
-* The above copyright notice and this permission notice shall be included in
-* all copies or substantial portions of the Software.
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-* DEALINGS IN THE SOFTWARE.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
 *
 * Contact information:
-* Web  : http://www.state-machine.com
+* Web:   www.state-machine.com
 * Email: info@state-machine.com
 ******************************************************************************
 * @endcond

+ 16 - 19
ports/win32-qv/win32_gui.h

@@ -1,10 +1,10 @@
 /**
 * @file
 * @brief Win32 GUI facilities for building realistic embedded front panels
-* @ingroup ports
 * @cond
 ******************************************************************************
-* Last Update: 2015-06-03
+* Last Updated for Version: 5.4.2
+* Date of the Last Update:  2015-06-04
 *
 *                    Q u a n t u m     L e a P s
 *                    ---------------------------
@@ -13,28 +13,25 @@
 * Copyright (C) Quantum Leaps, LLC. All rights reserved.
 *
 * This program is open source software: you can redistribute it and/or
-* modify it under the terms of the following MIT License (MIT).
+* modify it under the terms of the GNU General Public License as published
+* by the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
 *
-* Permission is hereby granted, free of charge, to any person obtaining a
-* copy of this software and associated documentation files (the "Software"),
-* to deal in the Software without restriction, including without limitation
-* the rights to use, copy, modify, merge, publish, distribute, sublicense,
-* and/or sell copies of the Software, and to permit persons to whom the
-* Software is furnished to do so, subject to the following conditions:
+* Alternatively, this program may be distributed and modified under the
+* terms of Quantum Leaps commercial licenses, which expressly supersede
+* the GNU General Public License and are specifically designed for
+* licensees interested in retaining the proprietary status of their code.
 *
-* The above copyright notice and this permission notice shall be included in
-* all copies or substantial portions of the Software.
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-* DEALINGS IN THE SOFTWARE.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
 *
 * Contact information:
-* Web  : http://www.state-machine.com
+* Web:   www.state-machine.com
 * Email: info@state-machine.com
 ******************************************************************************
 * @endcond

+ 16 - 19
ports/win32/win32_gui.c

@@ -1,10 +1,10 @@
 /**
 * @file
 * @brief Win32 GUI facilities for building realistic embedded front panels
-* @ingroup ports
 * @cond
 ******************************************************************************
-* Last Update: 2015-03-02
+* Last Updated for Version: 5.4.2
+* Date of the Last Update:  2015-06-04
 *
 *                    Q u a n t u m     L e a P s
 *                    ---------------------------
@@ -13,28 +13,25 @@
 * Copyright (C) Quantum Leaps, LLC. All rights reserved.
 *
 * This program is open source software: you can redistribute it and/or
-* modify it under the terms of the following MIT License (MIT).
+* modify it under the terms of the GNU General Public License as published
+* by the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
 *
-* Permission is hereby granted, free of charge, to any person obtaining a
-* copy of this software and associated documentation files (the "Software"),
-* to deal in the Software without restriction, including without limitation
-* the rights to use, copy, modify, merge, publish, distribute, sublicense,
-* and/or sell copies of the Software, and to permit persons to whom the
-* Software is furnished to do so, subject to the following conditions:
+* Alternatively, this program may be distributed and modified under the
+* terms of Quantum Leaps commercial licenses, which expressly supersede
+* the GNU General Public License and are specifically designed for
+* licensees interested in retaining the proprietary status of their code.
 *
-* The above copyright notice and this permission notice shall be included in
-* all copies or substantial portions of the Software.
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-* DEALINGS IN THE SOFTWARE.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
 *
 * Contact information:
-* Web  : http://www.state-machine.com
+* Web:   www.state-machine.com
 * Email: info@state-machine.com
 ******************************************************************************
 * @endcond

+ 16 - 19
ports/win32/win32_gui.h

@@ -1,10 +1,10 @@
 /**
 * @file
 * @brief Win32 GUI facilities for building realistic embedded front panels
-* @ingroup ports
 * @cond
 ******************************************************************************
-* Last Update: 2015-06-03
+* Last Updated for Version: 5.4.2
+* Date of the Last Update:  2015-06-04
 *
 *                    Q u a n t u m     L e a P s
 *                    ---------------------------
@@ -13,28 +13,25 @@
 * Copyright (C) Quantum Leaps, LLC. All rights reserved.
 *
 * This program is open source software: you can redistribute it and/or
-* modify it under the terms of the following MIT License (MIT).
+* modify it under the terms of the GNU General Public License as published
+* by the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
 *
-* Permission is hereby granted, free of charge, to any person obtaining a
-* copy of this software and associated documentation files (the "Software"),
-* to deal in the Software without restriction, including without limitation
-* the rights to use, copy, modify, merge, publish, distribute, sublicense,
-* and/or sell copies of the Software, and to permit persons to whom the
-* Software is furnished to do so, subject to the following conditions:
+* Alternatively, this program may be distributed and modified under the
+* terms of Quantum Leaps commercial licenses, which expressly supersede
+* the GNU General Public License and are specifically designed for
+* licensees interested in retaining the proprietary status of their code.
 *
-* The above copyright notice and this permission notice shall be included in
-* all copies or substantial portions of the Software.
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-* DEALINGS IN THE SOFTWARE.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
 *
 * Contact information:
-* Web  : http://www.state-machine.com
+* Web:   www.state-machine.com
 * Email: info@state-machine.com
 ******************************************************************************
 * @endcond

+ 0 - 2
version-5.4.1

@@ -1,2 +0,0 @@
-QP/C 5.4.1
-2015-05-14

+ 2 - 0
version-5.4.2

@@ -0,0 +1,2 @@
+QP/C 5.4.2
+2015-06-03