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

Merge branch 'release-1.0.1' into develop

Browse Source 
Conflicts:
	C/src/xplaneConnect.c
	MATLAB/+XPlaneConnect/XPlaneConnect.jar
	MATLAB/+XPlaneConnect/sendDREF.m
	xpcPlugin/XPlaneConnect/mac.xpl
This commit is contained in:
Jason Watkins
2015-05-14 13:20:15 -07:00
parent bd0c15bede 1cde0e4086
commit 238c82454c
10 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xpcPlugin/DataManager.h
View File

@@ -133,7 +133,7 @@ namespace XPC
DREF_MP4Alt,
DREF_MP5Alt,
DREF_MP6Alt,
DREF_MP7Alt,
DREF_MP7Alt
};
/// Maps X-Plane dataref lines to XPC DREF values.

BIN
xpcPlugin/XPlaneConnect/64/lin.xpl
View File

Binary file not shown.

BIN
xpcPlugin/XPlaneConnect/64/win.xpl
View File

Binary file not shown.

BIN
xpcPlugin/XPlaneConnect/lin.xpl
View File

Binary file not shown.

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

BIN
xpcPlugin/XPlaneConnect/win.xpl
View File

Binary file not shown.

15
xpcPlugin/xpcPlugin.xcodeproj/project.pbxproj
View File

@@ -207,7 +207,8 @@
D607B16309A5563100699BC3 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "c++98";
CLANG_CXX_LIBRARY = "libc++";
CONFIGURATION_BUILD_DIR = ./XPlaneConnect;
DYLIB_COMPATIBILITY_VERSION = "";
@@ -246,7 +247,7 @@
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES;
PRODUCT_NAME = "${TARGET_NAME}";
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = NO;
SDKROOT = macosx10.8;
SDKROOT = macosx;
SYMROOT = build;
XPSDK_ROOT = SDK;
};
@@ -255,9 +256,10 @@
D607B16409A5563100699BC3 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "c++98";
CLANG_CXX_LIBRARY = "libc++";
CONFIGURATION_BUILD_DIR = ./Mac;
CONFIGURATION_BUILD_DIR = ./XPlaneConnect;
DYLIB_COMPATIBILITY_VERSION = "";
DYLIB_CURRENT_VERSION = "";
EXECUTABLE_EXTENSION = xpl;
@@ -293,7 +295,7 @@
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES;
PRODUCT_NAME = "${TARGET_NAME}";
SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = NO;
SDKROOT = macosx10.8;
SDKROOT = macosx;
SYMROOT = build;
XPSDK_ROOT = SDK;
};
@@ -331,6 +333,7 @@
);
MACH_O_TYPE = mh_bundle;
PRODUCT_NAME = mac;
SDKROOT = macosx;
STRIP_INSTALLED_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = XPC;
@@ -368,7 +371,9 @@
"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/xplaneConnect-asdjuezcjkhojuewbyxhyhabxfwc/Build/Products/Debug",
);
MACH_O_TYPE = mh_bundle;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = mac;
SDKROOT = macosx;
STRIP_INSTALLED_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = XPC;