Skip to content

Commit

Permalink
Fix for missing public headers, update Xcode project with new warning…
Browse files Browse the repository at this point in the history 
…s, fix some integer types
  • Loading branch information
@bangnoise
bangnoise committed Nov 5, 2013
1 parent 44572e6 commit 434407b
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 5 deletions.
25 changes: 24 additions & 1 deletion Syphon.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
BDFAE528148CDA84008C9E6F /* SyphonOpenGLFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = BDFAE526148CDA84008C9E6F /* SyphonOpenGLFunctions.h */; };
BDFBD77D126F4D8800075A23 /* SyphonDispatch.h in Headers */ = {isa = PBXBuildFile; fileRef = BDFBD77B126F4D8800075A23 /* SyphonDispatch.h */; };
BDFBD77E126F4D8800075A23 /* SyphonDispatch.c in Sources */ = {isa = PBXBuildFile; fileRef = BDFBD77C126F4D8800075A23 /* SyphonDispatch.c */; };
E2896D76182916CC008A0259 /* SyphonServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B0906BE11CBB0F500BCBE41 /* SyphonServer.h */; settings = {ATTRIBUTES = (Public, ); }; };
E2896D77182916CE008A0259 /* SyphonClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B0906C411CBB1C100BCBE41 /* SyphonClient.h */; settings = {ATTRIBUTES = (Public, ); }; };
E2896D78182916D1008A0259 /* SyphonImage.h in Headers */ = {isa = PBXBuildFile; fileRef = BD038870122EA9FF007725FF /* SyphonImage.h */; settings = {ATTRIBUTES = (Public, ); }; };
E2896D79182916D4008A0259 /* SyphonServerDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = BD606D6611D2842D00E02702 /* SyphonServerDirectory.h */; settings = {ATTRIBUTES = (Public, ); }; };
E2DE7FD312495BF50081453B /* SyphonMessageQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = E2DE7FD112495BF50081453B /* SyphonMessageQueue.h */; };
E2DE7FD412495BF50081453B /* SyphonMessageQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = E2DE7FD212495BF50081453B /* SyphonMessageQueue.m */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -355,6 +359,10 @@
buildActionMask = 2147483647;
files = (
1B0906C911CBB1CE00BCBE41 /* Syphon.h in Headers */,
E2896D76182916CC008A0259 /* SyphonServer.h in Headers */,
E2896D77182916CE008A0259 /* SyphonClient.h in Headers */,
E2896D78182916D1008A0259 /* SyphonImage.h in Headers */,
E2896D79182916D4008A0259 /* SyphonServerDirectory.h in Headers */,
1B09098711CD9A1C00BCBE41 /* SyphonClientConnectionManager.h in Headers */,
BD27307611D2B85E0084BB5E /* SyphonPrivate.h in Headers */,
BD45586211DF6BD300F15521 /* SyphonServerConnectionManager.h in Headers */,
Expand Down Expand Up @@ -400,7 +408,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0460;
LastUpgradeCheck = 0500;
};
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Syphon" */;
compatibilityVersion = "Xcode 3.2";
Expand Down Expand Up @@ -597,7 +605,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand All @@ -607,9 +617,12 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = YES;
Expand All @@ -622,17 +635,22 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DOXYGEN_PATH = /Applications/Doxygen.app/Contents/Resources/doxygen;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_GC = supported;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.6;
SDKROOT = macosx;
Expand All @@ -644,7 +662,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand All @@ -657,9 +677,12 @@
DEBUG,
);
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = YES;
Expand Down
2 changes: 1 addition & 1 deletion SyphonClient.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
{
@private
id _connectionManager;
uint32_t _lastFrameID;
NSUInteger _lastFrameID;
void (^_handler)(id);
int32_t _status;
int32_t _lock;
Expand Down
6 changes: 3 additions & 3 deletions SyphonServer.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,15 @@ - (id)initWithName:(NSString*)serverName context:(CGLContextObj)context options:
if ([aaQuality respondsToSelector:@selector(unsignedIntegerValue)]
&& [aaQuality unsignedIntegerValue] > 0)
{
_wantedMSAASampleCount = [aaQuality unsignedIntegerValue];
_wantedMSAASampleCount = [aaQuality unsignedIntValue];
_wantsContextChanges = YES;
}

NSNumber *depthBufferResolution = [options objectForKey:SyphonServerOptionDepthBufferResolution];
if ([depthBufferResolution respondsToSelector:@selector(unsignedIntegerValue)]
&& [depthBufferResolution unsignedIntegerValue] > 0)
{
_depthBufferResolution = [depthBufferResolution unsignedIntegerValue];
_depthBufferResolution = [depthBufferResolution unsignedIntValue];
if (_depthBufferResolution < 20) _depthBufferResolution = GL_DEPTH_COMPONENT16;
else if (_depthBufferResolution < 28) _depthBufferResolution = GL_DEPTH_COMPONENT24;
else _depthBufferResolution = GL_DEPTH_COMPONENT32;
Expand All @@ -172,7 +172,7 @@ - (id)initWithName:(NSString*)serverName context:(CGLContextObj)context options:
&& [stencilBufferResolution unsignedIntegerValue] > 0)
{
// In fact this will almost always be ignored other than to check it is non-zero
_stencilBufferResolution = [stencilBufferResolution unsignedIntegerValue];
_stencilBufferResolution = [stencilBufferResolution unsignedIntValue];
if (_stencilBufferResolution < 3) _stencilBufferResolution = GL_STENCIL_INDEX1;
else if (_stencilBufferResolution < 6) _stencilBufferResolution = GL_STENCIL_INDEX4;
else if (_stencilBufferResolution < 12) _stencilBufferResolution = GL_STENCIL_INDEX8;
Expand Down

0 comments on commit 434407b

Please sign in to comment.