diff --git a/source/src/platform.h b/source/src/platform.h index 22202993..2e72fdac 100644 --- a/source/src/platform.h +++ b/source/src/platform.h @@ -41,6 +41,10 @@ #ifndef STANDALONE #include #include + + #ifdef __APPLE__ + #undef SDL_VIDEO_DRIVER_WINDOWS + #endif #include #define GL_GLEXT_LEGACY diff --git a/source/xcode/Launcher.m b/source/xcode/Launcher.m index d8f87f56..1ff01c1a 100755 --- a/source/xcode/Launcher.m +++ b/source/xcode/Launcher.m @@ -171,7 +171,7 @@ static int numberForKey(CFDictionaryRef desc, CFStringRef key) [toolBarItems setObject:item forKey:identifier]; [item release]; } - NSToolbar *toolbar = [[NSToolbar alloc] initWithIdentifier:@""]; + NSToolbar *toolbar = [[NSToolbar alloc] initWithIdentifier:@"assaultcube_toolbar1"]; [toolbar setDelegate:self]; [toolbar setAllowsUserCustomization:NO]; [toolbar setAutosavesConfiguration:NO]; diff --git a/source/xcode/assaultcube.xcodeproj/project.pbxproj b/source/xcode/assaultcube.xcodeproj/project.pbxproj index 9e07bdc4..eff574fa 100755 --- a/source/xcode/assaultcube.xcodeproj/project.pbxproj +++ b/source/xcode/assaultcube.xcodeproj/project.pbxproj @@ -37,7 +37,6 @@ 9EB8181D11EDA56D00799589 /* assaultcube.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9EB817DE11EDA3A300799589 /* assaultcube.icns */; }; 9EB8188511EDACDB00799589 /* assaultcube.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9EB817DE11EDA3A300799589 /* assaultcube.icns */; }; 9EB8188611EDACDB00799589 /* Help.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 66899EA80C14887F00927C34 /* Help.tiff */; }; - 9EB8188711EDACDB00799589 /* Keys.gif in Resources */ = {isa = PBXBuildFile; fileRef = 66899EA90C14887F00927C34 /* Keys.gif */; }; 9EB8188811EDACDB00799589 /* Main.gif in Resources */ = {isa = PBXBuildFile; fileRef = 66899EAA0C14887F00927C34 /* Main.gif */; }; 9EB8188911EDACDB00799589 /* map.icns in Resources */ = {isa = PBXBuildFile; fileRef = B975E7F30EBCC3A200880D5D /* map.icns */; }; 9EB8188A11EDACDB00799589 /* Server.gif in Resources */ = {isa = PBXBuildFile; fileRef = 66899EAB0C14887F00927C34 /* Server.gif */; }; @@ -498,7 +497,7 @@ B94198A709207E810029DAD1 /* Sources */, B94198C209207E810029DAD1 /* Frameworks */, 9EB8179211ED9ED800799589 /* CopyFiles */, - B94199400920820E0029DAD1 /* ShellScript */, + B94199400920820E0029DAD1 /* Run Script */, ); buildRules = ( ); @@ -571,7 +570,6 @@ files = ( 9EB8188511EDACDB00799589 /* assaultcube.icns in Resources */, 9EB8188611EDACDB00799589 /* Help.tiff in Resources */, - 9EB8188711EDACDB00799589 /* Keys.gif in Resources */, 9EB8188811EDACDB00799589 /* Main.gif in Resources */, B96D0D630920971300B6C936 /* MainMenu.nib in Resources */, 9EB8188911EDACDB00799589 /* map.icns in Resources */, @@ -584,18 +582,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - B94199400920820E0029DAD1 /* ShellScript */ = { + B94199400920820E0029DAD1 /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 8; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( ); + name = "Run Script"; outputPaths = ( ); 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 compiling 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/../../changelog.txt $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/../../demos $GAMEDIR/\n/usr/bin/CpMac -r $SRCROOT/../../mods $GAMEDIR/\n/usr/bin/CpMac -r $SRCROOT/../../packages $GAMEDIR/\n#mkdir $GAMEDIR/screenshots\n\n#create config template\ncd $GAMEDIR/config\nzip configtemplates.zip autoexec.cfg favourites.cfg pcksources.cfg\n\n#clean up\nrm -rf $GAMEDIR/.git\nrm -f $GAMEDIR/.gitattributes\nrm -f $GAMEDIR/.travis.yml\nfind -d $ACPKG -name \".gitignore\" -exec rm -rf {} \\;\nrm -rf $HELPDIR/docs/autogen/\nfind $ACPKG -name \".DS_Store\" -exec rm -f {} \\;\n\nfind -d $ACPKG -name \"shadows.dat\" -exec rm -rf {} \\;\nrm -f autoexec.cfg favourites.cfg pcksources.cfg init*.cfg saved*.cfg servervita*.cfg servers.cfg history\nrm -f $GAMEDIR/clientlog*.txt\nrm -f $GAMEDIR/packages/maps/*.cgz\nrm -f $GAMEDIR/packages/maps/*.cfg\nrm -f $GAMEDIR/packages/maps/servermaps/incoming/*.cgz\nrm -f $GAMEDIR/packages/maps/servermaps/incoming/*.cfg\nrm -f `(find -d $GAMEDIR/demos -type f | grep -v \"tutorial_demo.dmo\")`\n \n#/Developer/Tools/CpMac -r $SRCROOT/../../source $ACPKG/sourcecode\n#rm -rf $ACPKG/sourcecode/xcode/build\n#rm -rf $ACPKG/sourcecode/xcode/DerivedData\n#rm -rf $ACPKG/sourcecode/xcode/Frameworks/*\n#rm -rf $ACPKG/sourcecode/vcpp\n\ncd $TARGET_BUILD_DIR\n\n#add alias to readme\n/usr/bin/osascript <