Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Mac builds #318

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix Mac builds #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
991df6e
Mac: Target macOS 10.7 and libc++
JensAyton Jan 12, 2019
574102c
Mac: Modernize project files and xibs
JensAyton Jan 13, 2019
134f0ad
Mac: Deal with various warnings
JensAyton Jan 13, 2019
a4ccd4b
Bump Mac-specific
JensAyton Jan 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Doc/CHANGELOG.TXT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ Scripting:
Bug fixes:
==========

System requirements:
====================

Mac-specific
------------
* Oolite now requires Mac OS X 10.7 or later.

-------------------------------------------------------------------------------

Changes between Oolite 1.86 and Oolite 1.88:
Expand Down
2 changes: 1 addition & 1 deletion Mac-specific
Open in desktop
Submodule Mac-specific updated 14 files
+12 −4 DebugBundle/DebugBundle.xcodeproj/project.pbxproj
+7 −6 DebugBundle/Resources/English.lproj/OOAIDebugInspectorModule.xib
+21 −22 DebugBundle/Resources/English.lproj/OODebugController.xib
+8 −7 DebugBundle/Resources/English.lproj/OODebugInspector.xib
+7 −6 DebugBundle/Resources/English.lproj/OOEntityDebugInspectorModule.xib
+7 −7 DebugBundle/Resources/English.lproj/OOObjectDebugInspectorModule.xib
+7 −6 DebugBundle/Resources/English.lproj/OOShipDebugInspectorModule.xib
+7 −7 DebugBundle/Resources/English.lproj/OOShipGroupDebugInspectorModule.xib
+6 −2 DebugBundle/Source/RBSplitView/RBSplitSubview.m
+2 −2 OCUnitTests/OoliteUnitTests.xcodeproj/project.pbxproj
+50 −294 Oolite-docktile/English.lproj/OODockTilePlugIn.xib
+0 −1 Oolite-docktile/OODockTilePlugIn.h
+2 −2 Oolite-docktile/Oolite-docktile.xcodeproj/project.pbxproj
+2 −2 Oolite-importer/Oolite-importer.xcodeproj/project.pbxproj
54 changes: 48 additions & 6 deletions Oolite.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 47;
objectVersion = 50;
objects = {

/* Begin PBXAggregateTarget section */
Expand Down Expand Up @@ -3481,11 +3481,11 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 0730;
LastUpgradeCheck = 1010;
ORGANIZATIONNAME = "the Oolite team";
};
buildConfigurationList = 08B31CB008FE63D70038D42F /* Build configuration list for PBXProject "Oolite" */;
compatibilityVersion = "Xcode 6.3";
compatibilityVersion = "Xcode 9.3";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
Expand Down Expand Up @@ -4026,6 +4026,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 1ABFEE2110507987005AA752 /* oolite-nonshared.xcconfig */;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
COPY_SCHEMATA = 1;
Expand Down Expand Up @@ -4063,7 +4064,17 @@
PRODUCT_BUNDLE_IDENTIFIER = org.aegidian.oolite;
PRODUCT_NAME = Oolite;
SECTORDER_FLAGS = "";
USER_HEADER_SEARCH_PATHS = "\"$(DEPS_INCLUDE_PATH)/ogg\" \"$(DEPS_INCLUDE_PATH)/js\" \"$(DEPS_INCLUDE_PATH)/vorbis\" \"$(DEPS_INCLUDE_PATH)/png\" \"$(SRCROOT)/src/Core/\" \"$(SRCROOT)/src/Core/Tables/\" \"$(SRCROOT)/src/Core/Entites/\" \"$(SRCROOT)/src/Core/Materials/\" \"$(SRCROOT)/src/BSDCompat/\"";
USER_HEADER_SEARCH_PATHS = (
"\"$(DEPS_INCLUDE_PATH)/ogg\"",
"\"$(DEPS_INCLUDE_PATH)/js\"",
"\"$(DEPS_INCLUDE_PATH)/vorbis\"",
"\"$(DEPS_INCLUDE_PATH)/png\"",
"\"$(SRCROOT)/src/Core/\"",
"\"$(SRCROOT)/src/Core/Tables/\"",
"\"$(SRCROOT)/src/Core/Entites/\"",
"\"$(SRCROOT)/src/Core/Materials/\"",
"\"$(SRCROOT)/src/BSDCompat/\"",
);
WARNING_CFLAGS = $OO_WARNING_FLAGS;
WRAPPER_EXTENSION = app;
};
Expand All @@ -4073,6 +4084,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 1ABFEE2110507987005AA752 /* oolite-nonshared.xcconfig */;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DEPS_INCLUDE_PATH = "$(SYMROOT)/$(CONFIGURATION)/include";
Expand Down Expand Up @@ -4105,7 +4117,17 @@
PRODUCT_BUNDLE_IDENTIFIER = org.aegidian.oolite;
PRODUCT_NAME = Oolite;
SECTORDER_FLAGS = "";
USER_HEADER_SEARCH_PATHS = "\"$(DEPS_INCLUDE_PATH)/ogg\" \"$(DEPS_INCLUDE_PATH)/js\" \"$(DEPS_INCLUDE_PATH)/vorbis\" \"$(DEPS_INCLUDE_PATH)/png\" \"$(SRCROOT)/src/Core/\" \"$(SRCROOT)/src/Core/Tables/\" \"$(SRCROOT)/src/Core/Entites/\" \"$(SRCROOT)/src/Core/Materials/\" \"$(SRCROOT)/src/BSDCompat/\"";
USER_HEADER_SEARCH_PATHS = (
"\"$(DEPS_INCLUDE_PATH)/ogg\"",
"\"$(DEPS_INCLUDE_PATH)/js\"",
"\"$(DEPS_INCLUDE_PATH)/vorbis\"",
"\"$(DEPS_INCLUDE_PATH)/png\"",
"\"$(SRCROOT)/src/Core/\"",
"\"$(SRCROOT)/src/Core/Tables/\"",
"\"$(SRCROOT)/src/Core/Entites/\"",
"\"$(SRCROOT)/src/Core/Materials/\"",
"\"$(SRCROOT)/src/BSDCompat/\"",
);
WARNING_CFLAGS = $OO_WARNING_FLAGS;
WRAPPER_EXTENSION = app;
};
Expand All @@ -4120,11 +4142,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand Down Expand Up @@ -4155,11 +4179,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand All @@ -4182,6 +4208,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 1ABFEE2110507987005AA752 /* oolite-nonshared.xcconfig */;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
COPY_SCHEMATA = 1;
Expand Down Expand Up @@ -4210,7 +4237,17 @@
PRODUCT_BUNDLE_IDENTIFIER = org.aegidian.oolite;
PRODUCT_NAME = Oolite;
SECTORDER_FLAGS = "";
USER_HEADER_SEARCH_PATHS = "\"$(DEPS_INCLUDE_PATH)/ogg\" \"$(DEPS_INCLUDE_PATH)/js\" \"$(DEPS_INCLUDE_PATH)/vorbis\" \"$(DEPS_INCLUDE_PATH)/png\" \"$(SRCROOT)/src/Core/\" \"$(SRCROOT)/src/Core/Tables/\" \"$(SRCROOT)/src/Core/Entites/\" \"$(SRCROOT)/src/Core/Materials/\" \"$(SRCROOT)/src/BSDCompat/\"";
USER_HEADER_SEARCH_PATHS = (
"\"$(DEPS_INCLUDE_PATH)/ogg\"",
"\"$(DEPS_INCLUDE_PATH)/js\"",
"\"$(DEPS_INCLUDE_PATH)/vorbis\"",
"\"$(DEPS_INCLUDE_PATH)/png\"",
"\"$(SRCROOT)/src/Core/\"",
"\"$(SRCROOT)/src/Core/Tables/\"",
"\"$(SRCROOT)/src/Core/Entites/\"",
"\"$(SRCROOT)/src/Core/Materials/\"",
"\"$(SRCROOT)/src/BSDCompat/\"",
);
WARNING_CFLAGS = $OO_WARNING_FLAGS;
WRAPPER_EXTENSION = app;
};
Expand All @@ -4225,11 +4262,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand All @@ -4251,6 +4290,7 @@
1AD267690C8305A200B4BFD1 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
OOLITE_INCUDE_DEBUG_BUNDLE = 1;
PRODUCT_NAME = "Build All";
Expand All @@ -4260,6 +4300,7 @@
1AD2676A0C8305A200B4BFD1 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
OOLITE_INCUDE_DEBUG_BUNDLE = 0;
PRODUCT_NAME = "Build All";
Expand All @@ -4269,6 +4310,7 @@
1AD2676B0C8305A200B4BFD1 /* TestRelease */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
OOLITE_INCUDE_DEBUG_BUNDLE = 1;
PRODUCT_NAME = "Build All";
Expand Down
8 changes: 8 additions & 0 deletions Oolite.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Debug.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Deployment.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Test Release.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
21 changes: 15 additions & 6 deletions deps/Cocoa-deps/Ogg Vorbis/Ogg.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 50;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -118,10 +118,10 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0700;
LastUpgradeCheck = 1010;
};
buildConfigurationList = 730F235809181A3A00AB638C /* Build configuration list for PBXProject "Ogg" */;
compatibilityVersion = "Xcode 3.2";
compatibilityVersion = "Xcode 9.3";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
Expand Down Expand Up @@ -156,6 +156,7 @@
1ADE32B9097580C800961AE2 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
GCC_AUTO_VECTORIZATION = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
Expand All @@ -180,11 +181,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand All @@ -195,7 +198,7 @@
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
Expand All @@ -208,6 +211,7 @@
1AE344EF12CB70B800FD8C62 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
GCC_AUTO_VECTORIZATION = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
Expand All @@ -232,11 +236,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand All @@ -246,7 +252,7 @@
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
Expand All @@ -258,6 +264,7 @@
1AE344F112CB70BF00FD8C62 /* TestRelease */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
GCC_AUTO_VECTORIZATION = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
Expand All @@ -282,11 +289,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
Expand All @@ -296,7 +305,7 @@
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
Expand Down
Loading