Restructured plugin files to conform to "fat plugin" structure.

- Deleted platform specific folders from xpcPlugin folder.
 - Added new XPlaneConnect folder under xpcPlugin folder.
 - Moved and renamed windows binaries into architecture specific folders
 - Moved and renamed mac binary to XPlaneConnect root (single mac binary supports 32 & 64 bit)
 - Updated installation instructions in Readme
 - Cleaned up plugin Visual Studio project architecture

Readme.txt

@@ -16,11 +16,7 @@ xpcScripts
     
 Instructions:
     1. Purchase/Install X-Plane
-    2. Copy the X-Plane Plugin to the plugin directory
+    2. Copy the X-Plane Plugin folder (xpcPlugin/XPlaneConnect) to the plugin directory ([X-Plane Directory]/Resources/plugins/)
-        Windows Plugin (32-bit): xpcPlugin/Win/xpcPlugin32.xpl
-	Windows Plugin (63-bit): xpcPlugin/Win/xpcPlugin64.xpl
-        Mac Plugin: xpcPlugin/Mac/xpcPlugin.xpl
-        Plugin Directory: [X-Plane Directory]/Resources/plugins/
     3. Write code using the xpcScrips to manipulate X-Plane
     
 Capabilities:

xpcPlugin/xpcPlugin/xpcPlugin.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpcPlugin", "xpcPlugin\xpcPlugin.vcxproj", "{6AEF5D28-2701-44FF-AE10-1DEF07C5CAEA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpcPlugin", "xpcPlugin.vcxproj", "{6AEF5D28-2701-44FF-AE10-1DEF07C5CAEA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

xpcPlugin/xpcPlugin/xpcPlugin.vcxproj

@@ -1,123 +1,116 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
+  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
+    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
+    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-  </ItemGroup>
+  </ItemGroup>
-  <PropertyGroup Label="Globals">
+  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6AEF5D28-2701-44FF-AE10-1DEF07C5CAEA}</ProjectGuid>
+    <ProjectGuid>{6AEF5D28-2701-44FF-AE10-1DEF07C5CAEA}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
+    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>xpcPlugin</RootNamespace>
+    <RootNamespace>xpcPlugin</RootNamespace>
-  </PropertyGroup>
+  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
+    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
+  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
+    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
+  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
+  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
+  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\Win</OutDir>
+    <OutDir>..\XPlaneConnect\</OutDir>
-    <TargetExt>.xpl</TargetExt>
+    <TargetExt>.xpl</TargetExt>
-    <IncludePath>..\..\xpcPlugin\SDK\CHeaders\XPLM;..\..\C\src;$(IncludePath)</IncludePath>
+    <IncludePath>..\xpcPlugin\SDK\CHeaders\XPLM;..\SDK\CHeaders\XPLM;..\..\C\src;$(IncludePath)</IncludePath>
-    <LibraryPath>..\..\xpcPlugin\SDK\Libraries\Win;$(LibraryPath)</LibraryPath>
+    <LibraryPath>..\xpcPlugin\SDK\Libraries\Win;$(LibraryPath)</LibraryPath>
-    <TargetName>$(ProjectName)32</TargetName>
+    <TargetName>win</TargetName>
-  </PropertyGroup>
+  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetExt>.xpl</TargetExt>
+    <TargetExt>.xpl</TargetExt>
-    <IncludePath>..\..\xpcPlugin\SDK\CHeaders\XPLM;..\..\C\src;$(IncludePath)</IncludePath>
+    <IncludePath>..\xpcPlugin\SDK\CHeaders\XPLM;..\SDK\CHeaders\XPLM;..\..\C\src;$(IncludePath)</IncludePath>
-    <LibraryPath>..\..\xpcPlugin\SDK\Libraries\Win;$(LibraryPath)</LibraryPath>
+    <LibraryPath>..\xpcPlugin\SDK\Libraries\Win;$(LibraryPath)</LibraryPath>
-    <TargetName>$(ProjectName)64</TargetName>
+    <TargetName>win</TargetName>
-    <LinkIncremental>true</LinkIncremental>
+    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\Win</OutDir>
+    <OutDir>..\XPlaneConnect\64\</OutDir>
-  </PropertyGroup>
+  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
+    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
+      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>IBM=1;XPLM200;_DEBUG;_WINDOWS;_USRDLL;XPCPLUGIN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>IBM=1;XPLM200;_DEBUG;_WINDOWS;_USRDLL;XPCPLUGIN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      </SDLCheck>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>./src;../../SDK/CHeaders/XPLM;../../;../../../C/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OmitFramePointers />
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <OmitFramePointers />
+      <MinimalRebuild>false</MinimalRebuild>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+    </ClCompile>
-      <MinimalRebuild>false</MinimalRebuild>
+    <Link>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <SubSystem>Windows</SubSystem>
-    </ClCompile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-    <Link>
+    </Link>
-      <SubSystem>Windows</SubSystem>
+  </ItemDefinitionGroup>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    </Link>
+    <ClCompile>
-  </ItemDefinitionGroup>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      <WarningLevel>Level3</WarningLevel>
-    <ClCompile>
+      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PreprocessorDefinitions>IBM=1;XPLM200;_DEBUG;_WINDOWS;_USRDLL;XPCPLUGIN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>
-      <Optimization>Disabled</Optimization>
+      </SDLCheck>
-      <PreprocessorDefinitions>IBM=1;XPLM200;_DEBUG;_WINDOWS;_USRDLL;XPCPLUGIN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <SDLCheck>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      </SDLCheck>
+      <OmitFramePointers>
-      <AdditionalIncludeDirectories>./src;../../SDK/CHeaders/XPLM;../../;../../../C/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      </OmitFramePointers>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <OmitFramePointers>
+      <MinimalRebuild>false</MinimalRebuild>
-      </OmitFramePointers>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
+    </ClCompile>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+    <Link>
-      <MinimalRebuild>false</MinimalRebuild>
+      <SubSystem>Windows</SubSystem>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </ClCompile>
+    </Link>
-    <Link>
+  </ItemDefinitionGroup>
-      <SubSystem>Windows</SubSystem>
+  <ItemGroup>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+    <ClInclude Include="..\..\C\src\xplaneConnect.h" />
-    </Link>
+    <ClInclude Include="..\xpcPluginTools.h" />
-  </ItemDefinitionGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClInclude Include="..\..\..\C\src\xplaneConnect.h" />
+    <ClCompile Include="..\..\C\src\xplaneConnect.c" />
-    <ClInclude Include="..\..\xpcPluginTools.h" />
+    <ClCompile Include="..\XPCPlugin.cpp" />
-  </ItemGroup>
+    <ClCompile Include="..\xpcPluginTools.cpp" />
-  <ItemGroup>
+  </ItemGroup>
-    <ClCompile Include="..\..\..\C\src\xplaneConnect.c" />
+  <ItemGroup>
-    <ClCompile Include="..\..\XPCPlugin.cpp" />
+    <Library Include="..\SDK\Libraries\Win\XPLM.lib" />
-    <ClCompile Include="..\..\xpcPluginTools.cpp">
+    <Library Include="..\SDK\Libraries\Win\XPLM_64.lib" />
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\mfeary-admin\Documents\flightz\xpcPlugin;C:\Users\mfeary-admin\Documents\flightz\C\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    <Library Include="..\SDK\Libraries\Win\XPWidgets.lib" />
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\mfeary-admin\Documents\flightz\xpcPlugin;C:\Users\mfeary-admin\Documents\flightz\C\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    <Library Include="..\SDK\Libraries\Win\XPWidgets_64.lib" />
-    </ClCompile>
+  </ItemGroup>
-  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
+  <ImportGroup Label="ExtensionTargets">
-    <Library Include="..\..\SDK\Libraries\Win\XPLM.lib" />
+  </ImportGroup>
-    <Library Include="..\..\SDK\Libraries\Win\XPLM_64.lib" />
-    <Library Include="..\..\SDK\Libraries\Win\XPWidgets.lib" />
-    <Library Include="..\..\SDK\Libraries\Win\XPWidgets_64.lib" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>

xpcPlugin/xpcPlugin/xpcPlugin.vcxproj.filters

@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
+  <ItemGroup>
-    <Filter Include="Source Files">
+    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
+    </Filter>
-    <Filter Include="Header Files">
+    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
+    </Filter>
-    <Filter Include="Resource Files">
+    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
+    </Filter>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClInclude Include="..\..\xpcPluginTools.h">
+    <ClInclude Include="..\..\C\src\xplaneConnect.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\..\C\src\xplaneConnect.h">
+    <ClInclude Include="..\xpcPluginTools.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClCompile Include="..\..\XPCPlugin.cpp">
+    <ClCompile Include="..\..\C\src\xplaneConnect.c">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\..\C\src\xplaneConnect.c">
+    <ClCompile Include="..\XPCPlugin.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\xpcPluginTools.cpp">
+    <ClCompile Include="..\xpcPluginTools.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <Library Include="..\..\SDK\Libraries\Win\XPLM.lib">
+    <Library Include="..\SDK\Libraries\Win\XPLM.lib">
-      <Filter>Resource Files</Filter>
+      <Filter>Resource Files</Filter>
-    </Library>
+    </Library>
-    <Library Include="..\..\SDK\Libraries\Win\XPLM_64.lib">
+    <Library Include="..\SDK\Libraries\Win\XPLM_64.lib">
-      <Filter>Resource Files</Filter>
+      <Filter>Resource Files</Filter>
-    </Library>
+    </Library>
-    <Library Include="..\..\SDK\Libraries\Win\XPWidgets.lib">
+    <Library Include="..\SDK\Libraries\Win\XPWidgets.lib">
-      <Filter>Resource Files</Filter>
+      <Filter>Resource Files</Filter>
-    </Library>
+    </Library>
-    <Library Include="..\..\SDK\Libraries\Win\XPWidgets_64.lib">
+    <Library Include="..\SDK\Libraries\Win\XPWidgets_64.lib">
-      <Filter>Resource Files</Filter>
+      <Filter>Resource Files</Filter>
-    </Library>
+    </Library>
-  </ItemGroup>
+  </ItemGroup>
 </Project>