diff options
| -rw-r--r-- | objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj | 10 | ||||
| -rw-r--r-- | python/modules/IcePy/Communicator.cpp | 2 | ||||
| -rw-r--r-- | python/modules/IcePy/ObjectAdapter.cpp | 2 | ||||
| -rw-r--r-- | python/modules/IcePy/Types.cpp | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj b/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj index 8da3fa870d0..fcdc4df598e 100644 --- a/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj +++ b/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj @@ -1649,7 +1649,6 @@ 14905C661DF98FD8002AE61B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ADDITIONAL_SDKS = "../../../../sdk/$(PLATFORM_NAME).sdk"; ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -1705,7 +1704,6 @@ 14905C671DF98FD8002AE61B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ADDITIONAL_SDKS = "../../../../sdk/$(PLATFORM_NAME).sdk"; ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -1763,10 +1761,12 @@ HEADER_SEARCH_PATHS = ( ../../Ice, ../../include, + "../../../../sdk/$(PLATFORM_NAME).sdk/usr/include", ); INFOPLIST_FILE = Classes/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib"; OTHER_LDFLAGS = ( "-lIceGridObjC", "-lGlacier2ObjC", @@ -1801,10 +1801,12 @@ HEADER_SEARCH_PATHS = ( ../../Ice, ../../include, + "../../../../sdk/$(PLATFORM_NAME).sdk/usr/include", ); INFOPLIST_FILE = Classes/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib"; OTHER_LDFLAGS = ( "-lIceGridObjC", "-lGlacier2ObjC", @@ -1837,10 +1839,12 @@ HEADER_SEARCH_PATHS = ( ../../Ice, ../../include, + "../../../../sdk/$(PLATFORM_NAME).sdk/usr/include", ); INFOPLIST_FILE = Classes/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib"; OTHER_CFLAGS = "-fobjc-arc-exceptions "; OTHER_LDFLAGS = ( "-lIceGridObjC", @@ -1874,10 +1878,12 @@ HEADER_SEARCH_PATHS = ( ../../Ice, ../../include, + "../../../../sdk/$(PLATFORM_NAME).sdk/usr/include", ); INFOPLIST_FILE = Classes/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = "../../../../sdk/$(PLATFORM_NAME).sdk/usr/lib"; OTHER_CFLAGS = "-fobjc-arc-exceptions "; OTHER_LDFLAGS = ( "-lIceGridObjC", diff --git a/python/modules/IcePy/Communicator.cpp b/python/modules/IcePy/Communicator.cpp index 52e25a20059..559a46097c6 100644 --- a/python/modules/IcePy/Communicator.cpp +++ b/python/modules/IcePy/Communicator.cpp @@ -39,7 +39,7 @@ using namespace std; using namespace IcePy; -static long _mainThreadId; +static unsigned long _mainThreadId; typedef map<Ice::CommunicatorPtr, PyObject*> CommunicatorMap; static CommunicatorMap _communicatorMap; diff --git a/python/modules/IcePy/ObjectAdapter.cpp b/python/modules/IcePy/ObjectAdapter.cpp index 2f974e0dc46..74775100df4 100644 --- a/python/modules/IcePy/ObjectAdapter.cpp +++ b/python/modules/IcePy/ObjectAdapter.cpp @@ -31,7 +31,7 @@ using namespace std; using namespace IcePy; -static long _mainThreadId; +static unsigned long _mainThreadId; namespace IcePy { diff --git a/python/modules/IcePy/Types.cpp b/python/modules/IcePy/Types.cpp index 9082e7ed783..753e45b514b 100644 --- a/python/modules/IcePy/Types.cpp +++ b/python/modules/IcePy/Types.cpp @@ -22,6 +22,8 @@ #include <Ice/OutputStream.h> #include <Ice/SlicedData.h> +#include <IceUtil/DisableWarnings.h> + #include <list> #include <limits> |