diff --git a/.gitignore b/.gitignore index af30229f6b..b8884a2445 100644 --- a/.gitignore +++ b/.gitignore @@ -19,13 +19,12 @@ log.txt /replay.rep -#binary stuff +#binary stuff /*.dll *.mdb /*.exe -OpenRA -OpenRA.app -openra_server +OpenRA +OpenRA.app # backup files by various editors *~ @@ -34,11 +33,20 @@ cg.dll cgGL.dll glfw.dll -/OpenRa.Gl.dll +/OpenRa.Gl.dll settings.ini - -#monodevelop -*.pidb -*.userprefs - -packaging/windows/*.exe + +#monodevelop +*.pidb +*.userprefs + +packaging/windows/*.exe + +# osx build crap +packaging/osx/launcher/build/ +packaging/osx/launcher/OpenRA.xcodeproj/*.pbxuser +packaging/osx/launcher/OpenRA.xcodeproj/*.perspectivev3 +packaging/osx/launcher/OpenRA.xcodeproj/*.mode1v3 +temp.c +temp.o +temp.s diff --git a/packaging/osx/launcher/OpenRA.xcodeproj/project.pbxproj b/packaging/osx/launcher/OpenRA.xcodeproj/project.pbxproj index a00e547ebe..489404df5d 100644 --- a/packaging/osx/launcher/OpenRA.xcodeproj/project.pbxproj +++ b/packaging/osx/launcher/OpenRA.xcodeproj/project.pbxproj @@ -134,6 +134,7 @@ 8D1107290486CEB800E47090 /* Resources */, 8D11072C0486CEB800E47090 /* Sources */, 8D11072E0486CEB800E47090 /* Frameworks */, + DAFD652E1151FEA7001F4C97 /* Package Game */, ); buildRules = ( ); @@ -175,6 +176,24 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + DAFD652E1151FEA7001F4C97 /* Package Game */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Package Game"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "DIR=`pwd`\ncd ../../../\nmake clean\nmake all\nmake dist-osx\ncp -r OpenRA.app ${TARGET_BUILD_DIR}/OpenRA.app/Contents/Resources/"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 8D11072C0486CEB800E47090 /* Sources */ = { isa = PBXSourcesBuildPhase;