From 1cf770e529666e4d9f53d7677f7e8dccffe0dbfc Mon Sep 17 00:00:00 2001 From: QL Date: Mon, 6 Jan 2020 19:33:55 -0500 Subject: [PATCH] 6.7.0 --- README.md | 10 +- doxygen/history.dox | 1 + doxygen/metrics.dox | 2 +- .../dpp_efm32-slstk3401a/win32-gui/Makefile | 278 ----------------- .../win32-gui/Resource.rc | Bin 0 -> 6904 bytes .../dpp_efm32-slstk3401a/win32-gui/bsp.c | 8 +- .../dpp_efm32-slstk3401a/win32-gui/dpp-gui.rc | 77 ----- .../win32-gui/dpp-gui.vcxproj | 9 +- .../win32-gui/dpp-gui.vcxproj.filters | 12 +- .../dpp_efm32-slstk3401a/win32-gui/resource.h | 53 ++-- .../game_efm32-slstk3401a/win32-gui/Makefile | 281 ------------------ .../win32-gui/Resource.rc | Bin 0 -> 8826 bytes .../game_efm32-slstk3401a/win32-gui/bsp.c | 8 +- .../win32-gui/game-gui.rc | 127 -------- .../win32-gui/game-gui.vcxproj | 9 +- .../win32-gui/game-gui.vcxproj.filters | 8 +- .../win32-gui/resource.h | 74 +++-- examples/workstation/dpp-comp/dpp.vcxproj | 7 +- .../workstation/dpp-comp/dpp.vcxproj.filters | 4 +- examples/workstation/dpp/dpp.vcxproj | 7 +- examples/workstation/dpp/dpp.vcxproj.filters | 4 +- include/qepn.h | 12 +- 22 files changed, 126 insertions(+), 865 deletions(-) delete mode 100644 examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/Makefile create mode 100644 examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/Resource.rc delete mode 100644 examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/dpp-gui.rc delete mode 100644 examples/arm-cm/game_efm32-slstk3401a/win32-gui/Makefile create mode 100644 examples/arm-cm/game_efm32-slstk3401a/win32-gui/Resource.rc delete mode 100644 examples/arm-cm/game_efm32-slstk3401a/win32-gui/game-gui.rc diff --git a/README.md b/README.md index ed4caf65..59ca61e6 100644 --- a/README.md +++ b/README.md @@ -78,10 +78,11 @@ model of concurrency with hierarchical state machines. --------------------------------------------------------------------------- # Getting Started with QP-nano -The [QP-nano Reference Manual](https://www.state-machine.com/qpn/) provides instructions on how to download, install, and get started with QP-nano quickly. - -The [AppNote: "Getting Started with QP-nano"](https://www.state-machine.com/doc/AN_Getting_Started_with_QP-nano.pdf) contains also a tutorial, in which you build a simple "Blinky" -application. +The [QP-nano Reference Manual](https://www.state-machine.com/qpn/) provides +instructions on how to download, install, and get started with QP-nano quickly. + +The [AppNote: "Getting Started with QP-nano"][AN] contains also a tutorial, +in which you build a simple "Blinky" application. --------------------------------------------------------------------------- @@ -116,3 +117,4 @@ The **QP-nano Manual** is located online at: https://www.state-machine.com/qpn [Active]: [HSM]: [Lic]: + [AN]: diff --git a/doxygen/history.dox b/doxygen/history.dox index 2c056d67..4499a374 100644 --- a/doxygen/history.dox +++ b/doxygen/history.dox @@ -27,6 +27,7 @@ Also, this release drops (no longer supports) the following depricated facilitie - QActive_disarm() - use QActive_disarmX() instead - Q_TIMERSET - define QF_TIMEEVT_USAGE instead +Also, this release updates the Windows-GUI examples with the QWIN Prototyping Toolkit to work with the latest Visual Studio 2019 and specifically with the Resource Editor now available. Specifically here, the Game-GUI example (qpn\examples\arm-cm\game_efm32-slstk3401a\win32-gui) and the DPP-GUI example (qpn\examples\arm-cm\dpp_efm32-slstk3401a\win32-gui) have been updated to build with the Visual Studio 2019. Finally, this release fixes the following bugs: - [bug#255 "IAR-ARM "Multi-file Compilation" fails for QK and QXK applications"](https://sourceforg/bugs/255/) diff --git a/doxygen/metrics.dox b/doxygen/metrics.dox index 8badf7f6..05d6ea13 100644 --- a/doxygen/metrics.dox +++ b/doxygen/metrics.dox @@ -9,7 +9,7 @@ License Type: Windows Single User License Licensed To : Quantum Leaps, LLC License No. : WS2975 License Date: Dec 15, 2013 - Build Date : Sep 2 2009 Run Date: Jan 02, 2020 + Build Date : Sep 2 2009 Run Date: Jan 06, 2020 (C)1996-2009 M Squared Technologies LLC ________________________________________________________________________ diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/Makefile b/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/Makefile deleted file mode 100644 index 2206cd54..00000000 --- a/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/Makefile +++ /dev/null @@ -1,278 +0,0 @@ -############################################################################## -# Product: Makefile for QP-nano, Win32-GUI, GNU GCC -# Last updated for version 6.4.0 -# Last updated on 2019-02-10 -# -# Q u a n t u m L e a P s -# ------------------------ -# Modern Embedded Software -# -# Copyright (C) 2005-2019 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 GNU General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# 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. -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Contact information: -# https://www.state-machine.com -# mailto:info@state-machine.com -############################################################################## -# -# examples of invoking this Makefile: -# building configurations: Debug (default), Release, and Spy -# make -# make CONF=rel -# -# cleaning configurations: Debug (default), Release, and Spy -# make clean -# make CONF=rel clean -# -# NOTE: -# To use this Makefile on Windows, you will need the GNU make utility, which -# is included in the QTools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ -# - -#----------------------------------------------------------------------------- -# project name: -# -PROJECT := dpp-gui - -#----------------------------------------------------------------------------- -# project directories: -# - -# list of all source directories used by this project -VPATH := . \ - .. - -# list of all include directories needed by this project -INCLUDES := -I. \ - -I.. - -# list of resource include directories needed by this project -RCINCLUDES = \ - -IRes - -# location of the QP-nano framework (if not provided in an env. variable) -ifeq ($(QPN),) -QPN := ../../../.. -endif - -#----------------------------------------------------------------------------- -# project files: -# - -# C source files... -C_SRCS := \ - bsp.c \ - main.c \ - philo.c \ - table.c - -# C++ source files... -CPP_SRCS := - -# Resource files... -RC_SRCS := \ - dpp-gui.rc - -LIB_DIRS := -LIBS := - -# defines... -# QP_API_VERSION controls the QP API compatibility; 9999 means the latest API -DEFINES := -DQP_API_VERSION=9999 - -ifeq (,$(CONF)) - CONF := dbg -endif - -#----------------------------------------------------------------------------- -# add QP-nano framework (depends on the OS this Makefile runs on): -# -ifeq ($(OS),Windows_NT) - -QPN_PORT_DIR := $(QPN)/ports/win32-qv - -C_SRCS += \ - qepn.c \ - qfn_win32.c \ - qwin_gui.c - -else - -QPN_PORT_DIR := $(QPN)/ports/posix-qv - -C_SRCS += \ - qepn.c \ - qfn_posix.c - -LIBS += -lpthread - -endif - -#============================================================================ -# Typically you should not need to change anything below this line - -VPATH += $(QPN)/src/qfn $(QPN_PORT_DIR) -INCLUDES += -I$(QPN)/include -I$(QPN)/src -I$(QPN_PORT_DIR) - -#----------------------------------------------------------------------------- -# GNU toolset: -# -# NOTE: -# GNU toolset (MinGW) is included in the QTools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ -# It is assumed that %QTOOLS%\bin directory is added to the PATH -# -CC := gcc -CPP := g++ -LINK := gcc # for C programs -#LINK := g++ # for C++ programs - -# NOTE: -# This Makefile assumes that the windres utility is available on the PATH -# (windres is available in the QTools collection for Windows) -# -RC := windres - -#----------------------------------------------------------------------------- -# basic utilities (depends on the OS this Makefile runs on): -# -ifeq ($(OS),Windows_NT) - MKDIR := mkdir - RM := rm - TARGET_EXT := .exe -else ifeq ($(OSTYPE),cygwin) - MKDIR := mkdir -p - RM := rm -f - TARGET_EXT := .exe -else - MKDIR := mkdir -p - RM := rm -f - TARGET_EXT := -endif - -#----------------------------------------------------------------------------- -# build configurations... - -ifeq (rel, $(CONF)) # Release configuration .................................. - -BIN_DIR := build_rel -# gcc options: -CFLAGS = -c -O3 -fno-pie -std=c99 -pedantic -Wall -Wextra -W \ - $(INCLUDES) $(DEFINES) -DNDEBUG - -CPPFLAGS = -c -O3 -fno-pie -std=c++11 -pedantic -Wall -Wextra \ - -fno-rtti -fno-exceptions \ - $(INCLUDES) $(DEFINES) -DNDEBUG - -else # default Debug configuration ......................................... - -BIN_DIR := build - -# gcc options: -CFLAGS = -c -g -O -fno-pie -std=c99 -pedantic -Wall -Wextra -W \ - $(INCLUDES) $(DEFINES) - -CPPFLAGS = -c -g -O -fno-pie -std=c++11 -pedantic -Wall -Wextra \ - -fno-rtti -fno-exceptions \ - $(INCLUDES) $(DEFINES) - -endif # ..................................................................... - -LINKFLAGS := -fno-pie - -# is it a GUI application (any GUI resources provided?) ... -ifneq (,$(RC_SRCS)) -LINKFLAGS += -mwindows -DEFINES += -DQWIN_GUI -endif - -#----------------------------------------------------------------------------- -C_OBJS := $(patsubst %.c,%.o, $(C_SRCS)) -CPP_OBJS := $(patsubst %.cpp,%.o, $(CPP_SRCS)) -RC_OBJS := $(patsubst %.rc, %.o, $(RC_SRCS)) - -TARGET_EXE := $(BIN_DIR)/$(PROJECT)$(TARGET_EXT) -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))","") -$(shell $(MKDIR) $(BIN_DIR)) -endif - -#----------------------------------------------------------------------------- -# rules -# - -all: $(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 : %.c - $(CC) $(CFLAGS) $< -o $@ - -$(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) $< -o $@ - -$(BIN_DIR)/%.o : %.rc - $(RC) $(RCINCLUDES) -i $< -o $@ - -# include dependency files only if our goal depends on their existence -ifneq ($(MAKECMDGOALS),clean) - ifneq ($(MAKECMDGOALS),show) --include $(C_DEPS_EXT) $(CPP_DEPS_EXT) - endif -endif - -.PHONY : clean show - -clean : - -$(RM) $(BIN_DIR)/*.o \ - $(BIN_DIR)/*.d \ - $(TARGET_EXE) - -show : - @echo PROJECT = $(PROJECT) - @echo TARGET_EXE = $(TARGET_EXE) - @echo VPATH = $(VPATH) - @echo C_SRCS = $(C_SRCS) - @echo CPP_SRCS = $(CPP_SRCS) - @echo RC_SRCS = $(RC_SRCS) - @echo C_DEPS_EXT = $(C_DEPS_EXT) - @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) - @echo DEFINES = $(DEFINES) - diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/Resource.rc b/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/Resource.rc new file mode 100644 index 0000000000000000000000000000000000000000..b9d46977243a2fd6c09d94b1eed64539ac6ee9a1 GIT binary patch literal 6904 zcmd^^Yi}Ay6o${|O8pPp^_N7Y*!a?<{bsI4!Gsz}Y{?Qz;;ZUl%V4>c`rF$+?+oMJ zg@yPMM^x2nncJB&@0{D5S^oKZ)mAOCT|2i=c5Rn7;ytl3eedWS*^Pa$3tAQXktecK zJGLS3HT`4CBl@l>HSdPnC+ZO`aXYswXo~i|ea9-Ru3Vva$mj*sM~*h0nP0RsiygIQ zt~k0AH&48`tz%v5S>LMGw6`{}J*&}MrQWud9njO|ch}1Fw5W&mg<<)gfG(7gHIU1+ zj8Bl#rF~}qW27TF^w{-2zfE>sVV{ymjsA7sX^nhY2e(eXeqL7o%O|mb$Xmw^vXUj8 zu8Z4QHpJ$I~_7 z-NaXStN`yWbY*({oN0;yqu#5%1!ynxEkOS9j-9+=)#`sP7UX+*unCoVOUNvrGIHZ( z_TF%jLe$aZ$&b8;wl;~r(w~=@W+|>bW{tdvAKPraiS3ZMb%;g#*q@-BhiK!Gh#tDm zii^ibc$#92e-tC~;?1nJ1syF{R7s-|LbXE~q4jfj?q3pbLT}hdlhG>PtytS}UR$BA zb4cf}<~C`!Xvxp_=~;6=?SI#8W71xy+;ZG?njbJjr&krv*7;qdukJYZ=vBP&BfIof z9sfE}W}8!9vy$;TtMAh%>H}Us_TF*rFt@yk91=iv%Sf}zfD+@&oQe`GdpQlOo_}WQHbfWLNQ~tu`UR8ci;h@NvmgO32 zmK?5p|5iRw2c4qj4)L_lE_+U<-iBlQjVw&(hj>e`ijoC*zCud{ehX+wE0%22trM)j z;<)tCfHJJmo0Rb##|nGyAO&Hl!6^pE4J(exX5{Gw+S2%2WZs5i4;0etd$=Z=(3v7S zq3<|6YZHXRxdFZc@#)orFlxVLR_-AidF>nb+klfsJZ_E1k_S!-F$nw#t87`=rP~2q znsC_#qp-WZ0LQ2A> z@>`*k&D>9;(w@gAN#|>{g=PACLgJn2T8y{#vHteN`a>kh`fb&%<9)7#6-k1d&g))J z+4h%KJ9EB&MF#t;J9BQy1a7$_jwYUUY(Ei2Kj2?yL?+#Wiqv)UNh4Dv@Mlit4oPX^ zd8LUYJhE&K6V9^q>9;)ffG(5~kwwv2^0;zx4yUvzLi{Qti#AcH>LO@bx7m6+N@Yj# zTe1w@>koOdYZUFHJL!@;`ZN}Q#^&=?@7KVhHRdDH7Xg1aZseR#39_dkIYuvIXQihL zknA}BY9P&nXG3zvnX0?twf(sO$@EE=NFiH$icIu%LVo-ET)716ULLZU^)XTzTNqWTS9hF;-9dE|me~jrnWk=XaVvKNDBBn9jw8Gw3;=Ul>&; zUdMZs(dZ^GeBzePuL8Bt$rjTlQ8=mn|87;`+e%t119wL_z^0U)PutaE4eS2tzt$|~ zn6K?Mw_2i)V9RN5Sgv|nIzpyf(wLa1cymgtM?C)M?q6w2)s-*oIXiAp(_KO~u91A% zNbbt)lbcKR&Ub>{r^`4)nf-ndcxCgf^z3YXIwLC*(Tik1LYvjrd=L6MUkaB?`)M?i zMf&yechPs?+3zxGe#=$Y&V(qGPyI(=1KVBvk3f*+a>*f$MhNHI`;Z%g{{y(dC Garzg;)epM> literal 0 HcmV?d00001 diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/bsp.c b/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/bsp.c index febed3bc..1eee7724 100644 --- a/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/bsp.c +++ b/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/bsp.c @@ -1,13 +1,13 @@ /***************************************************************************** * Product: "DPP" example, EFM32-SLSTK3401A, Win32-GUI -* Last Updated for Version: 6.3.7 -* Date of the Last Update: 2018-11-09 +* Last Updated for Version: 6.7.0 +* Date of the Last Update: 2020-01-06 * * Q u a n t u m L e a P s * ------------------------ * Modern Embedded Software * -* Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved. +* Copyright (C) 2005-2020 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 GNU General Public License as published @@ -79,7 +79,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, /* create the main custom dialog window */ hWnd = CreateCustDialog(hInst, IDD_APPLICATION, NULL, - &WndProc, "QP_APP"); + &WndProc, "MY_CLASS"); ShowWindow(hWnd, iCmdShow); /* show the main window */ /* enter the message loop... */ diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/dpp-gui.rc b/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/dpp-gui.rc deleted file mode 100644 index c5298654..00000000 --- a/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/dpp-gui.rc +++ /dev/null @@ -1,77 +0,0 @@ -// Generated by ResEdit 1.6.4 -// Copyright (C) 2006-2015 -// http://www.resedit.net - -#include -#include -#include -#include "resource.h" - - - - -// -// Bitmap resources -// -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_BTN_DWN BITMAP "Res\\BTN_DWN.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_BTN_UP BITMAP "Res\\BTN_UP.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_EATING BITMAP "Res\\eating.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_HUNGRY BITMAP "Res\\hungry.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_THINKING BITMAP "Res\\thinking.bmp" - - - -// -// Dialog resources -// -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_APPLICATION DIALOGEX 0, 0, 230, 205 -STYLE DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_POPUP | WS_SYSMENU -CAPTION "DPP Example" -CLASS "QP_APP" -FONT 8, "MS Shell Dlg", 0, 0, 1 -{ - CTEXT "www.state-machine.com", IDC_STATIC, 64, 190, 103, 8, SS_CENTER, WS_EX_TRANSPARENT - CONTROL IDB_THINKING, IDC_PHILO_0, WC_STATIC, SS_BITMAP, 90, 7, 53, 46, WS_EX_LEFT - CONTROL IDB_THINKING, IDC_PHILO_1, WC_STATIC, SS_BITMAP, 170, 58, 53, 46, WS_EX_TRANSPARENT - CONTROL IDB_THINKING, IDC_PHILO_4, WC_STATIC, SS_BITMAP, 7, 55, 53, 46, WS_EX_LEFT - DEFPUSHBUTTON "Quit", IDOK, 173, 7, 50, 14, WS_GROUP, WS_EX_LEFT - CONTROL IDB_THINKING, IDC_PHILO_2, WC_STATIC, SS_BITMAP, 137, 135, 53, 46, WS_EX_LEFT - CONTROL IDB_THINKING, IDC_PHILO_3, WC_STATIC, SS_BITMAP, 46, 134, 53, 46, WS_EX_LEFT - CONTROL "", IDC_PAUSE, WC_BUTTON, WS_TABSTOP | WS_TABSTOP | BS_OWNERDRAW | BS_BITMAP, 103, 73, 31, 27, WS_EX_LEFT - LTEXT "RUNNING...", IDC_PAUSED, 103, 102, 41, 8, SS_LEFT, WS_EX_LEFT -} - - - -// -// String Table resources -// -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -STRINGTABLE -{ - IDS_APP_TITLE "DPP" - IDS_PAUSED "PAUSED" - IDS_RUNNING "RUNNING..." -} - - - -// -// Icon resources -// -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDI_QP ICON "Res\\qp.ico" diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/dpp-gui.vcxproj b/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/dpp-gui.vcxproj index 66c3a2a0..68af6b9f 100644 --- a/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/dpp-gui.vcxproj +++ b/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/dpp-gui.vcxproj @@ -13,19 +13,20 @@ {79027B25-0949-4F66-9765-4EFBCBBEFB94} dpp-gui + 10.0 Application false NotSet - v120 + v142 Application false NotSet - v120 + v142 @@ -166,14 +167,14 @@ - + - + diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/dpp-gui.vcxproj.filters b/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/dpp-gui.vcxproj.filters index 5d7ee780..d106052a 100644 --- a/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/dpp-gui.vcxproj.filters +++ b/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/dpp-gui.vcxproj.filters @@ -33,18 +33,16 @@ - - QP - QP - + + QP - + @@ -54,8 +52,6 @@ QP - - QP - + \ No newline at end of file diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/resource.h b/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/resource.h index 36badf15..991b19d8 100644 --- a/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/resource.h +++ b/examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/resource.h @@ -1,21 +1,32 @@ -#ifndef IDC_STATIC -#define IDC_STATIC (-1) -#endif - -#define IDI_QP 2 -#define IDD_APPLICATION 101 -#define IDB_THINKING 134 -#define IDB_EATING 135 -#define IDB_HUNGRY 136 -#define IDB_BTN_UP 137 -#define IDB_BTN_DWN 138 -#define IDC_PHILO_0 1000 -#define IDC_PHILO_1 1001 -#define IDC_PHILO_2 1002 -#define IDC_PHILO_3 1003 -#define IDC_PHILO_4 1004 -#define IDC_PAUSE 1006 -#define IDC_PAUSED 1009 -#define IDS_APP_TITLE 40000 -#define IDS_PAUSED 40001 -#define IDS_RUNNING 40002 +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Resource.rc +// +#define IDI_QP 2 +#define IDD_APPLICATION 101 +#define IDB_THINKING 134 +#define IDB_EATING 135 +#define IDB_HUNGRY 136 +#define IDB_BTN_UP 137 +#define IDB_BTN_DWN 138 +#define IDC_PHILO_0 1000 +#define IDC_PHILO_1 1001 +#define IDC_PHILO_2 1002 +#define IDC_PHILO_3 1003 +#define IDC_PHILO_4 1004 +#define IDC_PAUSE 1006 +#define IDC_PAUSED 1009 +#define IDS_APP_TITLE 40000 +#define IDS_PAUSED 40001 +#define IDS_RUNNING 40002 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 112 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1002 +#define _APS_NEXT_SYMED_VALUE 123 +#endif +#endif diff --git a/examples/arm-cm/game_efm32-slstk3401a/win32-gui/Makefile b/examples/arm-cm/game_efm32-slstk3401a/win32-gui/Makefile deleted file mode 100644 index 0fea1038..00000000 --- a/examples/arm-cm/game_efm32-slstk3401a/win32-gui/Makefile +++ /dev/null @@ -1,281 +0,0 @@ -############################################################################## -# Product: Makefile for QP-nano, Win32-GUI, GNU GCC -# Last updated for version 6.4.0 -# Last updated on 2019-01-09 -# -# Q u a n t u m L e a P s -# ------------------------ -# Modern Embedded Software -# -# Copyright (C) 2005-2019 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 GNU General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# 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. -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Contact information: -# https://www.state-machine.com -# mailto:info@state-machine.com -############################################################################## -# -# examples of invoking this Makefile: -# building configurations: Debug (default), Release, and Spy -# make -# make CONF=rel -# -# cleaning configurations: Debug (default), Release, and Spy -# make clean -# make CONF=rel clean -# -# NOTE: -# To use this Makefile on Windows, you will need the GNU make utility, which -# is included in the QTools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ -# - -#----------------------------------------------------------------------------- -# project name: -# -PROJECT := game-gui - -#----------------------------------------------------------------------------- -# project directories: -# - -# list of all source directories used by this project -VPATH := . \ - .. - -# list of all include directories needed by this project -INCLUDES := -I. \ - -I.. - -# list of resource include directories needed by this project -RCINCLUDES = \ - -IRes - -# location of the QP-nano framework (if not provided in an env. variable) -ifeq ($(QPN),) -QPN := ../../../.. -endif - -#----------------------------------------------------------------------------- -# project files: -# - -# C source files... -C_SRCS := \ - bsp.c \ - main.c \ - mine1.c \ - mine2.c \ - missile.c \ - ship.c \ - tunnel.c - -# C++ source files... -CPP_SRCS := - -# Resource files... -RC_SRCS := \ - game-gui.rc - -LIB_DIRS := -LIBS := - -# defines... -# QP_API_VERSION controls the QP API compatibility; 9999 means the latest API -DEFINES := -DQP_API_VERSION=9999 - -ifeq (,$(CONF)) - CONF := dbg -endif - -#----------------------------------------------------------------------------- -# add QP-nano framework (depends on the OS this Makefile runs on): -# -ifeq ($(OS),Windows_NT) - -QPN_PORT_DIR := $(QPN)/ports/win32-qv - -C_SRCS += \ - qepn.c \ - qfn_win32.c \ - qwin_gui.c - -else - -QPN_PORT_DIR := $(QPN)/ports/posix-qv - -C_SRCS += \ - qepn.c \ - qfn_posix.c - -LIBS += -lpthread - -endif - -#============================================================================ -# Typically you should not need to change anything below this line - -VPATH += $(QPN)/src/qfn $(QPN_PORT_DIR) -INCLUDES += -I$(QPN)/include -I$(QPN)/src -I$(QPN_PORT_DIR) - -#----------------------------------------------------------------------------- -# GNU toolset: -# -# NOTE: -# GNU toolset (MinGW) is included in the QTools collection for Windows, see: -# http://sourceforge.net/projects/qpc/files/QTools/ -# It is assumed that %QTOOLS%\bin directory is added to the PATH -# -CC := gcc -CPP := g++ -LINK := gcc # for C programs -#LINK := g++ # for C++ programs - -# NOTE: -# This Makefile assumes that the windres utility is available on the PATH -# (windres is available in the QTools collection for Windows) -# -RC := windres - -#----------------------------------------------------------------------------- -# basic utilities (depends on the OS this Makefile runs on): -# -ifeq ($(OS),Windows_NT) - MKDIR := mkdir - RM := rm - TARGET_EXT := .exe -else ifeq ($(OSTYPE),cygwin) - MKDIR := mkdir -p - RM := rm -f - TARGET_EXT := .exe -else - MKDIR := mkdir -p - RM := rm -f - TARGET_EXT := -endif - -#----------------------------------------------------------------------------- -# build configurations... - -ifeq (rel, $(CONF)) # Release configuration .................................. - -BIN_DIR := build_rel -# gcc options: -CFLAGS = -c -O3 -fno-pie -std=c99 -pedantic -Wall -Wextra -W \ - $(INCLUDES) $(DEFINES) -DNDEBUG - -CPPFLAGS = -c -O3 -fno-pie -std=c++11 -pedantic -Wall -Wextra \ - -fno-rtti -fno-exceptions \ - $(INCLUDES) $(DEFINES) -DNDEBUG - -else # default Debug configuration ......................................... - -BIN_DIR := build - -# gcc options: -CFLAGS = -c -g -O -fno-pie -std=c99 -pedantic -Wall -Wextra -W \ - $(INCLUDES) $(DEFINES) - -CPPFLAGS = -c -g -O -fno-pie -std=c++11 -pedantic -Wall -Wextra \ - -fno-rtti -fno-exceptions \ - $(INCLUDES) $(DEFINES) - -endif # ..................................................................... - -LINKFLAGS := -fno-pie - -# is it a GUI application (any GUI resources provided?) ... -ifneq (,$(RC_SRCS)) -LINKFLAGS += -mwindows -DEFINES += -DQWIN_GUI -endif - -#----------------------------------------------------------------------------- -C_OBJS := $(patsubst %.c,%.o, $(C_SRCS)) -CPP_OBJS := $(patsubst %.cpp,%.o, $(CPP_SRCS)) -RC_OBJS := $(patsubst %.rc, %.o, $(RC_SRCS)) - -TARGET_EXE := $(BIN_DIR)/$(PROJECT)$(TARGET_EXT) -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))","") -$(shell $(MKDIR) $(BIN_DIR)) -endif - -#----------------------------------------------------------------------------- -# rules -# - -all: $(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 : %.c - $(CC) $(CFLAGS) $< -o $@ - -$(BIN_DIR)/%.o : %.cpp - $(CPP) $(CPPFLAGS) $< -o $@ - -$(BIN_DIR)/%.o : %.rc - $(RC) $(RCINCLUDES) -i $< -o $@ - -# include dependency files only if our goal depends on their existence -ifneq ($(MAKECMDGOALS),clean) - ifneq ($(MAKECMDGOALS),show) --include $(C_DEPS_EXT) $(CPP_DEPS_EXT) - endif -endif - -.PHONY : clean show - -clean : - -$(RM) $(BIN_DIR)/*.o \ - $(BIN_DIR)/*.d \ - $(TARGET_EXE) - -show : - @echo PROJECT = $(PROJECT) - @echo TARGET_EXE = $(TARGET_EXE) - @echo VPATH = $(VPATH) - @echo C_SRCS = $(C_SRCS) - @echo CPP_SRCS = $(CPP_SRCS) - @echo RC_SRCS = $(RC_SRCS) - @echo C_DEPS_EXT = $(C_DEPS_EXT) - @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) - @echo DEFINES = $(DEFINES) - diff --git a/examples/arm-cm/game_efm32-slstk3401a/win32-gui/Resource.rc b/examples/arm-cm/game_efm32-slstk3401a/win32-gui/Resource.rc new file mode 100644 index 0000000000000000000000000000000000000000..ab8a55c491ab3522897113ee2eef5b0d673d4c8e GIT binary patch literal 8826 zcmd^^YfmFL6o${|O8pOM_^@3y<&q18ej^FVMhzh)VHYGMv|Sb!i3LPJv{HY2+vm08 z&Lo-41VT}&%9`=`jD7t2Ts@w@{#>&)%h{e?+9$iS8yj+++dZ`R(1!M4AMJ`(-F~3t z?7}|VHP;>Vd+IZ2chnm9z|$w5bF{?m(r)RqYTw#7%(CX{6{y#|y`uM->zkh%ziMAB z?|N(GitBgo#)ZFchvzWAFf3mQ=t7;d z7IK-C@i|huv9GNE9_dI916F;+z0IoYtW)yXgZvk4%YzvToyk{jpGi&2N7YmZTJlKS4T^qGJ*!@g`8iI@-K#;N6O~ zJ?FJ`o|T7`e>JvEyF*KUegtLR`Lw@RtYX`)UA7WW;;L+Z%m`(#1})|9U1&|maR62E z#=qHv)^PlrM4273yhcUuo6LR$O}&q~{JRg1Ymc!#Vn=U`D)hY=e)01CJqOL8I3}c% zee+9z*08c6Fz%oZ|M4p1B@AlbCH zc~JWNqrIf?X|3YbM!I`W$_3kku1j`Mq%MQkBMw-!i)lJNDI3(7eL(THr9OH4g}tM) zp5_oH#ddMpgj0b__O*?56_}yoq!D<}yZ#QV4=b*-hR~jGjTMKZ>NK;#YCWooRiA_< z&&uTo2k;3i6_$uvfL=ou_mmqKHw&~S^L;G1>&7;mmwZ5OkzFf8tDmIWa}wKhSW6(S z&@PYerDx*ZNW?2CybRv0f6#8m(3YQsHrTSFj-uHz znOev;xXTxxZhdK(yd3B8HCey(DNOQ)MKH+{Tkr_-k@fhfUxzxcjJ(emk*lz5k0QbI zH0KdX<`E`goL^^>i=?T$bmk*R>6u!ag=cmx(Rq%(EgR_LSMc1T4`CR`F(C8lYgHL=l3UbX3`cy9Y%G4q8O=TU^b%M! z$802i|1vr6bbApbevUK@@vJsIcc3hWAwI`ESki1nmLKh11HQC6ZmrSIqMM=_pEc5W z`ge;U8R9_~nHbhnyyc}ZtY@OoNk)2EToN0ZD0J45UKU4D%tWE{jr6iOic%(uat4OQ zyu{mPITJ -#include -#include -#include "resource.h" - - - - -// -// Bitmap resources -// -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_BOARD BITMAP "Res\\BOARD.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_BTN_DWN BITMAP "Res\\BTN_DWN.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_BTN_UP BITMAP "Res\\BTN_UP.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_LCD BITMAP "Res\\LCD.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_LED_OFF BITMAP "Res\\LED_OFF.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_LED_ON BITMAP "Res\\LED_ON.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_SEG BITMAP "Res\\seg.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_SEG0 BITMAP "Res\\seg0.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_SEG1 BITMAP "Res\\seg1.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_SEG2 BITMAP "Res\\seg2.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_SEG3 BITMAP "Res\\seg3.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_SEG4 BITMAP "Res\\seg4.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_SEG5 BITMAP "Res\\seg5.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_SEG6 BITMAP "Res\\seg6.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_SEG7 BITMAP "Res\\seg7.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_SEG8 BITMAP "Res\\seg8.bmp" - - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDB_SEG9 BITMAP "Res\\seg9.bmp" - - - -// -// Dialog resources -// -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_APPLICATION DIALOGEX 0, 0, 568, 433 -STYLE DS_ABSALIGN | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP | WS_SYSMENU -CAPTION "Fly 'n' Shoot game" -CLASS "QP_APP" -FONT 8, "MS Shell Dlg", 0, 0, 1 -{ - CONTROL IDB_BOARD, IDC_BACKGROUND, WC_STATIC, SS_BITMAP, 7, 7, 552, 411, WS_EX_LEFT - CONTROL IDB_LCD, IDC_LCD, WC_STATIC, SS_BITMAP, 51, 80, 171, 158, WS_EX_LEFT - CONTROL "USER0", IDC_USER0, WC_BUTTON, WS_TABSTOP | WS_TABSTOP | BS_OWNERDRAW | BS_BITMAP, 160, 315, 45, 43, WS_EX_LEFT - CONTROL "USER1", IDC_USER1, WC_BUTTON, WS_TABSTOP | WS_TABSTOP | BS_OWNERDRAW | BS_BITMAP, 70, 316, 45, 44, WS_EX_LEFT - CONTROL IDB_LED_OFF, IDC_LED0, WC_STATIC, SS_BITMAP, 278, 324, 6, 16, WS_EX_LEFT - CONTROL IDB_LED_OFF, IDC_LED1, WC_STATIC, SS_BITMAP, 255, 323, 6, 16, WS_EX_LEFT - CONTROL IDB_SEG, IDC_STATIC, WC_STATIC, SS_BITMAP, 252, 206, 97, 54, WS_EX_LEFT - CONTROL IDB_SEG8, IDC_SEG3, WC_STATIC, SS_BITMAP, 261, 214, 19, 36, WS_EX_LEFT - CONTROL IDB_SEG8, IDC_SEG2, WC_STATIC, SS_BITMAP, 281, 214, 19, 36, WS_EX_LEFT - CONTROL IDB_SEG8, IDC_SEG1, WC_STATIC, SS_BITMAP, 301, 214, 19, 36, WS_EX_LEFT - CONTROL IDB_SEG8, IDC_SEG0, WC_STATIC, SS_BITMAP, 321, 214, 19, 36, WS_EX_LEFT - DEFPUSHBUTTON "Quit", IDOK, 461, 19, 93, 25, WS_GROUP, WS_EX_LEFT - CTEXT "www.state-machine.com", IDC_STATIC, 226, 421, 103, 8, SS_CENTER, WS_EX_TRANSPARENT -} - - - -// -// String Table resources -// -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -STRINGTABLE -{ - IDS_APP_TITLE "Fly 'n' Shoot" -} - - - -// -// Icon resources -// -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDI_APPLICATION ICON "Res\\qp.ico" diff --git a/examples/arm-cm/game_efm32-slstk3401a/win32-gui/game-gui.vcxproj b/examples/arm-cm/game_efm32-slstk3401a/win32-gui/game-gui.vcxproj index 9d936e24..65df67e7 100644 --- a/examples/arm-cm/game_efm32-slstk3401a/win32-gui/game-gui.vcxproj +++ b/examples/arm-cm/game_efm32-slstk3401a/win32-gui/game-gui.vcxproj @@ -13,19 +13,20 @@ {79027B25-0949-4F66-9765-4EFBCBBEFB94} game-gui + 10.0 Application false NotSet - v120 + v142 Application false NotSet - v120 + v142 @@ -158,7 +159,7 @@ - + @@ -188,7 +189,7 @@ - + diff --git a/examples/arm-cm/game_efm32-slstk3401a/win32-gui/game-gui.vcxproj.filters b/examples/arm-cm/game_efm32-slstk3401a/win32-gui/game-gui.vcxproj.filters index b271b2b8..992df3d0 100644 --- a/examples/arm-cm/game_efm32-slstk3401a/win32-gui/game-gui.vcxproj.filters +++ b/examples/arm-cm/game_efm32-slstk3401a/win32-gui/game-gui.vcxproj.filters @@ -2,9 +2,6 @@ - - QP - QP @@ -17,6 +14,9 @@ QP + + QP + @@ -30,7 +30,7 @@ - + diff --git a/examples/arm-cm/game_efm32-slstk3401a/win32-gui/resource.h b/examples/arm-cm/game_efm32-slstk3401a/win32-gui/resource.h index f0325343..5276d954 100644 --- a/examples/arm-cm/game_efm32-slstk3401a/win32-gui/resource.h +++ b/examples/arm-cm/game_efm32-slstk3401a/win32-gui/resource.h @@ -1,33 +1,43 @@ -#ifndef IDC_STATIC -#define IDC_STATIC (-1) -#endif +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Resource.rc +// +#define IDD_APPLICATION 101 +#define IDC_LCD 111 +#define IDC_LED0 112 +#define IDC_LED1 113 +#define IDC_USER0 114 +#define IDC_USER1 115 +#define IDB_BACKGROUND 120 +#define IDB_BTN_UP 137 +#define IDB_BTN_DWN 138 +#define IDB_LCD 142 +#define IDB_LED_OFF 144 +#define IDB_LED_ON 145 +#define IDB_SEG 146 +#define IDB_SEG0 150 +#define IDB_SEG1 151 +#define IDB_SEG2 152 +#define IDB_SEG3 153 +#define IDB_SEG4 154 +#define IDB_SEG5 155 +#define IDB_SEG6 156 +#define IDB_SEG7 157 +#define IDB_SEG8 158 +#define IDB_SEG9 159 +#define IDC_SEG0 1020 +#define IDC_SEG1 1021 +#define IDC_SEG2 1022 +#define IDC_SEG3 1023 +#define IDS_APP_TITLE 40000 -#define IDD_APPLICATION 101 -#define IDC_BACKGROUND 110 -#define IDC_LCD 111 -#define IDC_LED0 112 -#define IDC_LED1 113 -#define IDC_USER0 114 -#define IDC_USER1 115 -#define IDB_BOARD 120 -#define IDB_BTN_UP 137 -#define IDB_BTN_DWN 138 -#define IDB_LCD 142 -#define IDB_LED_OFF 144 -#define IDB_LED_ON 145 -#define IDB_SEG 146 -#define IDB_SEG0 150 -#define IDB_SEG1 151 -#define IDB_SEG2 152 -#define IDB_SEG3 153 -#define IDB_SEG4 154 -#define IDB_SEG5 155 -#define IDB_SEG6 156 -#define IDB_SEG7 157 -#define IDB_SEG8 158 -#define IDB_SEG9 159 -#define IDC_SEG0 1020 -#define IDC_SEG1 1021 -#define IDC_SEG2 1022 -#define IDC_SEG3 1023 -#define IDS_APP_TITLE 40000 +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 111 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1002 +#define _APS_NEXT_SYMED_VALUE 123 +#endif +#endif diff --git a/examples/workstation/dpp-comp/dpp.vcxproj b/examples/workstation/dpp-comp/dpp.vcxproj index a932174f..ba0789b7 100644 --- a/examples/workstation/dpp-comp/dpp.vcxproj +++ b/examples/workstation/dpp-comp/dpp.vcxproj @@ -14,18 +14,19 @@ {8CC465F7-872E-4D03-B93C-1B64858B4E11} dpp Win32Proj + 10.0 Application NotSet true - v120 + v142 Application NotSet - v120 + v142 @@ -100,7 +101,7 @@ - + diff --git a/examples/workstation/dpp-comp/dpp.vcxproj.filters b/examples/workstation/dpp-comp/dpp.vcxproj.filters index 9e671380..f2510b06 100644 --- a/examples/workstation/dpp-comp/dpp.vcxproj.filters +++ b/examples/workstation/dpp-comp/dpp.vcxproj.filters @@ -5,10 +5,10 @@ - + QP - + QP diff --git a/examples/workstation/dpp/dpp.vcxproj b/examples/workstation/dpp/dpp.vcxproj index a932174f..ba0789b7 100644 --- a/examples/workstation/dpp/dpp.vcxproj +++ b/examples/workstation/dpp/dpp.vcxproj @@ -14,18 +14,19 @@ {8CC465F7-872E-4D03-B93C-1B64858B4E11} dpp Win32Proj + 10.0 Application NotSet true - v120 + v142 Application NotSet - v120 + v142 @@ -100,7 +101,7 @@ - + diff --git a/examples/workstation/dpp/dpp.vcxproj.filters b/examples/workstation/dpp/dpp.vcxproj.filters index 9e671380..f2510b06 100644 --- a/examples/workstation/dpp/dpp.vcxproj.filters +++ b/examples/workstation/dpp/dpp.vcxproj.filters @@ -5,10 +5,10 @@ - + QP - + QP diff --git a/include/qepn.h b/include/qepn.h index 508dd8fc..a35e5b8d 100644 --- a/include/qepn.h +++ b/include/qepn.h @@ -4,8 +4,8 @@ * @ingroup qepn * @cond ****************************************************************************** -* Last updated for version 6.6.0 -* Last updated on 2019-10-14 +* Last updated for version 6.7.0 +* Last updated on 2019-12-28 * * Q u a n t u m L e a P s * ------------------------ @@ -45,16 +45,16 @@ * major version number, Y is a 1-digit minor version number, and Z is * a 1-digit release number. */ -#define QP_VERSION 660U +#define QP_VERSION 670U /*! The current QP version number string of the form XX.Y.Z, where XX is * a 2-digit major version number, Y is a 1-digit minor version number, * and Z is a 1-digit release number. */ -#define QP_VERSION_STR "6.6.0" +#define QP_VERSION_STR "6.7.0" -/*! Encrypted current QP release (6.6.0) and date (2019-10-31) */ -#define QP_RELEASE 0x8E22F8FBU +/*! Encrypted current QP release (6.7.0) and date (2019-12-30) */ +#define QP_RELEASE 0x8E049B81U /****************************************************************************/