FlightSim-Streaming/XPlaneConnectCSP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
This commit is contained in:
Jason Watkins
2015-03-25 15:27:11 -07:00
parent b91776e687
commit 011558abfa
7 changed files with 166 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Readme.txt
View File

@@ -16,11 +16,7 @@ xpcScripts
Instructions: Instructions:
1. Purchase/Install X-Plane 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 3. Write code using the xpcScrips to manipulate X-Plane
Capabilities: Capabilities:

BIN
xpcPlugin/Win/xpcPlugin64.xpl → xpcPlugin/XPlaneConnect/64/win.xpl
View File

Binary file not shown.

0
xpcPlugin/Mac/xpcPlugin.xpl → xpcPlugin/XPlaneConnect/mac.xpl Executable file → Normal file
View File

BIN
xpcPlugin/Win/xpcPlugin32.xpl → xpcPlugin/XPlaneConnect/win.xpl
View File

Binary file not shown.

2
xpcPlugin/xpcPlugin/xpcPlugin.sln
View File

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013 # Visual Studio 2013
VisualStudioVersion = 12.0.31101.0 VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1 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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

41
xpcPlugin/xpcPlugin/xpcPlugin/xpcPlugin.vcxproj → xpcPlugin/xpcPlugin/xpcPlugin.vcxproj
View File

@@ -40,19 +40,19 @@
<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>
@@ -60,9 +60,6 @@
<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>
</SDLCheck>
<AdditionalIncludeDirectories>./src;../../SDK/CHeaders/XPLM;../../;../../../C/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>OldStyle</DebugInformationFormat> <DebugInformationFormat>OldStyle</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<OmitFramePointers /> <OmitFramePointers />
@@ -84,7 +81,6 @@
<PreprocessorDefinitions>IBM=1;XPLM200;_DEBUG;_WINDOWS;_USRDLL;XPCPLUGIN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>IBM=1;XPLM200;_DEBUG;_WINDOWS;_USRDLL;XPCPLUGIN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck> <SDLCheck>
</SDLCheck> </SDLCheck>
<AdditionalIncludeDirectories>./src;../../SDK/CHeaders/XPLM;../../;../../../C/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>OldStyle</DebugInformationFormat> <DebugInformationFormat>OldStyle</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<OmitFramePointers> <OmitFramePointers>
@@ -100,22 +96,19 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\C\src\xplaneConnect.h" /> <ClInclude Include="..\..\C\src\xplaneConnect.h" />
<ClInclude Include="..\..\xpcPluginTools.h" /> <ClInclude Include="..\xpcPluginTools.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\C\src\xplaneConnect.c" /> <ClCompile Include="..\..\C\src\xplaneConnect.c" />
<ClCompile Include="..\..\XPCPlugin.cpp" /> <ClCompile Include="..\XPCPlugin.cpp" />
<ClCompile Include="..\..\xpcPluginTools.cpp"> <ClCompile Include="..\xpcPluginTools.cpp" />
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\mfeary-admin\Documents\flightz\xpcPlugin;C:\Users\mfeary-admin\Documents\flightz\C\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\mfeary-admin\Documents\flightz\xpcPlugin;C:\Users\mfeary-admin\Documents\flightz\C\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Library Include="..\..\SDK\Libraries\Win\XPLM.lib" /> <Library Include="..\SDK\Libraries\Win\XPLM.lib" />
<Library Include="..\..\SDK\Libraries\Win\XPLM_64.lib" /> <Library Include="..\SDK\Libraries\Win\XPLM_64.lib" />
<Library Include="..\..\SDK\Libraries\Win\XPWidgets.lib" /> <Library Include="..\SDK\Libraries\Win\XPWidgets.lib" />
<Library Include="..\..\SDK\Libraries\Win\XPWidgets_64.lib" /> <Library Include="..\SDK\Libraries\Win\XPWidgets_64.lib" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

18
xpcPlugin/xpcPlugin/xpcPlugin/xpcPlugin.vcxproj.filters → xpcPlugin/xpcPlugin/xpcPlugin.vcxproj.filters
View File

@@ -15,35 +15,35 @@
</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>