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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	C/src/xplaneConnect.c
#	xpcPlugin/XPlaneConnect/mac.xpl
#	xpcPlugin/xpcPlugin.xcodeproj/project.pbxproj
This commit is contained in:
Chris Teubert
2016-02-29 12:51:42 -08:00
parent cfdd183214 6d75e7989a
commit d548186252
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,11 +365,9 @@
"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/xplaneConnect-asdjuezcjkhojuewbyxhyhabxfwc/Build/Products/Debug",
);
MACH_O_TYPE = mh_bundle;
<<<<<<< HEAD
ONLY_ACTIVE_ARCH = YES;
=======
ONLY_ACTIVE_ARCH = NO;
>>>>>>> master
PRODUCT_NAME = mac;
SDKROOT = macosx;
STRIP_INSTALLED_PRODUCT = YES;