Skip to content

Commit d32724a

Browse files
quantum-leapsquantum-leaps
committed
6.9.2b
Augmented QP/C++ ports to Win32 by adding QSpy64/x64 build configurations
1 parent cb2725e commit d32724a

File tree

12 files changed

+796
-51
lines changed

12 files changed

+796
-51
lines changed

‎examples/workstation/dpp/dpp.sln‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,42 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Express 2013 for Windows Desktop
4-
VisualStudioVersion = 12.0.21005.1
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.30804.86
54
MinimumVisualStudioVersion = 10.0.40219.1
65
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dpp", "dpp.vcxproj", "{8CC465F7-872E-4D03-B93C-1B64858B4E11}"
76
EndProject
87
Global
98
GlobalSection(SolutionConfigurationPlatforms) = preSolution
109
Debug|Win32 = Debug|Win32
11-
Release|Win32 = Release|Win32
10+
Debug|x64 = Debug|x64
1211
QSpy|Win32 = QSpy|Win32
12+
QSpy|x64 = QSpy|x64
13+
QSpy64|Win32 = QSpy64|Win32
14+
QSpy64|x64 = QSpy64|x64
15+
Release|Win32 = Release|Win32
16+
Release|x64 = Release|x64
1317
EndGlobalSection
1418
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1519
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.Debug|Win32.ActiveCfg = Debug|Win32
1620
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.Debug|Win32.Build.0 = Debug|Win32
17-
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.Release|Win32.ActiveCfg = Release|Win32
18-
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.Release|Win32.Build.0 = Release|Win32
21+
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.Debug|x64.ActiveCfg = Debug|x64
22+
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.Debug|x64.Build.0 = Debug|x64
1923
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy|Win32.ActiveCfg = QSpy|Win32
2024
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy|Win32.Build.0 = QSpy|Win32
25+
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy|x64.ActiveCfg = QSpy|x64
26+
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy|x64.Build.0 = QSpy|x64
27+
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy64|Win32.ActiveCfg = QSpy64|Win32
28+
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy64|Win32.Build.0 = QSpy64|Win32
29+
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy64|x64.ActiveCfg = QSpy64|x64
30+
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy64|x64.Build.0 = QSpy64|x64
31+
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.Release|Win32.ActiveCfg = Release|Win32
32+
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.Release|Win32.Build.0 = Release|Win32
33+
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.Release|x64.ActiveCfg = Release|x64
34+
{8CC465F7-872E-4D03-B93C-1B64858B4E11}.Release|x64.Build.0 = Release|x64
2135
EndGlobalSection
2236
GlobalSection(SolutionProperties) = preSolution
2337
HideSolutionNode = FALSE
2438
EndGlobalSection
39+
GlobalSection(ExtensibilityGlobals) = postSolution
40+
SolutionGuid = {435A4978-E6C4-4DB5-997D-40C45B465DD2}
41+
EndGlobalSection
2542
EndGlobal

‎examples/workstation/dpp/dpp.vcxproj‎

Lines changed: 203 additions & 0 deletions
Large diffs are not rendered by default.

‎ports/win32-qutest/qp.sln‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,30 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.31101.0
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.30804.86
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qp", "qp.vcxproj", "{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}"
66
EndProject
77
Global
88
GlobalSection(SolutionConfigurationPlatforms) = preSolution
99
Debug|Win32 = Debug|Win32
10+
Debug|x64 = Debug|x64
11+
vc64|Win32 = vc64|Win32
12+
vc64|x64 = vc64|x64
1013
EndGlobalSection
1114
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1215
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|Win32.ActiveCfg = vc|Win32
1316
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|Win32.Build.0 = vc|Win32
17+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|x64.ActiveCfg = vc|x64
18+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|x64.Build.0 = vc|x64
19+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.vc64|Win32.ActiveCfg = vc64|Win32
20+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.vc64|Win32.Build.0 = vc64|Win32
21+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.vc64|x64.ActiveCfg = vc64|x64
22+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.vc64|x64.Build.0 = vc64|x64
1423
EndGlobalSection
1524
GlobalSection(SolutionProperties) = preSolution
1625
HideSolutionNode = FALSE
1726
EndGlobalSection
27+
GlobalSection(ExtensibilityGlobals) = postSolution
28+
SolutionGuid = {7F90CAF0-10D4-4A86-96E4-586D343FC2C8}
29+
EndGlobalSection
1830
EndGlobal

‎ports/win32-qutest/qp.vcxproj‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="vc64|Win32">
5+
<Configuration>vc64</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="vc64|x64">
9+
<Configuration>vc64</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
412
<ProjectConfiguration Include="vc|Win32">
513
<Configuration>vc</Configuration>
614
<Platform>Win32</Platform>
715
</ProjectConfiguration>
16+
<ProjectConfiguration Include="vc|x64">
17+
<Configuration>vc</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
820
</ItemGroup>
921
<PropertyGroup Label="Globals">
1022
<ProjectGuid>{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}</ProjectGuid>
@@ -19,18 +31,54 @@
1931
<CLRSupport>false</CLRSupport>
2032
<PlatformToolset>v142</PlatformToolset>
2133
</PropertyGroup>
34+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='vc|x64'" Label="Configuration">
35+
<ConfigurationType>StaticLibrary</ConfigurationType>
36+
<CharacterSet>NotSet</CharacterSet>
37+
<CLRSupport>false</CLRSupport>
38+
<PlatformToolset>v142</PlatformToolset>
39+
</PropertyGroup>
40+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='vc64|Win32'" Label="Configuration">
41+
<ConfigurationType>StaticLibrary</ConfigurationType>
42+
<CharacterSet>NotSet</CharacterSet>
43+
<CLRSupport>false</CLRSupport>
44+
<PlatformToolset>v142</PlatformToolset>
45+
</PropertyGroup>
46+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='vc64|x64'" Label="Configuration">
47+
<ConfigurationType>StaticLibrary</ConfigurationType>
48+
<CharacterSet>NotSet</CharacterSet>
49+
<CLRSupport>false</CLRSupport>
50+
<PlatformToolset>v142</PlatformToolset>
51+
</PropertyGroup>
2252
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2353
<ImportGroup Label="ExtensionSettings">
2454
</ImportGroup>
2555
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='vc|Win32'" Label="PropertySheets">
2656
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
2757
</ImportGroup>
58+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='vc|x64'" Label="PropertySheets">
59+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
60+
</ImportGroup>
61+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='vc64|Win32'" Label="PropertySheets">
62+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63+
</ImportGroup>
64+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='vc64|x64'" Label="PropertySheets">
65+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
66+
</ImportGroup>
2867
<PropertyGroup Label="UserMacros" />
2968
<PropertyGroup>
3069
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
3170
<OutDir Condition="'$(Configuration)|$(Platform)'=='vc|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
71+
<OutDir Condition="'$(Configuration)|$(Platform)'=='vc64|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
3272
<IntDir Condition="'$(Configuration)|$(Platform)'=='vc|Win32'">$(Configuration)\</IntDir>
73+
<IntDir Condition="'$(Configuration)|$(Platform)'=='vc64|Win32'">$(Configuration)\</IntDir>
3374
<EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='vc|Win32'">false</EnableManagedIncrementalBuild>
75+
<EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='vc|x64'">false</EnableManagedIncrementalBuild>
76+
<EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='vc64|Win32'">false</EnableManagedIncrementalBuild>
77+
<EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='vc64|x64'">false</EnableManagedIncrementalBuild>
78+
</PropertyGroup>
79+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='vc64|x64'">
80+
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
81+
<IntDir>$(Configuration)\</IntDir>
3482
</PropertyGroup>
3583
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='vc|Win32'">
3684
<ClCompile>
@@ -51,6 +99,63 @@
5199
<Command>del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate</Command>
52100
</PostBuildEvent>
53101
</ItemDefinitionGroup>
102+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='vc|x64'">
103+
<ClCompile>
104+
<Optimization>Disabled</Optimization>
105+
<AdditionalIncludeDirectories>.;../../include;../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
106+
<PreprocessorDefinitions>Q_SPY;Q_UTEST;Q_HOST;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107+
<ExceptionHandling>
108+
</ExceptionHandling>
109+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
110+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
111+
<WarningLevel>Level4</WarningLevel>
112+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
113+
<CompileAs>Default</CompileAs>
114+
<DisableSpecificWarnings>4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
115+
</ClCompile>
116+
<PostBuildEvent>
117+
<Message>Cleanup</Message>
118+
<Command>del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate</Command>
119+
</PostBuildEvent>
120+
</ItemDefinitionGroup>
121+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='vc64|Win32'">
122+
<ClCompile>
123+
<Optimization>Disabled</Optimization>
124+
<AdditionalIncludeDirectories>.;../../include;../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
125+
<PreprocessorDefinitions>Q_SPY;Q_UTEST;Q_HOST;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126+
<ExceptionHandling>
127+
</ExceptionHandling>
128+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
129+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
130+
<WarningLevel>Level4</WarningLevel>
131+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
132+
<CompileAs>Default</CompileAs>
133+
<DisableSpecificWarnings>4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
134+
</ClCompile>
135+
<PostBuildEvent>
136+
<Message>Cleanup</Message>
137+
<Command>del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate</Command>
138+
</PostBuildEvent>
139+
</ItemDefinitionGroup>
140+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='vc64|x64'">
141+
<ClCompile>
142+
<Optimization>Disabled</Optimization>
143+
<AdditionalIncludeDirectories>.;../../include;../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
144+
<PreprocessorDefinitions>Q_SPY;Q_UTEST;Q_HOST;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145+
<ExceptionHandling>
146+
</ExceptionHandling>
147+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
148+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
149+
<WarningLevel>Level4</WarningLevel>
150+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
151+
<CompileAs>Default</CompileAs>
152+
<DisableSpecificWarnings>4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
153+
</ClCompile>
154+
<PostBuildEvent>
155+
<Message>Cleanup</Message>
156+
<Command>del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate</Command>
157+
</PostBuildEvent>
158+
</ItemDefinitionGroup>
54159
<ItemGroup>
55160
<Reference Include="System">
56161
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
@@ -68,6 +173,9 @@
68173
<ItemGroup>
69174
<CustomBuildStep Include="..\..\..\..\qs\source\qs_pkg.h">
70175
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='vc|Win32'">true</ExcludedFromBuild>
176+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='vc|x64'">true</ExcludedFromBuild>
177+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='vc64|Win32'">true</ExcludedFromBuild>
178+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='vc64|x64'">true</ExcludedFromBuild>
71179
</CustomBuildStep>
72180
</ItemGroup>
73181
<ItemGroup>

‎ports/win32-qutest/qutest_port.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
/// @ingroup ports
44
/// @cond
55
///***************************************************************************
6-
/// Last updated for version 6.9.2
7-
/// Last updated on 2021-01-14
6+
/// Last updated for version 6.9.3
7+
/// Last updated on 2021-03-16
88
///
99
/// Q u a n t u m L e a P s
1010
/// ------------------------
@@ -139,8 +139,8 @@ bool QS::onStartup(void const *arg) {
139139
for (rp = result; rp != NULL; rp = rp->ai_next) {
140140
l_sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
141141
if (l_sock != INVALID_SOCKET) {
142-
if (connect(l_sock, rp->ai_addr, rp->ai_addrlen)
143-
== SOCKET_ERROR)
142+
if (connect(l_sock, rp->ai_addr,
143+
static_cast<int>(rp->ai_addrlen)) == SOCKET_ERROR)
144144
{
145145
closesocket(l_sock);
146146
l_sock = INVALID_SOCKET;

‎ports/win32-qv/qp.sln‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,42 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual C++ Express 2010
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.30804.86
4+
MinimumVisualStudioVersion = 10.0.40219.1
45
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qp", "qp.vcxproj", "{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}"
56
EndProject
67
Global
78
GlobalSection(SolutionConfigurationPlatforms) = preSolution
89
Debug|Win32 = Debug|Win32
9-
Release|Win32 = Release|Win32
10+
Debug|x64 = Debug|x64
1011
QSpy|Win32 = QSpy|Win32
12+
QSpy|x64 = QSpy|x64
13+
QSpy64|Win32 = QSpy64|Win32
14+
QSpy64|x64 = QSpy64|x64
15+
Release|Win32 = Release|Win32
16+
Release|x64 = Release|x64
1117
EndGlobalSection
1218
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1319
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|Win32.ActiveCfg = Debug|Win32
1420
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|Win32.Build.0 = Debug|Win32
15-
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|Win32.ActiveCfg = Release|Win32
16-
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|Win32.Build.0 = Release|Win32
21+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|x64.ActiveCfg = Debug|x64
22+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|x64.Build.0 = Debug|x64
1723
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy|Win32.ActiveCfg = QSpy|Win32
1824
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy|Win32.Build.0 = QSpy|Win32
25+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy|x64.ActiveCfg = QSpy|x64
26+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy|x64.Build.0 = QSpy|x64
27+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy64|Win32.ActiveCfg = QSpy64|Win32
28+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy64|Win32.Build.0 = QSpy64|Win32
29+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy64|x64.ActiveCfg = QSpy64|x64
30+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy64|x64.Build.0 = QSpy64|x64
31+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|Win32.ActiveCfg = Release|Win32
32+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|Win32.Build.0 = Release|Win32
33+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|x64.ActiveCfg = Release|x64
34+
{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|x64.Build.0 = Release|x64
1935
EndGlobalSection
2036
GlobalSection(SolutionProperties) = preSolution
2137
HideSolutionNode = FALSE
2238
EndGlobalSection
39+
GlobalSection(ExtensibilityGlobals) = postSolution
40+
SolutionGuid = {A248BBC1-DE1F-4F97-A6BA-D6A8D9D8DC1E}
41+
EndGlobalSection
2342
EndGlobal

0 commit comments

Comments
 (0)