Skip to content

Commit cda2ba7

Browse files
SteveALeeSteveALee
committed
Added installer to solution
1 parent eee09af commit cda2ba7

File tree

5 files changed

+61
-3
lines changed

5 files changed

+61
-3
lines changed

‎listeners/GPII_RFIDListener/GPII_RFIDListener.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<GenerateDebugInformation>true</GenerateDebugInformation>
8585
<EnableCOMDATFolding>true</EnableCOMDATFolding>
8686
<OptimizeReferences>true</OptimizeReferences>
87-
<AdditionalDependencies>winscard.lib;libcurl\libcurl_a.lib;%(AdditionalDependencies)</AdditionalDependencies>
87+
<AdditionalDependencies>winscard.lib;libcurl_a.lib;%(AdditionalDependencies)</AdditionalDependencies>
8888
<AdditionalLibraryDirectories>lib;..\libcurl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
8989
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
9090
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>

‎listeners/installer/Installer.vcxproj‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Release|Win32">
5+
<Configuration>Release</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
</ItemGroup>
9+
<ItemGroup>
10+
<None Include="listeners.iss" />
11+
</ItemGroup>
12+
<PropertyGroup Label="Globals">
13+
<ProjectGuid>{50FB1EFD-9DC6-4F65-B891-8EA29C39C0F5}</ProjectGuid>
14+
<Keyword>MakeFileProj</Keyword>
15+
<ProjectName>installer</ProjectName>
16+
</PropertyGroup>
17+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
18+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
19+
<ConfigurationType>Makefile</ConfigurationType>
20+
<UseDebugLibraries>false</UseDebugLibraries>
21+
<PlatformToolset>v120</PlatformToolset>
22+
</PropertyGroup>
23+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
24+
<ImportGroup Label="ExtensionSettings">
25+
</ImportGroup>
26+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
27+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
28+
</ImportGroup>
29+
<PropertyGroup Label="UserMacros" />
30+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
31+
<NMakeBuildCommandLine>iscc listeners.iss</NMakeBuildCommandLine>
32+
<NMakeOutput>
33+
</NMakeOutput>
34+
<NMakePreprocessorDefinitions>
35+
</NMakePreprocessorDefinitions>
36+
<OutDir>..\bin\Release</OutDir>
37+
<IntDir>.</IntDir>
38+
</PropertyGroup>
39+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
40+
<BuildLog>
41+
<Path />
42+
</BuildLog>
43+
</ItemDefinitionGroup>
44+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
45+
<ImportGroup Label="ExtensionTargets">
46+
</ImportGroup>
47+
</Project>

‎listeners/installer/listeners.iss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#define binPath "..\bin\debug\"
1+
#define binPath "..\bin\Release\"
22

33
; Our version is the greater of the version of listners
44
#define maxVersion(str fileA, str fileB) \

‎listeners/libcurl/libcurl.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<CharacterSet>MultiByte</CharacterSet>
2323
</PropertyGroup>
2424
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
25-
<ConfigurationType>Application</ConfigurationType>
25+
<ConfigurationType>Makefile</ConfigurationType>
2626
<UseDebugLibraries>false</UseDebugLibraries>
2727
<PlatformToolset>v120</PlatformToolset>
2828
<WholeProgramOptimization>true</WholeProgramOptimization>

‎listeners/listeners.sln‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPII_USBListener", "GPII_US
1515
EndProject
1616
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "libcurl\libcurl.vcxproj", "{1B4390E9-DB8C-4205-906B-080C6F25C551}"
1717
EndProject
18+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer", "installer\Installer.vcxproj", "{50FB1EFD-9DC6-4F65-B891-8EA29C39C0F5}"
19+
ProjectSection(ProjectDependencies) = postProject
20+
{7EBBEC08-0000-0000-0000-000000000000} = {7EBBEC08-0000-0000-0000-000000000000}
21+
{7EBBEC08-3F91-486B-987E-5D29037EF1B8} = {7EBBEC08-3F91-486B-987E-5D29037EF1B8}
22+
{1B4390E9-DB8C-4205-906B-080C6F25C551} = {1B4390E9-DB8C-4205-906B-080C6F25C551}
23+
EndProjectSection
24+
EndProject
1825
Global
1926
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2027
Debug|Win32 = Debug|Win32
@@ -33,6 +40,10 @@ Global
3340
{1B4390E9-DB8C-4205-906B-080C6F25C551}.Debug|Win32.Build.0 = Debug|Win32
3441
{1B4390E9-DB8C-4205-906B-080C6F25C551}.Release|Win32.ActiveCfg = Release|Win32
3542
{1B4390E9-DB8C-4205-906B-080C6F25C551}.Release|Win32.Build.0 = Release|Win32
43+
{50FB1EFD-9DC6-4F65-B891-8EA29C39C0F5}.Debug|Win32.ActiveCfg = Release|Win32
44+
{50FB1EFD-9DC6-4F65-B891-8EA29C39C0F5}.Debug|Win32.Build.0 = Release|Win32
45+
{50FB1EFD-9DC6-4F65-B891-8EA29C39C0F5}.Release|Win32.ActiveCfg = Release|Win32
46+
{50FB1EFD-9DC6-4F65-B891-8EA29C39C0F5}.Release|Win32.Build.0 = Release|Win32
3647
EndGlobalSection
3748
GlobalSection(SolutionProperties) = preSolution
3849
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)