Skip to content

Commit

Permalink
Updated Xcode projects and also removed some DRDTeam devbuild error.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ioan-chera
ioan-chera committed Nov 15, 2018
1 parent 1a06196 commit 1482c92
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 6 deletions.
8 changes: 8 additions & 0 deletions macosx/EternityEngine.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
@@ -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>
5 changes: 5 additions & 0 deletions ...sx/EternityEngine.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
View file
@@ -0,0 +1,5 @@
<?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/>
</plist>
0 macosx/launcher/English.lproj/About.xib → macosx/launcher/Base.lproj/About.xib
View file
File renamed without changes.
0 macosx/launcher/English.lproj/Launcher.xib → macosx/launcher/Base.lproj/Launcher.xib
View file
File renamed without changes.
13 changes: 8 additions & 5 deletions macosx/launcher/EternityLaunch.xcodeproj/project.pbxproj
View file
Expand Up @@ -63,9 +63,10 @@
256AC3F00F4B6AF500CF3369 /* EternityLaunch_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EternityLaunch_Prefix.pch; sourceTree = "<group>"; };
4F015B8A18775CB100ADB3F4 /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AUTHORS; path = ../../AUTHORS; sourceTree = "<group>"; };
4F015B8B18775CB100ADB3F4 /* COPYING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = COPYING; path = ../../COPYING; sourceTree = "<group>"; };
4F015B8F1877613100ADB3F4 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/About.xib; sourceTree = "<group>"; };
4F015B941877636F00ADB3F4 /* ELAboutController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ELAboutController.h; sourceTree = "<group>"; };
4F015B951877636F00ADB3F4 /* ELAboutController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ELAboutController.m; sourceTree = "<group>"; };
4F1C35A3219E111500795EA0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Launcher.xib; sourceTree = "<group>"; };
4F1C35A4219E111500795EA0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/About.xib; sourceTree = "<group>"; };
4F2F32B1186710B100EED7DE /* EternityEngine.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = EternityEngine.xcodeproj; path = ../EternityEngine.xcodeproj; sourceTree = "<group>"; };
4F48AAC820E5682B00AD935F /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = "../sdl-mac-releases/SDL2.framework"; sourceTree = "<group>"; };
4F48AACA20E5682B00AD935F /* SDL2_mixer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_mixer.framework; path = "../sdl-mac-releases/SDL2_mixer.framework"; sourceTree = "<group>"; };
Expand All @@ -79,7 +80,6 @@
FA3011F0168A427B005D25A8 /* ELCommandLineArgument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ELCommandLineArgument.m; sourceTree = "<group>"; };
FA3011F2168A44DF005D25A8 /* ELCommandLineArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ELCommandLineArray.h; sourceTree = "<group>"; };
FA3011F3168A44DF005D25A8 /* ELCommandLineArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ELCommandLineArray.m; sourceTree = "<group>"; };
FA601C7A1696246800046D2D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Launcher.xib; sourceTree = "<group>"; };
FA82164B1647128900FF998A /* base */ = {isa = PBXFileReference; lastKnownFileType = folder; name = base; path = ../../base; sourceTree = SOURCE_ROOT; };
FA8216761647128900FF998A /* docs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = docs; path = ../../docs; sourceTree = SOURCE_ROOT; };
FA8216871647128900FF998A /* user */ = {isa = PBXFileReference; lastKnownFileType = folder; name = user; path = ../../user; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -234,7 +234,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0940;
LastUpgradeCheck = 1010;
TargetAttributes = {
8D1107260486CEB800E47090 = {
DevelopmentTeam = 66L236F264;
Expand All @@ -251,6 +251,7 @@
French,
German,
en,
Base,
);
mainGroup = 29B97314FDCFA39411CA2CEA /* EternityLaunch */;
projectDirPath = "";
Expand Down Expand Up @@ -329,15 +330,15 @@
4F015B8E1877613100ADB3F4 /* About.xib */ = {
isa = PBXVariantGroup;
children = (
4F015B8F1877613100ADB3F4 /* English */,
4F1C35A4219E111500795EA0 /* Base */,
);
name = About.xib;
sourceTree = "<group>";
};
FA601C791696246800046D2D /* Launcher.xib */ = {
isa = PBXVariantGroup;
children = (
FA601C7A1696246800046D2D /* English */,
4F1C35A3219E111500795EA0 /* Base */,
);
name = Launcher.xib;
sourceTree = "<group>";
Expand All @@ -349,6 +350,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
Expand All @@ -366,6 +368,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_MODEL_TUNING = G5;
Expand Down
8 changes: 8 additions & 0 deletions ...uncher/EternityLaunch.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
@@ -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 macosx/launcher/LauncherController.m
View file
Expand Up @@ -656,7 +656,7 @@ -(BOOL)doAddIwadFromURL:(NSURL *)wURL atIndex:(NSInteger)ind

SET_UNDO(iwadPopUp, doRemoveIwadAtIndex:ind, @"Add/Remove Game WAD")

NSArray<NSMenuItem *> *items = iwadPopUp.menu.itemArray;
NSArray *items = iwadPopUp.menu.itemArray;
if(ind < 0 || ind >= items.count)
last = items.lastObject;
else
Expand Down

0 comments on commit 1482c92

Please sign in to comment.