diff --git a/MacOSX/English.lproj/Launcher.nib/designable.nib b/MacOSX/English.lproj/Launcher.nib/designable.nib index 94188388..1cc87c8e 100644 --- a/MacOSX/English.lproj/Launcher.nib/designable.nib +++ b/MacOSX/English.lproj/Launcher.nib/designable.nib @@ -2,31 +2,26 @@ 1040 - 10F569 - 788 - 1038.29 - 461.00 + 10J567 + 823 + 1038.35 + 462.00 com.apple.InterfaceBuilder.CocoaPlugin - 788 + 823 YES - + YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -800,7 +795,7 @@ -2038284033 129 - + DQ 200 25 @@ -1038,7 +1033,7 @@ -2038284033 129 - + Gw 200 25 @@ -1636,7 +1631,9 @@ YES 0 - + + YES + @@ -2876,9 +2873,9 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{560, 464}, {511, 251}} + {{888, 364}, {511, 251}} com.apple.InterfaceBuilder.CocoaPlugin - {{560, 464}, {511, 251}} + {{888, 364}, {511, 251}} {{412, 523}, {516, 280}} com.apple.InterfaceBuilder.CocoaPlugin diff --git a/MacOSX/English.lproj/Launcher.nib/keyedobjects.nib b/MacOSX/English.lproj/Launcher.nib/keyedobjects.nib index f57a5f0c..6383d9b9 100644 Binary files a/MacOSX/English.lproj/Launcher.nib/keyedobjects.nib and b/MacOSX/English.lproj/Launcher.nib/keyedobjects.nib differ diff --git a/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser b/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser index cc876d83..76eda98b 100644 --- a/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser +++ b/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser @@ -1,10 +1,17 @@ // !$*UTF8*$! { + 002F3A2B09D0888800EBEB88 /* SDLMain.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 442}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 414}"; + }; + }; 002F3A2C09D0888800EBEB88 /* SDLMain.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1142, 1105}}"; - sepNavSelRange = "{1666, 0}"; - sepNavVisRange = "{1506, 823}"; + sepNavIntBoundsRect = "{{0, 0}, {928, 1105}}"; + sepNavSelRange = "{2277, 0}"; + sepNavVisRange = "{1082, 1245}"; sepNavWindowFrame = "{{15, 140}, {987, 733}}"; }; }; @@ -18,12 +25,13 @@ }; 29B97313FDCFA39411CA2CEA /* Project object */ = { activeArchitecturePreference = x86_64; - activeBuildConfigurationName = Debug; + activeBuildConfigurationName = Release; activeExecutable = 4847CD3D12057F05000B560F /* QuakeSpasm */; activeSDKPreference = macosx10.5; activeTarget = 8D1107260486CEB800E47090 /* QuakeSpasm */; addToTargets = ( 8D1107260486CEB800E47090 /* QuakeSpasm */, + 48ADEC8E1243D946000AF19C /* Distribution */, ); breakpoints = ( 48ADA3991244932E008DB120 /* SUDebugUpdateDriver.m:15 */, @@ -64,7 +72,7 @@ PBXFileTableDataSourceColumnWidthsKey = ( 22, 300, - 1357.58349609375, + 1972, ); PBXFileTableDataSourceColumnsKey = ( PBXExecutablesDataSource_ActiveFlagID, @@ -77,7 +85,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 964, + 1981, 20, 48, 43, @@ -99,7 +107,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 924, + 2044, 60, 20, 48, @@ -116,56 +124,71 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 306660962; - PBXWorkspaceStateSaveDate = 306660962; + PBXPerProjectTemplateStateSaveDate = 322997867; + PBXWorkspaceStateSaveDate = 322997867; }; perUserProjectItems = { - 48028D3E12156C670018F743 /* PBXTextBookmark */ = 48028D3E12156C670018F743 /* PBXTextBookmark */; - 480BB3A212174CA900939117 /* PBXTextBookmark */ = 480BB3A212174CA900939117 /* PBXTextBookmark */; - 480BB3A312174CA900939117 /* PBXTextBookmark */ = 480BB3A312174CA900939117 /* PBXTextBookmark */; - 48134A1C12102F680015BF15 /* PBXTextBookmark */ = 48134A1C12102F680015BF15 /* PBXTextBookmark */; - 48134A1D12102F680015BF15 /* PBXTextBookmark */ = 48134A1D12102F680015BF15 /* PBXTextBookmark */; - 48134A1E12102F680015BF15 /* PBXTextBookmark */ = 48134A1E12102F680015BF15 /* PBXTextBookmark */; - 4845112E1246256F0017BBC3 /* PBXTextBookmark */ = 4845112E1246256F0017BBC3 /* PBXTextBookmark */; - 484511D8124628040017BBC3 /* PBXTextBookmark */ = 484511D8124628040017BBC3 /* PBXTextBookmark */; - 484511D9124628040017BBC3 /* PBXTextBookmark */ = 484511D9124628040017BBC3 /* PBXTextBookmark */; - 4861FA9012144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9012144B5300BBDEF1 /* PBXTextBookmark */; - 4861FA9212144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9212144B5300BBDEF1 /* PBXTextBookmark */; - 48821E16120DF1150008EE50 /* PBXTextBookmark */ = 48821E16120DF1150008EE50 /* PBXTextBookmark */; - 4890A5541205C1FF00452753 /* PBXTextBookmark */ = 4890A5541205C1FF00452753 /* PBXTextBookmark */; - 48ADA34D12448DC4008DB120 /* PBXTextBookmark */ = 48ADA34D12448DC4008DB120 /* PBXTextBookmark */; - 48ADA38012448FF7008DB120 /* PBXTextBookmark */ = 48ADA38012448FF7008DB120 /* PBXTextBookmark */; - 48ADA38A124490B6008DB120 /* PBXTextBookmark */ = 48ADA38A124490B6008DB120 /* PBXTextBookmark */; - 48ADA38F12449225008DB120 /* PBXTextBookmark */ = 48ADA38F12449225008DB120 /* PBXTextBookmark */; - 48ADA39012449225008DB120 /* PBXTextBookmark */ = 48ADA39012449225008DB120 /* PBXTextBookmark */; - 48ADA3A812449534008DB120 /* PBXTextBookmark */ = 48ADA3A812449534008DB120 /* PBXTextBookmark */; - 48ADA3A912449534008DB120 /* PBXTextBookmark */ = 48ADA3A912449534008DB120 /* PBXTextBookmark */; - 48ADA3C612449625008DB120 /* PBXTextBookmark */ = 48ADA3C612449625008DB120 /* PBXTextBookmark */; - 48ADA3CC12449638008DB120 /* PBXTextBookmark */ = 48ADA3CC12449638008DB120 /* PBXTextBookmark */; - 48ADA3D512449A40008DB120 /* PBXTextBookmark */ = 48ADA3D512449A40008DB120 /* PBXTextBookmark */; - 48ADA3DA12449A40008DB120 /* PBXTextBookmark */ = 48ADA3DA12449A40008DB120 /* PBXTextBookmark */; - 48ADA3EB12449C30008DB120 /* PBXTextBookmark */ = 48ADA3EB12449C30008DB120 /* PBXTextBookmark */; - 48BB6B20124731BE001239EF /* PBXTextBookmark */ = 48BB6B20124731BE001239EF /* PBXTextBookmark */; - 48BB6B21124731BE001239EF /* PBXTextBookmark */ = 48BB6B21124731BE001239EF /* PBXTextBookmark */; - 48BB6B22124731BE001239EF /* PBXTextBookmark */ = 48BB6B22124731BE001239EF /* PBXTextBookmark */; - 48BB6B4D12473484001239EF /* PBXTextBookmark */ = 48BB6B4D12473484001239EF /* PBXTextBookmark */; - 48E31D6612474E88003972E7 /* PBXTextBookmark */ = 48E31D6612474E88003972E7 /* PBXTextBookmark */; - 48E31D6712474E88003972E7 /* PBXTextBookmark */ = 48E31D6712474E88003972E7 /* PBXTextBookmark */; - 48E31D6812474E88003972E7 /* PBXTextBookmark */ = 48E31D6812474E88003972E7 /* PBXTextBookmark */; - 48E31D6912474E88003972E7 /* PlistBookmark */ = 48E31D6912474E88003972E7 /* PlistBookmark */; - 48E31D6A12474E88003972E7 /* PBXTextBookmark */ = 48E31D6A12474E88003972E7 /* PBXTextBookmark */; - 48E31D6B12474E88003972E7 /* PBXTextBookmark */ = 48E31D6B12474E88003972E7 /* PBXTextBookmark */; - 48E31D6C12474E88003972E7 /* PBXTextBookmark */ = 48E31D6C12474E88003972E7 /* PBXTextBookmark */; - 48E31D6D12474E88003972E7 /* PBXTextBookmark */ = 48E31D6D12474E88003972E7 /* PBXTextBookmark */; - 48E31D6E12474E88003972E7 /* PBXTextBookmark */ = 48E31D6E12474E88003972E7 /* PBXTextBookmark */; - 48E31D6F12474E88003972E7 /* PBXTextBookmark */ = 48E31D6F12474E88003972E7 /* PBXTextBookmark */; - 48E31D7012474E88003972E7 /* PBXTextBookmark */ = 48E31D7012474E88003972E7 /* PBXTextBookmark */; - 48E31D7112474E88003972E7 /* PBXTextBookmark */ = 48E31D7112474E88003972E7 /* PBXTextBookmark */; - 48E31D7212474E88003972E7 /* PBXTextBookmark */ = 48E31D7212474E88003972E7 /* PBXTextBookmark */; - 48E31D7312474E88003972E7 /* XCBuildMessageTextBookmark */ = 48E31D7312474E88003972E7 /* XCBuildMessageTextBookmark */; - 48E31D7412474E88003972E7 /* PBXTextBookmark */ = 48E31D7412474E88003972E7 /* PBXTextBookmark */; - 48F89F411243A3BA00EB68FB /* PBXTextBookmark */ = 48F89F411243A3BA00EB68FB /* PBXTextBookmark */; - 48F89F611243AD1E00EB68FB /* PBXTextBookmark */ = 48F89F611243AD1E00EB68FB /* PBXTextBookmark */; + 4801945A12E44A310004210F = 4801945A12E44A310004210F /* PBXTextBookmark */; + 4801945B12E44A310004210F = 4801945B12E44A310004210F /* PBXTextBookmark */; + 4801945C12E44A310004210F = 4801945C12E44A310004210F /* PBXTextBookmark */; + 48028D3E12156C670018F743 = 48028D3E12156C670018F743 /* PBXTextBookmark */; + 480BB3A212174CA900939117 = 480BB3A212174CA900939117 /* PBXTextBookmark */; + 48134A1C12102F680015BF15 = 48134A1C12102F680015BF15 /* PBXTextBookmark */; + 48134A1D12102F680015BF15 = 48134A1D12102F680015BF15 /* PBXTextBookmark */; + 48134A1E12102F680015BF15 = 48134A1E12102F680015BF15 /* PBXTextBookmark */; + 4818B0A612D5B9CD006DD66E = 4818B0A612D5B9CD006DD66E /* PBXTextBookmark */; + 4818B0A712D5B9CD006DD66E = 4818B0A712D5B9CD006DD66E /* PBXTextBookmark */; + 4818B0BB12D5BA41006DD66E = 4818B0BB12D5BA41006DD66E /* PBXTextBookmark */; + 4818B0BC12D5BA41006DD66E = 4818B0BC12D5BA41006DD66E /* PBXTextBookmark */; + 4818B0BE12D5BA41006DD66E = 4818B0BE12D5BA41006DD66E /* PBXTextBookmark */; + 4818B0C112D5BA41006DD66E = 4818B0C112D5BA41006DD66E /* PBXTextBookmark */; + 4818B0C212D5BA41006DD66E = 4818B0C212D5BA41006DD66E /* PBXTextBookmark */; + 4818B0CF12D5BCB4006DD66E = 4818B0CF12D5BCB4006DD66E /* PBXTextBookmark */; + 4845112E1246256F0017BBC3 = 4845112E1246256F0017BBC3 /* PBXTextBookmark */; + 484511D8124628040017BBC3 = 484511D8124628040017BBC3 /* PBXTextBookmark */; + 484511D9124628040017BBC3 = 484511D9124628040017BBC3 /* PBXTextBookmark */; + 4861FA9012144B5300BBDEF1 = 4861FA9012144B5300BBDEF1 /* PBXTextBookmark */; + 4861FA9212144B5300BBDEF1 = 4861FA9212144B5300BBDEF1 /* PBXTextBookmark */; + 4866F6FD12EB7F02009B345C = 4866F6FD12EB7F02009B345C /* PBXTextBookmark */; + 4866F6FE12EB7F02009B345C = 4866F6FE12EB7F02009B345C /* PBXTextBookmark */; + 4866F6FF12EB7F02009B345C = 4866F6FF12EB7F02009B345C /* PBXTextBookmark */; + 486929FD133F92EE00A0F098 = 486929FD133F92EE00A0F098 /* PBXTextBookmark */; + 48692AC9133FDEBF00A0F098 = 48692AC9133FDEBF00A0F098 /* PBXTextBookmark */; + 48692B6913408B3E00A0F098 = 48692B6913408B3E00A0F098 /* PBXTextBookmark */; + 48692B6A13408B3E00A0F098 = 48692B6A13408B3E00A0F098 /* PBXTextBookmark */; + 48692B7513408CBA00A0F098 = 48692B7513408CBA00A0F098 /* PBXTextBookmark */; + 48692BB513408E7300A0F098 /* PBXTextBookmark */ = 48692BB513408E7300A0F098 /* PBXTextBookmark */; + 48692BBB13408E8200A0F098 /* PBXTextBookmark */ = 48692BBB13408E8200A0F098 /* PBXTextBookmark */; + 48692BBC13408E8500A0F098 /* PBXTextBookmark */ = 48692BBC13408E8500A0F098 /* PBXTextBookmark */; + 48692BC013408FA900A0F098 /* PBXTextBookmark */ = 48692BC013408FA900A0F098 /* PBXTextBookmark */; + 48692BC71340908800A0F098 /* PBXTextBookmark */ = 48692BC71340908800A0F098 /* PBXTextBookmark */; + 48821E16120DF1150008EE50 = 48821E16120DF1150008EE50 /* PBXTextBookmark */; + 4890A5541205C1FF00452753 = 4890A5541205C1FF00452753 /* PBXTextBookmark */; + 48AE78AD133485A400821DBA = 48AE78AD133485A400821DBA /* PBXTextBookmark */; + 48B5A12C131EDC840043FBD9 = 48B5A12C131EDC840043FBD9 /* PBXTextBookmark */; + 48B5A12D131EDC840043FBD9 = 48B5A12D131EDC840043FBD9 /* PBXTextBookmark */; + 48B5A14A131EDF5E0043FBD9 = 48B5A14A131EDF5E0043FBD9 /* PBXTextBookmark */; + 48B5A14B131EDF5E0043FBD9 = 48B5A14B131EDF5E0043FBD9 /* PBXTextBookmark */; + 48BB6B20124731BE001239EF = 48BB6B20124731BE001239EF /* PBXTextBookmark */; + 48BB6B21124731BE001239EF = 48BB6B21124731BE001239EF /* PBXTextBookmark */; + 48BB6B4D12473484001239EF = 48BB6B4D12473484001239EF /* PBXTextBookmark */; + 48DB946212F03F2000FB5483 = 48DB946212F03F2000FB5483 /* PBXTextBookmark */; + 48DB947612F03F9500FB5483 = 48DB947612F03F9500FB5483 /* PBXTextBookmark */; + 48DB947712F03F9500FB5483 = 48DB947712F03F9500FB5483 /* PBXTextBookmark */; + 48E31D6712474E88003972E7 = 48E31D6712474E88003972E7 /* PBXTextBookmark */; + 48E31D6812474E88003972E7 = 48E31D6812474E88003972E7 /* PBXTextBookmark */; + 48E31D6912474E88003972E7 = 48E31D6912474E88003972E7 /* PlistBookmark */; + 48E31D6A12474E88003972E7 = 48E31D6A12474E88003972E7 /* PBXTextBookmark */; + 48E31D6B12474E88003972E7 = 48E31D6B12474E88003972E7 /* PBXTextBookmark */; + 48E31D6C12474E88003972E7 = 48E31D6C12474E88003972E7 /* PBXTextBookmark */; + 48E31D6D12474E88003972E7 = 48E31D6D12474E88003972E7 /* PBXTextBookmark */; + 48E31D6E12474E88003972E7 = 48E31D6E12474E88003972E7 /* PBXTextBookmark */; + 48E31D6F12474E88003972E7 = 48E31D6F12474E88003972E7 /* PBXTextBookmark */; + 48E31D7112474E88003972E7 = 48E31D7112474E88003972E7 /* PBXTextBookmark */; + 48E31D7212474E88003972E7 = 48E31D7212474E88003972E7 /* PBXTextBookmark */; + 48E953FF12D5CEF800BDC2B8 = 48E953FF12D5CEF800BDC2B8 /* PBXTextBookmark */; + 48F89F411243A3BA00EB68FB = 48F89F411243A3BA00EB68FB /* PBXTextBookmark */; + 48F89F611243AD1E00EB68FB = 48F89F611243AD1E00EB68FB /* PBXTextBookmark */; }; sourceControlManager = 4847CD5312057F2A000B560F /* Source Control */; userBuildSettings = { @@ -178,6 +201,36 @@ sepNavVisRange = "{0, 795}"; }; }; + 4801945A12E44A310004210F /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 483A78410D2EEAAB00CB2E4C /* sv_main.c */; + name = "sv_main.c: 195"; + rLen = 7; + rLoc = 5034; + rType = 0; + vrLen = 1826; + vrLoc = 4109; + }; + 4801945B12E44A310004210F /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 483A783D0D2EEAAB00CB2E4C /* cl_parse.c */; + name = "cl_parse.c: 144"; + rLen = 7; + rLoc = 4013; + rType = 0; + vrLen = 1413; + vrLoc = 3199; + }; + 4801945C12E44A310004210F /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 483A77FB0D2EE9A900CB2E4C /* protocol.h */; + name = "protocol.h: 100"; + rLen = 7; + rLoc = 4106; + rType = 0; + vrLen = 3120; + vrLoc = 2828; + }; 48028D3E12156C670018F743 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 48134A1512102F400015BF15 /* net_defs.h */; @@ -198,16 +251,6 @@ vrLen = 1050; vrLoc = 1109; }; - 480BB3A312174CA900939117 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 483A78540D2EEAC300CB2E4C /* snd_sdl.c */; - name = "snd_sdl.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1405; - vrLoc = 2734; - }; 48134A1412102F400015BF15 /* net_bsd.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1408, 1157}}"; @@ -259,6 +302,150 @@ vrLen = 925; vrLoc = 0; }; + 4818B0A112D5B9AE006DD66E /* bgmusic.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 5538}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 2413}"; + }; + }; + 4818B0A212D5B9AE006DD66E /* bgmusic.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 971}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1374}"; + }; + }; + 4818B0A612D5B9CD006DD66E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 002F3A2C09D0888800EBEB88 /* SDLMain.m */; + name = "SDLMain.m: 63"; + rLen = 0; + rLoc = 1666; + rType = 0; + vrLen = 2003; + vrLoc = 326; + }; + 4818B0A712D5B9CD006DD66E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 483A78170D2EEA5400CB2E4C /* host.c */; + name = "host.c: 25"; + rLen = 3; + rLoc = 915; + rType = 0; + vrLen = 2413; + vrLoc = 0; + }; + 4818B0AC12D5B9ED006DD66E /* snd_codec.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 3419}}"; + sepNavSelRange = "{1621, 13}"; + sepNavVisRange = "{0, 1815}"; + }; + }; + 4818B0AD12D5B9ED006DD66E /* snd_codec.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 1326}}"; + sepNavSelRange = "{1273, 0}"; + sepNavVisRange = "{0, 2136}"; + }; + }; + 4818B0AF12D5BA1A006DD66E /* snd_codeci.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 971}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1753}"; + }; + }; + 4818B0B012D5BA1A006DD66E /* snd_mp3.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2159, 6955}}"; + sepNavSelRange = "{1528, 0}"; + sepNavVisRange = "{293, 2819}"; + }; + }; + 4818B0B112D5BA1A006DD66E /* snd_mp3.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 999}}"; + sepNavSelRange = "{101, 13}"; + sepNavVisRange = "{0, 217}"; + }; + }; + 4818B0B212D5BA1A006DD66E /* snd_vorbis.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2159, 2067}}"; + sepNavSelRange = "{1273, 1}"; + sepNavVisRange = "{424, 1711}"; + }; + }; + 4818B0B412D5BA1A006DD66E /* snd_wave.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2159, 3588}}"; + sepNavSelRange = "{690, 0}"; + sepNavVisRange = "{175, 1426}"; + sepNavWindowFrame = "{{15, 680}, {987, 733}}"; + }; + }; + 4818B0BB12D5BA41006DD66E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4818B0AD12D5B9ED006DD66E /* snd_codec.h */; + name = "snd_codec.h: 45"; + rLen = 0; + rLoc = 1273; + rType = 0; + vrLen = 2136; + vrLoc = 0; + }; + 4818B0BC12D5BA41006DD66E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4818B0A212D5B9AE006DD66E /* bgmusic.h */; + name = "bgmusic.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1374; + vrLoc = 0; + }; + 4818B0BE12D5BA41006DD66E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4818B0AF12D5BA1A006DD66E /* snd_codeci.h */; + name = "snd_codeci.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1753; + vrLoc = 0; + }; + 4818B0C112D5BA41006DD66E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 483A78540D2EEAC300CB2E4C /* snd_sdl.c */; + name = "snd_sdl.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1879; + vrLoc = 2427; + }; + 4818B0C212D5BA41006DD66E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 483A78500D2EEAC300CB2E4C /* cd_sdl.c */; + name = "cd_sdl.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1798; + vrLoc = 0; + }; + 4818B0CF12D5BCB4006DD66E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4818B0A112D5B9AE006DD66E /* bgmusic.c */; + name = "bgmusic.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 2413; + vrLoc = 0; + }; 48243B130D33F01A00C29F8F /* main_sdl.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1408, 2353}}"; @@ -274,6 +461,20 @@ sepNavWindowFrame = "{{9, 298}, {750, 558}}"; }; }; + 483A77FB0D2EE9A900CB2E4C /* protocol.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 2821}}"; + sepNavSelRange = "{4106, 7}"; + sepNavVisRange = "{2828, 3120}"; + }; + }; + 483A78040D2EE9F300CB2E4C /* gl_model.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 5954}}"; + sepNavSelRange = "{3153, 8}"; + sepNavVisRange = "{2407, 756}"; + }; + }; 483A78130D2EEA5400CB2E4C /* console.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1142, 16770}}"; @@ -282,6 +483,13 @@ sepNavWindowFrame = "{{38, 119}, {987, 733}}"; }; }; + 483A78170D2EEA5400CB2E4C /* host.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 12077}}"; + sepNavSelRange = "{915, 3}"; + sepNavVisRange = "{0, 2413}"; + }; + }; 483A781D0D2EEA5400CB2E4C /* sbar.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1142, 16991}}"; @@ -303,11 +511,46 @@ sepNavVisRange = "{11094, 861}"; }; }; + 483A783D0D2EEAAB00CB2E4C /* cl_parse.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 15587}}"; + sepNavSelRange = "{4013, 7}"; + sepNavVisRange = "{3199, 1413}"; + }; + }; + 483A78410D2EEAAB00CB2E4C /* sv_main.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 18239}}"; + sepNavSelRange = "{5034, 7}"; + sepNavVisRange = "{4109, 1826}"; + }; + }; + 483A78500D2EEAC300CB2E4C /* cd_sdl.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 7527}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1798}"; + }; + }; 483A78540D2EEAC300CB2E4C /* snd_sdl.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1408, 2704}}"; + sepNavIntBoundsRect = "{{0, 0}, {2262, 2600}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{2734, 1405}"; + sepNavVisRange = "{2427, 1879}"; + }; + }; + 483A785A0D2EEAF000CB2E4C /* gl_draw.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 10517}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{2659, 1547}"; + }; + }; + 483A78600D2EEAF000CB2E4C /* gl_rmain.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 11232}}"; + sepNavSelRange = "{19155, 11}"; + sepNavVisRange = "{18942, 902}"; }; }; 483A78640D2EEAF000CB2E4C /* conback.c */ = { @@ -317,6 +560,27 @@ sepNavVisRange = "{0, 786}"; }; }; + 483A78660D2EEAF000CB2E4C /* gl_vidsdl.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 24011}}"; + sepNavSelRange = "{20313, 59}"; + sepNavVisRange = "{19668, 1199}"; + }; + }; + 483A786A0D2EEAF000CB2E4C /* r_brush.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 15847}}"; + sepNavSelRange = "{3539, 8}"; + sepNavVisRange = "{3370, 793}"; + }; + }; + 483A786D0D2EEAF000CB2E4C /* r_world.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 10049}}"; + sepNavSelRange = "{14196, 8}"; + sepNavVisRange = "{13744, 613}"; + }; + }; 4845112E1246256F0017BBC3 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 483A78640D2EEAF000CB2E4C /* conback.c */; @@ -397,6 +661,13 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; + 4847CD5E12057F94000B560F /* sys_sdl_unix.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 3575}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{1235, 449}"; + }; + }; 4861FA9012144B5300BBDEF1 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 48B9E7BE0D340EA80001CACF /* SDLApplication.h */; @@ -419,11 +690,139 @@ }; 486577CA0D31A22A00E7920A /* snd_mix.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1142, 3627}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 1155}"; + sepNavIntBoundsRect = "{{0, 0}, {2262, 4030}}"; + sepNavSelRange = "{1044, 0}"; + sepNavVisRange = "{0, 1672}"; }; }; + 4866F6FD12EB7F02009B345C /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 486577CA0D31A22A00E7920A /* snd_mix.c */; + name = "snd_mix.c: 29"; + rLen = 0; + rLoc = 1044; + rType = 0; + vrLen = 1672; + vrLoc = 0; + }; + 4866F6FE12EB7F02009B345C /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 483A78660D2EEAF000CB2E4C /* gl_vidsdl.c */; + name = "gl_vidsdl.c: 801"; + rLen = 59; + rLoc = 20313; + rType = 0; + vrLen = 1199; + vrLoc = 19668; + }; + 4866F6FF12EB7F02009B345C /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 483A785A0D2EEAF000CB2E4C /* gl_draw.c */; + name = "gl_draw.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1547; + vrLoc = 2659; + }; + 486929FD133F92EE00A0F098 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4818B0B112D5BA1A006DD66E /* snd_mp3.h */; + name = "snd_mp3.h: 5"; + rLen = 13; + rLoc = 101; + rType = 0; + vrLen = 217; + vrLoc = 0; + }; + 48692AC9133FDEBF00A0F098 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4818B0B012D5BA1A006DD66E /* snd_mp3.c */; + name = "snd_mp3.c: 35"; + rLen = 0; + rLoc = 1528; + rType = 0; + vrLen = 2819; + vrLoc = 293; + }; + 48692B6913408B3E00A0F098 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4818B0B212D5BA1A006DD66E /* snd_vorbis.c */; + name = "snd_vorbis.c: 35"; + rLen = 1; + rLoc = 1273; + rType = 0; + vrLen = 1711; + vrLoc = 424; + }; + 48692B6A13408B3E00A0F098 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Compile /Users/kristian/Documents/Code/XCode/QuakeSpasm/MacOSX/../Quake/snd_wave.c"; + fRef = 4818B0B412D5BA1A006DD66E /* snd_wave.c */; + rLen = 0; + rLoc = 0; + rType = 1; + }; + 48692B7513408CBA00A0F098 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4818B0B412D5BA1A006DD66E /* snd_wave.c */; + name = "snd_wave.c: 49"; + rLen = 0; + rLoc = 1308; + rType = 0; + vrLen = 1439; + vrLoc = 175; + }; + 48692BB513408E7300A0F098 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4818B0B412D5BA1A006DD66E /* snd_wave.c */; + name = "snd_wave.c: 49"; + rLen = 0; + rLoc = 1308; + rType = 0; + vrLen = 1426; + vrLoc = 175; + }; + 48692BBB13408E8200A0F098 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4818B0B412D5BA1A006DD66E /* snd_wave.c */; + name = "snd_wave.c: 49"; + rLen = 0; + rLoc = 1308; + rType = 0; + vrLen = 1426; + vrLoc = 175; + }; + 48692BBC13408E8500A0F098 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4818B0B412D5BA1A006DD66E /* snd_wave.c */; + name = "snd_wave.c: 49"; + rLen = 0; + rLoc = 1308; + rType = 0; + vrLen = 1426; + vrLoc = 175; + }; + 48692BC013408FA900A0F098 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4818B0B412D5BA1A006DD66E /* snd_wave.c */; + name = "snd_wave.c: 49"; + rLen = 0; + rLoc = 1308; + rType = 0; + vrLen = 1426; + vrLoc = 175; + }; + 48692BC71340908800A0F098 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4818B0B412D5BA1A006DD66E /* snd_wave.c */; + name = "snd_wave.c: 16"; + rLen = 0; + rLoc = 690; + rType = 0; + vrLen = 1426; + vrLoc = 175; + }; 48728D280D3004A70004D61B /* net_dgrm.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1168, 18395}}"; @@ -448,6 +847,13 @@ vrLen = 481; vrLoc = 33461; }; + 48895DB80D4914A000849ABF /* pl_osx.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {2262, 559}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{259, 885}"; + }; + }; 4890A4601205A27B00452753 /* SUUpdaterDelegate.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1142, 468}}"; @@ -515,40 +921,6 @@ sepNavVisRange = "{411, 683}"; }; }; - 48ADA34D12448DC4008DB120 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 48ADA34E12448DC4008DB120 /* SUAppcast.h */; - name = "SUAppcast.h: 20"; - rLen = 0; - rLoc = 342; - rType = 0; - vrLen = 536; - vrLoc = 132; - }; - 48ADA34E12448DC4008DB120 /* SUAppcast.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = SUAppcast.h; - path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/build/Debug/Sparkle.framework/Headers/SUAppcast.h"; - sourceTree = ""; - }; - 48ADA35112448DC4008DB120 /* SUUpdater.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = SUUpdater.h; - path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/build/Debug/Sparkle.framework/Headers/SUUpdater.h"; - sourceTree = ""; - }; - 48ADA38012448FF7008DB120 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 48ADA38112448FF7008DB120 /* SUUpdateDriver.m */; - name = "SUUpdateDriver.m: 16"; - rLen = 0; - rLoc = 317; - rType = 0; - vrLen = 387; - vrLoc = 168; - }; 48ADA38112448FF7008DB120 /* SUUpdateDriver.m */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; @@ -556,57 +928,6 @@ path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUUpdateDriver.m"; sourceTree = ""; }; - 48ADA38312448FF7008DB120 /* SUUpdater.m */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = SUUpdater.m; - path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUUpdater.m"; - sourceTree = ""; - }; - 48ADA38612448FF7008DB120 /* SUUserInitiatedUpdateDriver.m */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = SUUserInitiatedUpdateDriver.m; - path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUUserInitiatedUpdateDriver.m"; - sourceTree = ""; - }; - 48ADA38A124490B6008DB120 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 48ADA38B124490B6008DB120 /* SUStatusController.m */; - name = "SUStatusController.m: 55"; - rLen = 0; - rLoc = 1115; - rType = 0; - vrLen = 798; - vrLoc = 764; - }; - 48ADA38B124490B6008DB120 /* SUStatusController.m */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = SUStatusController.m; - path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUStatusController.m"; - sourceTree = ""; - }; - 48ADA38F12449225008DB120 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 48ADA38612448FF7008DB120 /* SUUserInitiatedUpdateDriver.m */; - name = "SUUserInitiatedUpdateDriver.m: 18"; - rLen = 0; - rLoc = 388; - rType = 0; - vrLen = 997; - vrLoc = 194; - }; - 48ADA39012449225008DB120 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 48ADA38312448FF7008DB120 /* SUUpdater.m */; - name = "SUUpdater.m: 197"; - rLen = 0; - rLoc = 7012; - rType = 0; - vrLen = 1514; - vrLoc = 6433; - }; 48ADA397124492A8008DB120 /* SUDebugUpdateDriver.m */ = { isa = PBXFileReference; fileEncoding = 4; @@ -628,37 +949,10 @@ hitCount = 0; ignoreCount = 0; lineNumber = 15; - modificationTime = 306662465.427433; + modificationTime = 322952956.076346; originalNumberOfMultipleMatches = 1; state = 0; }; - 48ADA3A812449534008DB120 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 48ADA35112448DC4008DB120 /* SUUpdater.h */; - name = "SUUpdater.h: 47"; - rLen = 0; - rLoc = 1227; - rType = 0; - vrLen = 561; - vrLoc = 0; - }; - 48ADA3A912449534008DB120 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 48ADA3AA12449534008DB120 /* Sparkle.h */; - name = "Sparkle.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 536; - vrLoc = 0; - }; - 48ADA3AA12449534008DB120 /* Sparkle.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = Sparkle.h; - path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/build/Debug/Sparkle.framework/Headers/Sparkle.h"; - sourceTree = ""; - }; 48ADA3B412449571008DB120 /* SUUpdateDriver.m:25 */ = { isa = PBXFileBreakpoint; actions = ( @@ -672,97 +966,62 @@ hitCount = 0; ignoreCount = 0; lineNumber = 25; - modificationTime = 306662465.4282; + modificationTime = 322952956.078416; originalNumberOfMultipleMatches = 1; state = 0; }; - 48ADA3C612449625008DB120 /* PBXTextBookmark */ = { + 48ADEC8E1243D946000AF19C /* Distribution */ = { + activeExec = 0; + }; + 48AE78AD133485A400821DBA /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 48ADA3C712449625008DB120 /* SUBasicUpdateDriver.m */; - name = "SUBasicUpdateDriver.m: 162"; + fRef = 48B9E7A60D340BEA0001CACF /* AppController.m */; + name = "AppController.m: 110"; rLen = 0; - rLoc = 6948; + rLoc = 3481; rType = 0; - vrLen = 1607; - vrLoc = 5995; + vrLen = 1561; + vrLoc = 2663; }; - 48ADA3C712449625008DB120 /* SUBasicUpdateDriver.m */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = SUBasicUpdateDriver.m; - path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUBasicUpdateDriver.m"; - sourceTree = ""; - }; - 48ADA3CA12449625008DB120 /* SUHost.m */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = SUHost.m; - path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUHost.m"; - sourceTree = ""; - }; - 48ADA3CC12449638008DB120 /* PBXTextBookmark */ = { + 48B5A12C131EDC840043FBD9 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 48ADA3CA12449625008DB120 /* SUHost.m */; - name = "SUHost.m: 108"; - rLen = 0; - rLoc = 3130; + fRef = 483A786A0D2EEAF000CB2E4C /* r_brush.c */; + name = "r_brush.c: 151"; + rLen = 8; + rLoc = 3539; rType = 0; - vrLen = 969; - vrLoc = 2482; + vrLen = 793; + vrLoc = 3370; }; - 48ADA3D512449A40008DB120 /* PBXTextBookmark */ = { + 48B5A12D131EDC840043FBD9 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 48ADA3D612449A40008DB120 /* SUDSAVerifier.h */; - name = "SUDSAVerifier.h: 1"; + fRef = 4847CD5E12057F94000B560F /* sys_sdl_unix.c */; + name = "sys_sdl_unix.c: 1"; rLen = 0; rLoc = 0; rType = 0; - vrLen = 400; - vrLoc = 0; + vrLen = 449; + vrLoc = 1235; }; - 48ADA3D612449A40008DB120 /* SUDSAVerifier.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = SUDSAVerifier.h; - path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUDSAVerifier.h"; - sourceTree = ""; - }; - 48ADA3DA12449A40008DB120 /* PBXTextBookmark */ = { + 48B5A14A131EDF5E0043FBD9 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 48ADA3DB12449A40008DB120 /* SUAppcastItem.m */; - name = "SUAppcastItem.m: 56"; + fRef = 48895DB80D4914A000849ABF /* pl_osx.m */; + name = "pl_osx.m: 1"; rLen = 0; - rLoc = 1135; + rLoc = 0; rType = 0; - vrLen = 784; - vrLoc = 735; + vrLen = 885; + vrLoc = 259; }; - 48ADA3DB12449A40008DB120 /* SUAppcastItem.m */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = SUAppcastItem.m; - path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUAppcastItem.m"; - sourceTree = ""; - }; - 48ADA3DE12449A40008DB120 /* SUDSAVerifier.m */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.objc; - name = SUDSAVerifier.m; - path = "/Users/kristian/Downloads/Sparkle 1.5b6/Extras/Source Code/SUDSAVerifier.m"; - sourceTree = ""; - }; - 48ADA3EB12449C30008DB120 /* PBXTextBookmark */ = { + 48B5A14B131EDF5E0043FBD9 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 48ADA3DE12449A40008DB120 /* SUDSAVerifier.m */; - name = "SUDSAVerifier.m: 143"; - rLen = 15; - rLoc = 4376; + fRef = 002F3A2B09D0888800EBEB88 /* SDLMain.h */; + name = "SDLMain.h: 1"; + rLen = 0; + rLoc = 0; rType = 0; - vrLen = 954; - vrLoc = 3536; - }; - 48ADEC8E1243D946000AF19C /* Distribution */ = { - activeExec = 0; + vrLen = 414; + vrLoc = 0; }; 48B9E7A50D340BEA0001CACF /* AppController.h */ = { uiCtxt = { @@ -773,9 +1032,9 @@ }; 48B9E7A60D340BEA0001CACF /* AppController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1142, 2470}}"; - sepNavSelRange = "{5006, 0}"; - sepNavVisRange = "{4834, 1219}"; + sepNavIntBoundsRect = "{{0, 0}, {1379, 2483}}"; + sepNavSelRange = "{3481, 0}"; + sepNavVisRange = "{2782, 1337}"; }; }; 48B9E7BE0D340EA80001CACF /* SDLApplication.h */ = { @@ -829,15 +1088,35 @@ sepNavVisRange = "{1156, 456}"; }; }; - 48E31D6612474E88003972E7 /* PBXTextBookmark */ = { + 48DB946212F03F2000FB5483 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = 486577CA0D31A22A00E7920A /* snd_mix.c */; - name = "snd_mix.c: 1"; - rLen = 0; - rLoc = 0; + fRef = 483A78040D2EE9F300CB2E4C /* gl_model.h */; + name = "gl_model.h: 126"; + rLen = 8; + rLoc = 3153; rType = 0; - vrLen = 1155; - vrLoc = 0; + vrLen = 756; + vrLoc = 2407; + }; + 48DB947612F03F9500FB5483 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 483A786D0D2EEAF000CB2E4C /* r_world.c */; + name = "r_world.c: 615"; + rLen = 8; + rLoc = 14196; + rType = 0; + vrLen = 613; + vrLoc = 13744; + }; + 48DB947712F03F9500FB5483 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 483A78600D2EEAF000CB2E4C /* gl_rmain.c */; + name = "gl_rmain.c: 747"; + rLen = 11; + rLoc = 19155; + rType = 0; + vrLen = 902; + vrLoc = 18942; }; 48E31D6712474E88003972E7 /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -869,7 +1148,7 @@ ); name = /Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/Info.plist; rLen = 0; - rLoc = 9223372036854775807; + rLoc = 9223372036854775808; }; 48E31D6A12474E88003972E7 /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -931,16 +1210,6 @@ vrLen = 710; vrLoc = 4171; }; - 48E31D7012474E88003972E7 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 48B9E7A60D340BEA0001CACF /* AppController.m */; - name = "AppController.m: 147"; - rLen = 0; - rLoc = 5006; - rType = 0; - vrLen = 1219; - vrLoc = 4834; - }; 48E31D7112474E88003972E7 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 483A781D0D2EEA5400CB2E4C /* sbar.c */; @@ -961,24 +1230,15 @@ vrLen = 810; vrLoc = 13841; }; - 48E31D7312474E88003972E7 /* XCBuildMessageTextBookmark */ = { + 48E953FF12D5CEF800BDC2B8 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - comments = "'poseAsClass:' is deprecated (declared at /Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSObject.h:122)"; - fRef = 002F3A2C09D0888800EBEB88 /* SDLMain.m */; - fallbackIsa = XCBuildMessageTextBookmark; - rLen = 1; - rLoc = 80; - rType = 1; - }; - 48E31D7412474E88003972E7 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 002F3A2C09D0888800EBEB88 /* SDLMain.m */; - name = "SDLMain.m: 63"; - rLen = 0; - rLoc = 1666; + fRef = 4818B0AC12D5B9ED006DD66E /* snd_codec.c */; + name = "snd_codec.c: 64"; + rLen = 13; + rLoc = 1621; rType = 0; - vrLen = 823; - vrLoc = 1506; + vrLen = 1815; + vrLoc = 0; }; 48F89F411243A3BA00EB68FB /* PBXTextBookmark */ = { isa = PBXTextBookmark; diff --git a/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3 b/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3 index 4a0ff533..4c2d19bc 100644 --- a/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3 +++ b/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3 @@ -195,13 +195,32 @@ Name All-In-One Notifications - + + + XCObserverAutoDisconnectKey + + XCObserverDefintionKey + + XCObserverFactoryKey + XCPerspectivesSpecificationIdentifier + XCObserverGUIDKey + XCObserverProjectIdentifier + XCObserverNotificationKey + PBXStatusBuildStateMessageNotification + XCObserverTargetKey + XCMainBuildResultsModuleGUID + XCObserverTriggerKey + awakenModuleWithObserver: + XCObserverValidationKey + + + OpenEditors PerspectiveWidths - 1440 - 1440 + 2560 + 2560 Perspectives @@ -216,6 +235,7 @@ debugger-enable-breakpoints buildOrClean go + build-and-go com.apple.ide.PBXToolbarStopButton get-info NSToolbarFlexibleSpaceItem @@ -256,7 +276,7 @@ PBXSmartGroupTreeModuleColumnWidthsKey - 215 + 318 PBXSmartGroupTreeModuleColumnsKey_v4 @@ -270,7 +290,10 @@ 29B97314FDCFA39411CA2CEA 48243B060D33ED0A00C29F8F 483A77D80D2EE8C500CB2E4C + 483A77D90D2EE8D400CB2E4C 483A77DC0D2EE8ED00CB2E4C + 483A77E10D2EE91000CB2E4C + 483A77DB0D2EE8E600CB2E4C 29B97317FDCFA39411CA2CEA 4890A5EA1205D6ED00452753 29B97323FDCFA39411CA2CEA @@ -285,13 +308,11 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 3 - 1 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {215, 697}} + {{0, 0}, {318, 1237}} PBXTopSmartGroupGIDs @@ -301,32 +322,30 @@ GeometryConfiguration Frame - {{0, 0}, {232, 715}} + {{0, 0}, {335, 1255}} GroupTreeTableConfiguration MainColumn - 215 + 318 RubberWindowFrame - 0 122 1440 756 0 0 1440 878 + 0 122 2560 1296 0 0 2560 1418 Module PBXSmartGroupTreeModule Proportion - 232pt + 335pt Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID 4890A4C11205A7AE00452753 PBXProjectModuleLabel - SDLMain.m + snd_wave.c PBXSplitModuleInNavigatorKey Split0 @@ -334,11 +353,11 @@ PBXProjectModuleGUID 4890A4C21205A7AE00452753 PBXProjectModuleLabel - SDLMain.m + snd_wave.c _historyCapacity 0 bookmark - 48E31D7412474E88003972E7 + 48692BC71340908800A0F098 history 4890A5541205C1FF00452753 @@ -350,29 +369,14 @@ 4861FA9212144B5300BBDEF1 48028D3E12156C670018F743 480BB3A212174CA900939117 - 480BB3A312174CA900939117 48F89F411243A3BA00EB68FB 48F89F611243AD1E00EB68FB - 48ADA34D12448DC4008DB120 - 48ADA38012448FF7008DB120 - 48ADA38A124490B6008DB120 - 48ADA38F12449225008DB120 - 48ADA39012449225008DB120 - 48ADA3A812449534008DB120 - 48ADA3A912449534008DB120 - 48ADA3C612449625008DB120 - 48ADA3CC12449638008DB120 - 48ADA3D512449A40008DB120 - 48ADA3DA12449A40008DB120 - 48ADA3EB12449C30008DB120 4845112E1246256F0017BBC3 484511D8124628040017BBC3 484511D9124628040017BBC3 48BB6B20124731BE001239EF 48BB6B21124731BE001239EF - 48BB6B22124731BE001239EF 48BB6B4D12473484001239EF - 48E31D6612474E88003972E7 48E31D6712474E88003972E7 48E31D6812474E88003972E7 48E31D6912474E88003972E7 @@ -382,10 +386,35 @@ 48E31D6D12474E88003972E7 48E31D6E12474E88003972E7 48E31D6F12474E88003972E7 - 48E31D7012474E88003972E7 48E31D7112474E88003972E7 48E31D7212474E88003972E7 - 48E31D7312474E88003972E7 + 4818B0A612D5B9CD006DD66E + 4818B0A712D5B9CD006DD66E + 4818B0BB12D5BA41006DD66E + 4818B0BC12D5BA41006DD66E + 4818B0BE12D5BA41006DD66E + 4818B0C112D5BA41006DD66E + 4818B0C212D5BA41006DD66E + 4818B0CF12D5BCB4006DD66E + 48E953FF12D5CEF800BDC2B8 + 4801945A12E44A310004210F + 4801945B12E44A310004210F + 4801945C12E44A310004210F + 4866F6FD12EB7F02009B345C + 4866F6FE12EB7F02009B345C + 4866F6FF12EB7F02009B345C + 48DB946212F03F2000FB5483 + 48DB947612F03F9500FB5483 + 48DB947712F03F9500FB5483 + 48B5A12C131EDC840043FBD9 + 48B5A12D131EDC840043FBD9 + 48B5A14A131EDF5E0043FBD9 + 48B5A14B131EDF5E0043FBD9 + 48AE78AD133485A400821DBA + 486929FD133F92EE00A0F098 + 48692AC9133FDEBF00A0F098 + 48692B6913408B3E00A0F098 + 48692BBB13408E8200A0F098 SplitCount @@ -399,18 +428,18 @@ GeometryConfiguration Frame - {{0, 0}, {1203, 470}} + {{0, 0}, {2220, 899}} RubberWindowFrame - 0 122 1440 756 0 0 1440 878 + 0 122 2560 1296 0 0 2560 1418 Module PBXNavigatorGroup Proportion - 470pt + 899pt Proportion - 240pt + 351pt Tabs @@ -424,7 +453,7 @@ GeometryConfiguration Frame - {{10, 27}, {1203, 213}} + {{10, 27}, {2220, 324}} Module XCDetailModule @@ -440,7 +469,7 @@ GeometryConfiguration Frame - {{10, 27}, {1469, 165}} + {{10, 27}, {2323, 736}} Module PBXProjectFindModule @@ -473,14 +502,14 @@ XCBuildResultsTrigger_Collapse 1021 XCBuildResultsTrigger_Open - 1011 + 1010 GeometryConfiguration Frame - {{10, 27}, {1203, 213}} + {{10, 27}, {2220, 324}} RubberWindowFrame - 0 122 1440 756 0 0 1440 878 + 0 122 2560 1296 0 0 2560 1418 Module PBXBuildResultsModule @@ -489,7 +518,7 @@ Proportion - 1203pt + 2220pt Name @@ -508,11 +537,11 @@ TableOfContents - 48E31D4D12474671003972E7 + 48692BB613408E7300A0F098 1CA23ED40692098700951B8B - 48E31D4E12474671003972E7 + 48692BB713408E7300A0F098 4890A4C11205A7AE00452753 - 48E31D4F12474671003972E7 + 48692BB813408E7300A0F098 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -564,12 +593,12 @@ GeometryConfiguration Frame - {{0, 0}, {1440, 116}} + {{0, 0}, {2560, 187}} Module PBXDebugCLIModule Proportion - 116pt + 187pt ContentConfiguration @@ -588,8 +617,8 @@ yes sizes - {{0, 0}, {718, 180}} - {{718, 0}, {722, 180}} + {{0, 0}, {1275, 329}} + {{1275, 0}, {1285, 329}} VerticalSplitView @@ -604,8 +633,8 @@ yes sizes - {{0, 0}, {1440, 180}} - {{0, 180}, {1440, 414}} + {{0, 0}, {2560, 329}} + {{0, 329}, {2560, 734}} @@ -625,26 +654,26 @@ DebugSTDIOWindowFrame {{200, 200}, {500, 300}} Frame - {{0, 121}, {1440, 594}} + {{0, 192}, {2560, 1063}} PBXDebugSessionStackFrameViewKey DebugVariablesTableConfiguration Name - 120 + 148 Value - 85 + 112 Summary - 492 + 1000 Frame - {{718, 0}, {722, 180}} + {{1275, 0}, {1285, 329}} Module PBXDebugSessionModule Proportion - 594pt + 1063pt Name @@ -662,14 +691,14 @@ TableOfContents - 48E31D7512474E88003972E7 + 48692ADD133FDF1400A0F098 1CCC7628064C1048000F2A68 1CCC7629064C1048000F2A68 - 48E31D7612474E88003972E7 - 48E31D7712474E88003972E7 - 48E31D7812474E88003972E7 - 48E31D7912474E88003972E7 - 48E31D7A12474E88003972E7 + 48692ADE133FDF1400A0F098 + 48692ADF133FDF1400A0F098 + 48692AE0133FDF1400A0F098 + 48692AE1133FDF1400A0F098 + 4890A4C11205A7AE00452753 ToolbarConfigUserDefaultsMinorVersion 2 @@ -686,7 +715,7 @@ StatusbarIsVisible TimeStamp - 0.0 + 322998408.400415 ToolbarConfigUserDefaultsMinorVersion 2 ToolbarDisplayMode @@ -703,12 +732,10 @@ 5 WindowOrderList - 48E31D7B12474E88003972E7 - 48E31D7C12474E88003972E7 - /Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/QuakeSpasm.xcodeproj + /Users/kristian/Documents/Code/XCode/QuakeSpasm/MacOSX/QuakeSpasm.xcodeproj WindowString - 0 122 1440 756 0 0 1440 878 + 0 122 2560 1296 0 0 2560 1418 WindowToolsV3 diff --git a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj index 50cd53e6..2fb4dcbe 100644 --- a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj +++ b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 44; objects = { /* Begin PBXAggregateTarget section */ @@ -29,6 +29,11 @@ 002F3C6109D0951E00EBEB88 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F3C6009D0951E00EBEB88 /* GLUT.framework */; }; 48134A1812102F400015BF15 /* net_bsd.c in Sources */ = {isa = PBXBuildFile; fileRef = 48134A1412102F400015BF15 /* net_bsd.c */; }; 48134A1912102F400015BF15 /* net_udp.c in Sources */ = {isa = PBXBuildFile; fileRef = 48134A1612102F400015BF15 /* net_udp.c */; }; + 4818B0A312D5B9AE006DD66E /* bgmusic.c in Sources */ = {isa = PBXBuildFile; fileRef = 4818B0A112D5B9AE006DD66E /* bgmusic.c */; }; + 4818B0AE12D5B9ED006DD66E /* snd_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 4818B0AC12D5B9ED006DD66E /* snd_codec.c */; }; + 4818B0B612D5BA1A006DD66E /* snd_mp3.c in Sources */ = {isa = PBXBuildFile; fileRef = 4818B0B012D5BA1A006DD66E /* snd_mp3.c */; }; + 4818B0B712D5BA1A006DD66E /* snd_vorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 4818B0B212D5BA1A006DD66E /* snd_vorbis.c */; }; + 4818B0B812D5BA1A006DD66E /* snd_wave.c in Sources */ = {isa = PBXBuildFile; fileRef = 4818B0B412D5BA1A006DD66E /* snd_wave.c */; }; 48243B140D33F01A00C29F8F /* main_sdl.c in Sources */ = {isa = PBXBuildFile; fileRef = 48243B130D33F01A00C29F8F /* main_sdl.c */; }; 48348943120595B1004184BC /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48348942120595B1004184BC /* Sparkle.framework */; }; 4834894F120595E9004184BC /* Sparkle.framework in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = 48348942120595B1004184BC /* Sparkle.framework */; }; @@ -145,6 +150,17 @@ 48134A1512102F400015BF15 /* net_defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = net_defs.h; path = ../Quake/net_defs.h; sourceTree = SOURCE_ROOT; }; 48134A1612102F400015BF15 /* net_udp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = net_udp.c; path = ../Quake/net_udp.c; sourceTree = SOURCE_ROOT; }; 48134A1712102F400015BF15 /* net_udp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = net_udp.h; path = ../Quake/net_udp.h; sourceTree = SOURCE_ROOT; }; + 4818B0A112D5B9AE006DD66E /* bgmusic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bgmusic.c; path = ../Quake/bgmusic.c; sourceTree = SOURCE_ROOT; }; + 4818B0A212D5B9AE006DD66E /* bgmusic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bgmusic.h; path = ../Quake/bgmusic.h; sourceTree = SOURCE_ROOT; }; + 4818B0AC12D5B9ED006DD66E /* snd_codec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_codec.c; path = ../Quake/snd_codec.c; sourceTree = SOURCE_ROOT; }; + 4818B0AD12D5B9ED006DD66E /* snd_codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_codec.h; path = ../Quake/snd_codec.h; sourceTree = SOURCE_ROOT; }; + 4818B0AF12D5BA1A006DD66E /* snd_codeci.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_codeci.h; path = ../Quake/snd_codeci.h; sourceTree = SOURCE_ROOT; }; + 4818B0B012D5BA1A006DD66E /* snd_mp3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_mp3.c; path = ../Quake/snd_mp3.c; sourceTree = SOURCE_ROOT; }; + 4818B0B112D5BA1A006DD66E /* snd_mp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_mp3.h; path = ../Quake/snd_mp3.h; sourceTree = SOURCE_ROOT; }; + 4818B0B212D5BA1A006DD66E /* snd_vorbis.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_vorbis.c; path = ../Quake/snd_vorbis.c; sourceTree = SOURCE_ROOT; }; + 4818B0B312D5BA1A006DD66E /* snd_vorbis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_vorbis.h; path = ../Quake/snd_vorbis.h; sourceTree = SOURCE_ROOT; }; + 4818B0B412D5BA1A006DD66E /* snd_wave.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_wave.c; path = ../Quake/snd_wave.c; sourceTree = SOURCE_ROOT; }; + 4818B0B512D5BA1A006DD66E /* snd_wave.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_wave.h; path = ../Quake/snd_wave.h; sourceTree = SOURCE_ROOT; }; 48243B130D33F01A00C29F8F /* main_sdl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main_sdl.c; path = ../Quake/main_sdl.c; sourceTree = SOURCE_ROOT; }; 48305B530D8AF8EC00A29C24 /* conback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = conback.h; path = ../Quake/conback.h; sourceTree = SOURCE_ROOT; }; 48348942120595B1004184BC /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = ""; }; @@ -462,11 +478,16 @@ isa = PBXGroup; children = ( 483A77E10D2EE91000CB2E4C /* Headers */, + 4818B0A112D5B9AE006DD66E /* bgmusic.c */, 483A78500D2EEAC300CB2E4C /* cd_sdl.c */, + 4818B0AC12D5B9ED006DD66E /* snd_codec.c */, 486577C80D31A22A00E7920A /* snd_dma.c */, 486577C90D31A22A00E7920A /* snd_mem.c */, 486577CA0D31A22A00E7920A /* snd_mix.c */, + 4818B0B012D5BA1A006DD66E /* snd_mp3.c */, 483A78540D2EEAC300CB2E4C /* snd_sdl.c */, + 4818B0B212D5BA1A006DD66E /* snd_vorbis.c */, + 4818B0B412D5BA1A006DD66E /* snd_wave.c */, ); name = Sound; sourceTree = ""; @@ -546,8 +567,14 @@ 483A77E10D2EE91000CB2E4C /* Headers */ = { isa = PBXGroup; children = ( + 4818B0A212D5B9AE006DD66E /* bgmusic.h */, 483A77FD0D2EE9BD00CB2E4C /* cdaudio.h */, 483A77FE0D2EE9BD00CB2E4C /* q_sound.h */, + 4818B0AD12D5B9ED006DD66E /* snd_codec.h */, + 4818B0AF12D5BA1A006DD66E /* snd_codeci.h */, + 4818B0B112D5BA1A006DD66E /* snd_mp3.h */, + 4818B0B312D5BA1A006DD66E /* snd_vorbis.h */, + 4818B0B512D5BA1A006DD66E /* snd_wave.h */, ); name = Headers; sourceTree = ""; @@ -613,7 +640,14 @@ isa = PBXProject; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "QuakeSpasm" */; compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 29B97314FDCFA39411CA2CEA /* QuakeSpasm */; projectDirPath = ""; projectRoot = ""; @@ -729,6 +763,11 @@ 4890A5D21205D55700452753 /* UpdateButton.m in Sources */, 48134A1812102F400015BF15 /* net_bsd.c in Sources */, 48134A1912102F400015BF15 /* net_udp.c in Sources */, + 4818B0A312D5B9AE006DD66E /* bgmusic.c in Sources */, + 4818B0AE12D5B9ED006DD66E /* snd_codec.c in Sources */, + 4818B0B612D5BA1A006DD66E /* snd_mp3.c in Sources */, + 4818B0B712D5BA1A006DD66E /* snd_vorbis.c in Sources */, + 4818B0B812D5BA1A006DD66E /* snd_wave.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -768,9 +807,7 @@ COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "USE_QS_CONBACK", - ); + GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK; PRODUCT_NAME = Distribution; }; name = Debug; @@ -781,9 +818,7 @@ COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "USE_QS_CONBACK", - ); + GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK; PRODUCT_NAME = Distribution; ZERO_LINK = NO; }; @@ -792,8 +827,10 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; + ARCHS = ( + x86_64, + i386, + ); COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -804,9 +841,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "USE_QS_CONBACK", - ); + GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK; HEADER_SEARCH_PATHS = ( /Library/Frameworks/SDL.framework/Headers, /Library/Frameworks/SDL_net.framework/Headers, @@ -814,6 +849,10 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + /opt/local/lib, + ); PRODUCT_NAME = QuakeSpasm; WRAPPER_EXTENSION = app; ZERO_LINK = YES; @@ -823,8 +862,11 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; + ARCHS = ( + i386, + x86_64, + ppc, + ); FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -832,9 +874,7 @@ FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; - GCC_PREPROCESSOR_DEFINITIONS = ( - "USE_QS_CONBACK", - ); + GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK; HEADER_SEARCH_PATHS = ( /Library/Frameworks/SDL.framework/Headers, /Library/Frameworks/SDL_net.framework/Headers, @@ -842,6 +882,28 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + /opt/local/lib, + ); + OTHER_CFLAGS = ""; + "OTHER_CFLAGS[arch=ppc64]" = ( + "-arch", + ppc, + ); + "OTHER_CFLAGS[arch=ppc]" = ( + "-arch", + ppc, + ); + OTHER_LDFLAGS = ""; + "OTHER_LDFLAGS[arch=ppc64]" = ( + "-arch", + ppc, + ); + "OTHER_LDFLAGS[arch=ppc]" = ( + "-arch", + ppc, + ); PRODUCT_NAME = QuakeSpasm; WRAPPER_EXTENSION = app; }; @@ -850,48 +912,75 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; + ARCHS = ( + i386, + x86_64, + ); FRAMEWORK_SEARCH_PATHS = ( /Library/Frameworks, "$(FRAMEWORK_SEARCH_PATHS)", ); GCC_MODEL_TUNING = G3; + GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "USE_QS_CONBACK", - ); HEADER_SEARCH_PATHS = ( + /opt/local/include, /Library/Frameworks/SDL.framework/Headers, "$(HEADER_SEARCH_PATHS)", ); + LIBRARY_SEARCH_PATHS = /opt/local/lib; + ONLY_ACTIVE_ARCH = NO; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; + VALID_ARCHS = "i386 x86_64"; }; name = Debug; }; C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; + ARCHS = ( + x86_64, + i386, + ppc, + ); FRAMEWORK_SEARCH_PATHS = ( /Library/Frameworks, "$(FRAMEWORK_SEARCH_PATHS)", ); GCC_MODEL_TUNING = G3; + GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "USE_QS_CONBACK", - ); HEADER_SEARCH_PATHS = ( + /opt/local/include, /Library/Frameworks/SDL.framework/Headers, "$(HEADER_SEARCH_PATHS)", ); + LIBRARY_SEARCH_PATHS = /opt/local/lib; + ONLY_ACTIVE_ARCH = NO; + OTHER_CFLAGS = ""; + "OTHER_CFLAGS[arch=ppc64]" = ( + "-arch", + ppc, + ); + "OTHER_CFLAGS[arch=ppc]" = ( + "-arch", + ppc, + ); + OTHER_LDFLAGS = ""; + "OTHER_LDFLAGS[arch=ppc64]" = ( + "-arch", + ppc, + ); + "OTHER_LDFLAGS[arch=ppc]" = ( + "-arch", + ppc, + ); PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; + VALID_ARCHS = "i386 x86_64 ppc ppc64 ppc7400 ppc970"; }; name = Release; };