LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 08:30:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moved the xcode project files and related data from platform/macosx to platform/xcode.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2015-02-18 22:47:04 -04:00
parent e137c9327b
commit df0fab1b67
14 changed files with 55 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.hgignore
+3 -16
View File
@@ -1,7 +1,3 @@
relre:platform/msvc2008/include/
glob:platform/msvc2008/lib/
relre:platform/msvc2008/(.*)txt
relre:platform/msvc2008/(.*)suo
glob:extra/reshax/Release/
glob:extra/reshax/Debug/
glob:extra/reshax/resources.h
@@ -22,23 +18,14 @@ glob:*.lib
glob:*.ncb
glob:*.exe
glob:*.bat
glob:platform/macosx/build
glob:platform/macosx/Build
glob:platform/macosx/DerivedData
glob:platform/macosx/*.xcodeproj/bill*
glob:platform/macosx/*.xcodeproj/xcuserdata
glob:platform/macosx/*.xcodeproj/project.xcworkspace
glob:platform/xcode/Build
glob:platform/xcode/DerivedData
glob:*xcuserdata*
glob:*.DS_Store
glob:*.dylib
glob:*.dmg*
glob:demos
glob:*.orig
relre:platform/msvc2010/include/
glob:platform/msvc2010/lib/
relre:platform/msvc2010/(.*)txt
relre:platform/msvc2010/(.*)suo
relre:platform/msvc2010/(.*)sdf
relre:platform/msvc2010/(.*)ipch
glob:.*.swp
glob:autom4te.cache/
glob:src/.libs/
platform/macosx/dmg/DS_Store
BIN
View File
Binary file not shown.
platform/macosx/dmg/VolumeIcon.icns
BIN
View File
Binary file not shown.
platform/macosx/dmg/backgroundImage.tiff
BIN
View File
Binary file not shown.
platform/macosx/love-framework.xcodeproj/project.pbxproj → platform/xcode/liblove.xcodeproj/project.pbxproj
+12 -12
View File
@@ -801,7 +801,7 @@
FA0706E01A93ED2800AF268C /* ImageIOHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageIOHandler.h; sourceTree = "<group>"; };
FA088D841A919E1400F26F29 /* OSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSX.h; sourceTree = "<group>"; };
FA088D851A919E1400F26F29 /* OSX.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OSX.mm; sourceTree = "<group>"; };
FA08F5AE16C7525600F007B5 /* Info-Framework.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-Framework.plist"; sourceTree = "<group>"; };
FA08F5AE16C7525600F007B5 /* liblove-macosx.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "liblove-macosx.plist"; path = "macosx/liblove-macosx.plist"; sourceTree = "<group>"; };
FA0A4BEE182E0C2800E1E4D2 /* b2MotorJoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = b2MotorJoint.cpp; sourceTree = "<group>"; };
FA0A4BEF182E0C2800E1E4D2 /* b2MotorJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = b2MotorJoint.h; sourceTree = "<group>"; };
FA0A4BF2182E1AD600E1E4D2 /* MotorJoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MotorJoint.cpp; sourceTree = "<group>"; };
@@ -1927,7 +1927,7 @@
FA08F5AC16C751BA00F007B5 /* Resources */ = {
isa = PBXGroup;
children = (
FA08F5AE16C7525600F007B5 /* Info-Framework.plist */,
FA08F5AE16C7525600F007B5 /* liblove-macosx.plist */,
);
name = Resources;
sourceTree = "<group>";
@@ -2233,9 +2233,9 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
FA577AAE16C7507900860150 /* Framework */ = {
FA577AAE16C7507900860150 /* liblove-macosx */ = {
isa = PBXNativeTarget;
buildConfigurationList = FA577ABF16C7507900860150 /* Build configuration list for PBXNativeTarget "Framework" */;
buildConfigurationList = FA577ABF16C7507900860150 /* Build configuration list for PBXNativeTarget "liblove-macosx" */;
buildPhases = (
FA577AAA16C7507900860150 /* Sources */,
FA577AAB16C7507900860150 /* Frameworks */,
@@ -2246,7 +2246,7 @@
);
dependencies = (
);
name = Framework;
name = "liblove-macosx";
productName = love;
productReference = FA577AAF16C7507900860150 /* love.framework */;
productType = "com.apple.product-type.framework";
@@ -2259,7 +2259,7 @@
attributes = {
LastUpgradeCheck = 0610;
};
buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "love-framework" */;
buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "liblove" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
@@ -2270,7 +2270,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
FA577AAE16C7507900860150 /* Framework */,
FA577AAE16C7507900860150 /* liblove-macosx */,
);
};
/* End PBXProject section */
@@ -2712,7 +2712,7 @@
);
FRAMEWORK_VERSION = A;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
INFOPLIST_FILE = "Info-Framework.plist";
INFOPLIST_FILE = "macosx/liblove-macosx.plist";
LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
OTHER_LDFLAGS = (
"-undefined",
@@ -2742,7 +2742,7 @@
"DEBUG=1",
"$(inherited)",
);
INFOPLIST_FILE = "Info-Framework.plist";
INFOPLIST_FILE = "macosx/liblove-macosx.plist";
LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
OTHER_LDFLAGS = (
"-undefined",
@@ -2769,7 +2769,7 @@
);
FRAMEWORK_VERSION = A;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
INFOPLIST_FILE = "Info-Framework.plist";
INFOPLIST_FILE = "macosx/liblove-macosx.plist";
LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
OTHER_LDFLAGS = (
"-undefined",
@@ -2784,7 +2784,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "love-framework" */ = {
1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "liblove" */ = {
isa = XCConfigurationList;
buildConfigurations = (
64274E785071353E1A1D0D4B /* Debug */,
@@ -2794,7 +2794,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
FA577ABF16C7507900860150 /* Build configuration list for PBXNativeTarget "Framework" */ = {
FA577ABF16C7507900860150 /* Build configuration list for PBXNativeTarget "liblove-macosx" */ = {
isa = XCConfigurationList;
buildConfigurations = (
FA577AC016C7507900860150 /* Debug */,
platform/macosx/love.xcodeproj/TemplateIcon.icns → platform/xcode/love.xcodeproj/TemplateIcon.icns
View File
platform/macosx/love.xcodeproj/default.pbxuser → platform/xcode/love.xcodeproj/default.pbxuser
View File
platform/macosx/love.xcodeproj/project.pbxproj → platform/xcode/love.xcodeproj/project.pbxproj
+29 -26
View File
@@ -15,12 +15,12 @@
A93E6E5510420B57007D418B /* Lua.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A93E6E5310420B57007D418B /* Lua.framework */; };
A93E6EED10420BA8007D418B /* love.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A93E6A3410420AC0007D418B /* love.cpp */; };
A9D307F2106635D3004FEDF8 /* physfs.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = A9D307E9106635C3004FEDF8 /* physfs.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
A9DEC1C11046EFA70049C70C /* Love.icns in Resources */ = {isa = PBXBuildFile; fileRef = A9DEC1BF1046EFA60049C70C /* Love.icns */; };
A9DEC1C21046EFA70049C70C /* LoveDocument.icns in Resources */ = {isa = PBXBuildFile; fileRef = A9DEC1C01046EFA70049C70C /* LoveDocument.icns */; };
A9F169AC109E825000FC83D1 /* mpg123.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = A9F169A6109E824900FC83D1 /* mpg123.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
A9F169AD109E825000FC83D1 /* libmodplug.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = A9F16926109E7BAD00FC83D1 /* libmodplug.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
FA08F69616C766E000F007B5 /* love.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA08F69116C765A200F007B5 /* love.framework */; };
FA08F69716C766E700F007B5 /* love.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = FA08F69116C765A200F007B5 /* love.framework */; };
FA0B78D21A95814A000E1D17 /* love.icns in Resources */ = {isa = PBXBuildFile; fileRef = FA0B78D01A95814A000E1D17 /* love.icns */; };
FA0B78D31A95814A000E1D17 /* lovedocument.icns in Resources */ = {isa = PBXBuildFile; fileRef = FA0B78D11A95814A000E1D17 /* lovedocument.icns */; };
FA77A36518F1172600D23AE9 /* jpeg-turbo.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = FA77A36418F1172600D23AE9 /* jpeg-turbo.framework */; };
FA9B4A0A16E1579F00074F42 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA9B4A0916E1579F00074F42 /* SDL2.framework */; };
FA9B4A0B16E157B500074F42 /* SDL2.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = FA9B4A0916E1579F00074F42 /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
@@ -29,12 +29,12 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
FA08F6A616C77A4300F007B5 /* PBXContainerItemProxy */ = {
FA0B78D71A958301000E1D17 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = FA577A9316C7217800860150 /* love-framework.xcodeproj */;
containerPortal = FA577A9316C7217800860150 /* liblove.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = FA577AAF16C7507900860150;
remoteInfo = "love framework";
remoteInfo = Framework;
};
/* End PBXContainerItemProxy section */
@@ -71,14 +71,14 @@
A93E6E4710420B4A007D418B /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
A93E6E4810420B4A007D418B /* FreeType.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FreeType.framework; path = /Library/Frameworks/FreeType.framework; sourceTree = "<absolute>"; };
A93E6E5310420B57007D418B /* Lua.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Lua.framework; path = /Library/Frameworks/Lua.framework; sourceTree = "<absolute>"; };
A97E3842132A9EDE00198A2F /* love-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "love-Info.plist"; sourceTree = "<group>"; };
A97E3842132A9EDE00198A2F /* love-macosx.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "love-macosx.plist"; path = "macosx/love-macosx.plist"; sourceTree = "<group>"; };
A9D307E9106635C3004FEDF8 /* physfs.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = physfs.framework; path = /Library/Frameworks/physfs.framework; sourceTree = "<absolute>"; };
A9DEC1BF1046EFA60049C70C /* Love.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Love.icns; path = icons/Love.icns; sourceTree = "<group>"; };
A9DEC1C01046EFA70049C70C /* LoveDocument.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = LoveDocument.icns; path = icons/LoveDocument.icns; sourceTree = "<group>"; };
A9F16926109E7BAD00FC83D1 /* libmodplug.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libmodplug.framework; path = /Library/Frameworks/libmodplug.framework; sourceTree = "<absolute>"; };
A9F169A6109E824900FC83D1 /* mpg123.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mpg123.framework; path = /Library/Frameworks/mpg123.framework; sourceTree = "<absolute>"; };
FA08F69116C765A200F007B5 /* love.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = love.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FA577A9316C7217800860150 /* love-framework.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = "love-framework.xcodeproj"; sourceTree = "<group>"; };
FA0B78D01A95814A000E1D17 /* love.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = love.icns; path = macosx/love.icns; sourceTree = "<group>"; };
FA0B78D11A95814A000E1D17 /* lovedocument.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = lovedocument.icns; path = macosx/lovedocument.icns; sourceTree = "<group>"; };
FA577A9316C7217800860150 /* liblove.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = liblove.xcodeproj; sourceTree = "<group>"; };
FA77A36418F1172600D23AE9 /* jpeg-turbo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "jpeg-turbo.framework"; path = "/Library/Frameworks/jpeg-turbo.framework"; sourceTree = "<absolute>"; };
FA9B4A0916E1579F00074F42 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = "<absolute>"; };
FAAFF04616CB120000CCDE45 /* OpenAL-Soft.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "OpenAL-Soft.framework"; path = "/Library/Frameworks/OpenAL-Soft.framework"; sourceTree = "<absolute>"; };
@@ -135,7 +135,7 @@
1058C7A0FEA54F0111CA2CBB /* Frameworks */,
29B97317FDCFA39411CA2CEA /* Resources */,
19C28FACFE9D520D11CA2CBB /* Products */,
FA577A9316C7217800860150 /* love-framework.xcodeproj */,
FA577A9316C7217800860150 /* liblove.xcodeproj */,
);
name = love;
sourceTree = "<group>";
@@ -145,17 +145,17 @@
isa = PBXGroup;
children = (
FAC1A448196F5DC600125284 /* license.txt */,
A97E3842132A9EDE00198A2F /* love-Info.plist */,
A9DEC1BF1046EFA60049C70C /* Love.icns */,
A9DEC1C01046EFA70049C70C /* LoveDocument.icns */,
A97E3842132A9EDE00198A2F /* love-macosx.plist */,
FA0B78D01A95814A000E1D17 /* love.icns */,
FA0B78D11A95814A000E1D17 /* lovedocument.icns */,
);
name = Resources;
sourceTree = "<group>";
};
FA08F6A316C77A4300F007B5 /* Products */ = {
FA0B78D41A958301000E1D17 /* Products */ = {
isa = PBXGroup;
children = (
FA08F6A716C77A4300F007B5 /* love.framework */,
FA0B78D81A958301000E1D17 /* love.framework */,
);
name = Products;
sourceTree = "<group>";
@@ -171,9 +171,9 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
8D1107260486CEB800E47090 /* love */ = {
8D1107260486CEB800E47090 /* love-macosx */ = {
isa = PBXNativeTarget;
buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "love" */;
buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "love-macosx" */;
buildPhases = (
8D1107290486CEB800E47090 /* Resources */,
8D11072C0486CEB800E47090 /* Sources */,
@@ -184,7 +184,7 @@
);
dependencies = (
);
name = love;
name = "love-macosx";
productInstallPath = "$(HOME)/Applications";
productName = love;
productReference = 8D1107320486CEB800E47090 /* love.app */;
@@ -212,23 +212,23 @@
projectDirPath = "";
projectReferences = (
{
ProductGroup = FA08F6A316C77A4300F007B5 /* Products */;
ProjectRef = FA577A9316C7217800860150 /* love-framework.xcodeproj */;
ProductGroup = FA0B78D41A958301000E1D17 /* Products */;
ProjectRef = FA577A9316C7217800860150 /* liblove.xcodeproj */;
},
);
projectRoot = "";
targets = (
8D1107260486CEB800E47090 /* love */,
8D1107260486CEB800E47090 /* love-macosx */,
);
};
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
FA08F6A716C77A4300F007B5 /* love.framework */ = {
FA0B78D81A958301000E1D17 /* love.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = love.framework;
remoteRef = FA08F6A616C77A4300F007B5 /* PBXContainerItemProxy */;
remoteRef = FA0B78D71A958301000E1D17 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
@@ -239,8 +239,8 @@
buildActionMask = 2147483647;
files = (
FAC1A449196F5DC600125284 /* license.txt in Resources */,
A9DEC1C11046EFA70049C70C /* Love.icns in Resources */,
A9DEC1C21046EFA70049C70C /* LoveDocument.icns in Resources */,
FA0B78D31A95814A000E1D17 /* lovedocument.icns in Resources */,
FA0B78D21A95814A000E1D17 /* love.icns in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -269,6 +269,7 @@
);
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = "macosx/love-macosx.plist";
INSTALL_PATH = /Applications;
PRODUCT_NAME = love;
};
@@ -284,6 +285,7 @@
"\"$(SRCROOT)/build/Release\"",
"\"$(SRCROOT)/build/Debug\"",
);
INFOPLIST_FILE = "macosx/love-macosx.plist";
INSTALL_PATH = /Applications;
PRODUCT_NAME = love;
};
@@ -471,6 +473,7 @@
"\"$(SRCROOT)/build/Release\"",
"\"$(SRCROOT)/build/Debug\"",
);
INFOPLIST_FILE = "macosx/love-macosx.plist";
INSTALL_PATH = /Applications;
PRODUCT_NAME = love;
};
@@ -479,7 +482,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "love" */ = {
C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "love-macosx" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C01FCF4B08A954540054247B /* Debug */,
platform/xcode/love.xcodeproj/project.xcworkspace/contents.xcworkspacedata
Generated
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:love.xcodeproj">
</FileRef>
</Workspace>
platform/macosx/Info-Framework.plist → platform/xcode/macosx/liblove-macosx.plist
View File
platform/macosx/love-Info.plist → platform/xcode/macosx/love-macosx.plist
+3 -3
View File
@@ -8,7 +8,7 @@
<array>
<dict>
<key>CFBundleTypeIconFile</key>
<string>LoveDocument.icns</string>
<string>lovedocument</string>
<key>CFBundleTypeName</key>
<string>LÖVE Project</string>
<key>CFBundleTypeRole</key>
@@ -48,7 +48,7 @@
<key>CFBundleExecutable</key>
<string>love</string>
<key>CFBundleIconFile</key>
<string>Love.icns</string>
<string>love.icns</string>
<key>CFBundleIdentifier</key>
<string>org.love2d.love</string>
<key>CFBundleInfoDictionaryVersion</key>
@@ -77,7 +77,7 @@
<key>UTTypeDescription</key>
<string>LÖVE Project</string>
<key>UTTypeIconFile</key>
<string>LoveDocument.icns</string>
<string>lovedocument</string>
<key>UTTypeIdentifier</key>
<string>org.love2d.love-game</string>
<key>UTTypeReferenceURL</key>
platform/macosx/icons/Love.icns → platform/xcode/macosx/love.icns
View File
platform/macosx/icons/LoveDocument.icns → platform/xcode/macosx/lovedocument.icns
View File
readme.md
+1 -1
View File
@@ -22,7 +22,7 @@ Run `platform/unix/automagic` from the repository root, then run ./configure and
###Mac OS X
Download the required frameworks from [here][dependencies] and place them in `/Library/Frameworks/`.
Then use the Xcode project found at `platform/macosx/love.xcodeproj`.
Then use the Xcode project found at `platform/xcode/love.xcodeproj` to build the `love-macosx` target.
Repository information
----------------------