From a90d088f57391979358b354469d1d9efdc60dcdf Mon Sep 17 00:00:00 2001 From: Eilionoir Tunnicliff Date: Tue, 25 Apr 2023 14:22:19 -0400 Subject: [PATCH] Reintroduce Xcode project It's just a wrapper around the makefile. I use it to develop in Xcode (because not having an IDE is cringe and I would rather use the IDE I just spent 20 hours downloading instead of not.) --- .gitignore | 4 +- Makefile | 4 +- Natives/resources/Assets.car | Bin 9232352 -> 9232352 bytes PojavLauncher.xcodeproj/project.pbxproj | 139 ++++++++++++++++++++++++ 4 files changed, 144 insertions(+), 3 deletions(-) create mode 100644 PojavLauncher.xcodeproj/project.pbxproj diff --git a/.gitignore b/.gitignore index 0c6f3495..55ab2ccd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ /Natives/PojavLauncher /Natives/build .DS_Store -/pojavlauncher.xcodeproj +/PojavLauncher.xcodeproj/xcshareddata/* +/PojavLauncher.xcodeproj/xcuserdata/* +/PojavLauncher.xcodeproj/project.xcworkspace/* /depends /Natives/config.h diff --git a/Makefile b/Makefile index cee42eb4..6c79ceae 100644 --- a/Makefile +++ b/Makefile @@ -193,7 +193,7 @@ ifndef SDKPATH $(error You need to specify SDKPATH to the path of iPhoneOS.sdk. The SDK version should be 14.0 or newer.) endif -all: clean native java jre extras package dsym +all: clean native java jre assets payload package dsym help: echo 'Makefile to compile PojavLauncher' @@ -340,7 +340,7 @@ deploy: package: payload echo '[PojavLauncher v$(VERSION)] package - start' - if [ '$(TEAMID)' != '-1' ] && [ '$(SIGNING_TEAMID)' != '-1' ] && [ '$(PROVISIONING)' != '-1' ] && [ '$(DETECTPLAT)' = 'Darwin']; then \ + if [ '$(TEAMID)' != '-1' ] && [ '$(SIGNING_TEAMID)' != '-1' ] && [ '$(PROVISIONING)' != '-1' ] && [ '$(DETECTPLAT)' = 'Darwin' ]; then \ printf '\n\n\n\n application-identifier\n $(TEAMID).net.kdt.pojavlauncher\n com.apple.developer.team-identifier\n $(TEAMID)\n get-task-allow\n \n keychain-access-groups\n \n $(TEAMID).*\n com.apple.token\n \n\n' > entitlements.codesign.xml; \ $(MAKE) codesign; \ rm -rf entitlements.codesign.xml; \ diff --git a/Natives/resources/Assets.car b/Natives/resources/Assets.car index 70e40a7f7f076b80da80d573f07e17d2319233c2..35a26e0fe90f29c61dbefdf8b3958bb5001f6da3 100644 GIT binary patch delta 651 zcmZwFOH+*j00!W%3!O?%NfO}@%5e!Hz7VqkoSat0`a&g{-BBb*!hD4Qyl+F*dV>61K99?UYi+ z4&v-&7rWU*IeXd1ekwS?K@L&LVUF-`XB9^|#&N1S!AWX3#c9rPmUGl{o(o*$5|_C` z9rax08rQkOO>S|UJKW_S4czAe4{78Pk9k59PidxwXSDL17qsz`SG=a34mx>57u~$2 zhhEojWs delta 651 zcmZwFOH+*j00!W%3!O?%NfO}@%5e!Hz7VqkoSat0`a&g{-BBb*!hD4Qyl+F*dV>61K99?UYi+ z4&v-&7rWU*IeXd1ekwS?K@L&LVUF-`XB9^|#&N1S!AWX3#c9rPmUGl{o(o*$5|_C` z9rax08rQkOO>S|UJKW_S4czAe4{78Pk9k59PidxwXSDL17qsz`SG=a34mx>57u~$2 zhhE diff --git a/PojavLauncher.xcodeproj/project.pbxproj b/PojavLauncher.xcodeproj/project.pbxproj new file mode 100644 index 00000000..1ce4fcd0 --- /dev/null +++ b/PojavLauncher.xcodeproj/project.pbxproj @@ -0,0 +1,139 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 56; + objects = { + +/* Begin PBXFileReference section */ + 054957CB2986E91000EFD4CE /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + 054957CC2986E91000EFD4CE /* .gitmodules */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitmodules; sourceTree = ""; }; + 054957CD2986E91000EFD4CE /* entitlements.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = entitlements.xml; sourceTree = ""; }; + 054957CE2986E91000EFD4CE /* .github */ = {isa = PBXFileReference; lastKnownFileType = folder; path = .github; sourceTree = ""; }; + 054957CF2986E91000EFD4CE /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = ""; }; + 054957D02986E91000EFD4CE /* Natives */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Natives; sourceTree = ""; }; + 054957D12986E91000EFD4CE /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + 054957D22986E91000EFD4CE /* crowdin.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.yaml; path = crowdin.yml; sourceTree = ""; }; + 054957D32986E91000EFD4CE /* JavaApp */ = {isa = PBXFileReference; lastKnownFileType = folder; path = JavaApp; sourceTree = ""; }; + 054957D42986E91000EFD4CE /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXGroup section */ + 054957C02986E8DC00EFD4CE = { + isa = PBXGroup; + children = ( + 054957CE2986E91000EFD4CE /* .github */, + 054957CF2986E91000EFD4CE /* .gitignore */, + 054957CC2986E91000EFD4CE /* .gitmodules */, + 054957D22986E91000EFD4CE /* crowdin.yml */, + 054957CD2986E91000EFD4CE /* entitlements.xml */, + 054957D32986E91000EFD4CE /* JavaApp */, + 054957D42986E91000EFD4CE /* LICENSE */, + 054957CB2986E91000EFD4CE /* Makefile */, + 054957D02986E91000EFD4CE /* Natives */, + 054957D12986E91000EFD4CE /* README.md */, + ); + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXLegacyTarget section */ + 054957C52986E8DC00EFD4CE /* PojavLauncher */ = { + isa = PBXLegacyTarget; + buildArgumentsString = "$(ACTION)"; + buildConfigurationList = 054957C82986E8DC00EFD4CE /* Build configuration list for PBXLegacyTarget "PojavLauncher" */; + buildPhases = ( + ); + buildToolPath = /opt/homebrew/bin/gmake; + dependencies = ( + ); + name = PojavLauncher; + passBuildSettingsInEnvironment = 1; + productName = PojavLauncher; + }; +/* End PBXLegacyTarget section */ + +/* Begin PBXProject section */ + 054957C12986E8DC00EFD4CE /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = 1; + LastUpgradeCheck = 1420; + TargetAttributes = { + 054957C52986E8DC00EFD4CE = { + CreatedOnToolsVersion = 14.2; + }; + }; + }; + buildConfigurationList = 054957C42986E8DC00EFD4CE /* Build configuration list for PBXProject "PojavLauncher" */; + compatibilityVersion = "Xcode 14.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 054957C02986E8DC00EFD4CE; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 054957C52986E8DC00EFD4CE /* PojavLauncher */, + ); + }; +/* End PBXProject section */ + +/* Begin XCBuildConfiguration section */ + 054957C62986E8DC00EFD4CE /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PATH = "${PATH}:/opt/procursus/bin:/opt/procursus/sbin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/local/sbin"; + RELEASE = 0; + }; + name = Debug; + }; + 054957C72986E8DC00EFD4CE /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PATH = "${PATH}:/opt/procursus/bin:/opt/procursus/sbin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/local/sbin"; + RELEASE = 1; + }; + name = Release; + }; + 054957C92986E8DC00EFD4CE /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Debug; + }; + 054957CA2986E8DC00EFD4CE /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 054957C42986E8DC00EFD4CE /* Build configuration list for PBXProject "PojavLauncher" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 054957C62986E8DC00EFD4CE /* Debug */, + 054957C72986E8DC00EFD4CE /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 054957C82986E8DC00EFD4CE /* Build configuration list for PBXLegacyTarget "PojavLauncher" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 054957C92986E8DC00EFD4CE /* Debug */, + 054957CA2986E8DC00EFD4CE /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 054957C12986E8DC00EFD4CE /* Project object */; +}