From 7c27ddd167c74de6baa6e2b7842d1453c793e1df Mon Sep 17 00:00:00 2001 From: aurhat Date: Sun, 23 Oct 2016 14:15:51 +0200 Subject: [PATCH] Update Xcode project Note: in InfoPlist.strings there is current AC version. --- source/xcode/English.lproj/InfoPlist.strings | Bin 640 -> 640 bytes .../assaultcube.xcodeproj/project.pbxproj | 63 ++++++++---------- source/xcode/xcode_buildnotes.txt | 6 ++ 3 files changed, 34 insertions(+), 35 deletions(-) create mode 100644 source/xcode/xcode_buildnotes.txt diff --git a/source/xcode/English.lproj/InfoPlist.strings b/source/xcode/English.lproj/InfoPlist.strings index d104535f438a3382929616b9aab498b0b7589bbc..101dff4b1cffe65bb1f3c720ad65b04ad6cbac01 100644 GIT binary patch delta 41 tcmZo*ZD5`7lhJ76uUJ+i1|0^4$sZU+C(APlFd9!bU<#Ogi7^(!0ssuG3*-O* delta 41 tcmZo*ZD5`7lhJVEuUJ+?1|0^4$sZU+C(APlFd9uZU<#Ogi7^(!0sstI3*Z0% diff --git a/source/xcode/assaultcube.xcodeproj/project.pbxproj b/source/xcode/assaultcube.xcodeproj/project.pbxproj index 78ae934d..b005f14a 100644 --- a/source/xcode/assaultcube.xcodeproj/project.pbxproj +++ b/source/xcode/assaultcube.xcodeproj/project.pbxproj @@ -43,16 +43,16 @@ 9EB8188A11EDACDB00799589 /* Server.gif in Resources */ = {isa = PBXBuildFile; fileRef = 66899EAB0C14887F00927C34 /* Server.gif */; }; B90357B509D09B9D002C9DC7 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; B914CE8E11CAC42F009BA307 /* audiomanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE3F11CAC42F009BA307 /* audiomanager.cpp */; }; - B914CE9211CAC42F009BA307 /* autodownload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE4311CAC42F009BA307 /* autodownload.cpp */; }; B914CE8F11CAC42F009BA307 /* client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE4011CAC42F009BA307 /* client.cpp */; }; B914CE9011CAC42F009BA307 /* clientgame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE4111CAC42F009BA307 /* clientgame.cpp */; }; B914CE9111CAC42F009BA307 /* clients2c.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE4211CAC42F009BA307 /* clients2c.cpp */; }; + B914CE9211CAC42F009BA307 /* autodownload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE4311CAC42F009BA307 /* autodownload.cpp */; }; + B914CE9311CAC42F009BA307 /* http.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE4411CAC42F009BA307 /* http.cpp */; }; B914CE9411CAC42F009BA307 /* command.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE4511CAC42F009BA307 /* command.cpp */; }; B914CE9611CAC42F009BA307 /* console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE4711CAC42F009BA307 /* console.cpp */; }; B914CE9911CAC42F009BA307 /* docs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE4A11CAC42F009BA307 /* docs.cpp */; }; B914CE9A11CAC42F009BA307 /* editing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE4B11CAC42F009BA307 /* editing.cpp */; }; B914CE9B11CAC42F009BA307 /* entities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE4C11CAC42F009BA307 /* entities.cpp */; }; - B914CE9311CAC42F009BA307 /* http.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE4411CAC42F009BA307 /* http.cpp */; }; B914CEA211CAC42F009BA307 /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE5311CAC42F009BA307 /* log.cpp */; }; B914CEA311CAC42F009BA307 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE5411CAC42F009BA307 /* main.cpp */; }; B914CEA711CAC42F009BA307 /* menus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE5811CAC42F009BA307 /* menus.cpp */; }; @@ -167,10 +167,11 @@ 9EFB9B6E12634B1600FCE687 /* jpegenc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jpegenc.h; sourceTree = ""; }; B2F67ED704C74A3F00A80002 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; B914CE3F11CAC42F009BA307 /* audiomanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audiomanager.cpp; sourceTree = ""; }; - B914CE4311CAC42F009BA307 /* autodownload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = autodownload.cpp; sourceTree = ""; }; B914CE4011CAC42F009BA307 /* client.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = client.cpp; sourceTree = ""; }; B914CE4111CAC42F009BA307 /* clientgame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = clientgame.cpp; sourceTree = ""; }; B914CE4211CAC42F009BA307 /* clients2c.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = clients2c.cpp; sourceTree = ""; }; + B914CE4311CAC42F009BA307 /* autodownload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = autodownload.cpp; sourceTree = ""; }; + B914CE4411CAC42F009BA307 /* http.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = http.cpp; sourceTree = ""; }; B914CE4511CAC42F009BA307 /* command.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = command.cpp; sourceTree = ""; }; B914CE4611CAC42F009BA307 /* command.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = command.h; sourceTree = ""; }; B914CE4711CAC42F009BA307 /* console.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = console.cpp; sourceTree = ""; }; @@ -181,7 +182,6 @@ B914CE4C11CAC42F009BA307 /* entities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = entities.cpp; sourceTree = ""; }; B914CE4D11CAC42F009BA307 /* entity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = entity.h; sourceTree = ""; }; B914CE4E11CAC42F009BA307 /* geom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = geom.h; sourceTree = ""; }; - B914CE4411CAC42F009BA307 /* http.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = http.cpp; sourceTree = ""; }; B914CE5011CAC42F009BA307 /* hudgun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hudgun.h; sourceTree = ""; }; B914CE5311CAC42F009BA307 /* log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = log.cpp; sourceTree = ""; }; B914CE5411CAC42F009BA307 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; @@ -391,6 +391,7 @@ 665CDCD90AFE7ED80030D605 /* src */ = { isa = PBXGroup; children = ( + 665CDCDB0AFE7ED80030D605 /* bot */, B914CE3F11CAC42F009BA307 /* audiomanager.cpp */, B914CE4311CAC42F009BA307 /* autodownload.cpp */, B914CE4011CAC42F009BA307 /* client.cpp */, @@ -400,8 +401,8 @@ B914CE4611CAC42F009BA307 /* command.h */, B914CE4711CAC42F009BA307 /* console.cpp */, B914CE4811CAC42F009BA307 /* console.h */, - 9E595536121EA8E9005ED5F7 /* crypto.cpp */, 9E595538121EA8E9005ED5F7 /* crypto_tools.h */, + 9E595536121EA8E9005ED5F7 /* crypto.cpp */, B914CE4911CAC42F009BA307 /* cube.h */, B914CE4A11CAC42F009BA307 /* docs.cpp */, B914CE4B11CAC42F009BA307 /* editing.cpp */, @@ -468,7 +469,6 @@ B914CE8B11CAC42F009BA307 /* worldocull.cpp */, B914CE8C11CAC42F009BA307 /* worldrender.cpp */, B914CE8D11CAC42F009BA307 /* zip.cpp */, - 665CDCDB0AFE7ED80030D605 /* bot */, ); name = src; path = ../src; @@ -600,7 +600,7 @@ ); runOnlyForDeploymentPostprocessing = 1; shellPath = /bin/sh; - shellScript = "echo $TARGET_BUILD_DIR\ncd $TARGET_BUILD_DIR\n\n#ensure old package is gone\nrm -f assaultcube.dmg\n\n#make the directory which our disk image will be made of\n#use /tmp as a destination because copying ourself (xcode folder) whilst compling causes the dog to chase its tail\nACPKG=`mktemp -d /tmp/acpkg.XXXXXX` || exit 1\n\n#leave indicator of where temp directory is in case things break\nln -sf $ACPKG $TARGET_BUILD_DIR/acpkg\n\n#copy launcher\n/usr/bin/CpMac -r $TARGET_BUILD_DIR/launcher.app $ACPKG/AssaultCube.app\n\nHELPDIR=$ACPKG/AssaultCube.app/Contents/Resources/help/\nGAMEDIR=$ACPKG/AssaultCube.app/Contents/gamedata\nmkdir $GAMEDIR\nmkdir $HELPDIR\n\n#copy assaultcube\n/usr/bin/CpMac -r $TARGET_BUILD_DIR/assaultcube.app $GAMEDIR/\nstrip -u -r \"$GAMEDIR/assaultcube.app/Contents/MacOS/assaultcube\"\n\n#copy readme and data and remove unneccesary stuff\n/usr/bin/CpMac -r $SRCROOT/../../README.html $HELPDIR/\n/usr/bin/CpMac -r $SRCROOT/../../docs $HELPDIR/\n/usr/bin/CpMac -r $SRCROOT/../../bot $GAMEDIR/\n/usr/bin/CpMac -r $SRCROOT/../../config $GAMEDIR/\n/usr/bin/CpMac -r $SRCROOT/../../scripts $GAMEDIR/\n/usr/bin/CpMac -r $SRCROOT/../../packages $GAMEDIR/\n/usr/bin/CpMac -r $SRCROOT/../../demos $GAMEDIR/\n#/Developer/Tools/CpMac -r $SRCROOT/../../source $ACPKG/sourcecode\n\n#clean up\nfind -d $ACPKG -name \"shadows.dat\" -exec rm -rf {} \\;\nfind -d $ACPKG -name \"CVS\" -exec rm -rf {} \\;\nfind -d $ACPKG -name \".svn\" -exec rm -rf {} \\;\nfind $ACPKG -name \".DS_Store\" -exec rm -f {} \\;\nrm -rf $ACPKG/sourcecode/xcode/build\nrm -rf $ACPKG/sourcecode/xcode/DerivedData\nrm -rf $ACPKG/sourcecode/xcode/Frameworks/*\nrm -rf $ACPKG/sourcecode/vcpp\nrm -f $GAMEDIR/config/saved.cfg\nrm -f $GAMEDIR/config/init.cfg\nrm -f $GAMEDIR/config/servers.cfg\n\nrm -rf $HELPDIR/docs/autogen/\nmkdir $GAMEDIR/screenshots\nmkdir $GAMEDIR/mods\n\n#add alias to readme\n/usr/bin/osascript < Edit Scheme > Run > Build Configuration +b) set 32-bit architecture in menu Product > Destination +2. Build “assaultcube” scheme, in result the package assaultcube.dmg will be created in subfolder under /private/var/root/Library/Developer/Xcode/DerivedData/