diff --git a/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser b/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser
index 76eda98b..31d50fd6 100644
--- a/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser
+++ b/MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser
@@ -107,7 +107,7 @@
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
PBXFileTableDataSourceColumnWidthsKey = (
20,
- 2044,
+ 1941,
60,
20,
48,
@@ -124,71 +124,68 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 322997867;
- PBXWorkspaceStateSaveDate = 322997867;
+ PBXPerProjectTemplateStateSaveDate = 323003422;
+ PBXWorkspaceStateSaveDate = 323003422;
};
perUserProjectItems = {
- 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 */;
+ 4801945A12E44A310004210F /* PBXTextBookmark */ = 4801945A12E44A310004210F /* PBXTextBookmark */;
+ 4801945B12E44A310004210F /* PBXTextBookmark */ = 4801945B12E44A310004210F /* PBXTextBookmark */;
+ 4801945C12E44A310004210F /* PBXTextBookmark */ = 4801945C12E44A310004210F /* PBXTextBookmark */;
+ 48028D3E12156C670018F743 /* PBXTextBookmark */ = 48028D3E12156C670018F743 /* PBXTextBookmark */;
+ 480BB3A212174CA900939117 /* PBXTextBookmark */ = 480BB3A212174CA900939117 /* PBXTextBookmark */;
+ 48134A1C12102F680015BF15 /* PBXTextBookmark */ = 48134A1C12102F680015BF15 /* PBXTextBookmark */;
+ 48134A1D12102F680015BF15 /* PBXTextBookmark */ = 48134A1D12102F680015BF15 /* PBXTextBookmark */;
+ 48134A1E12102F680015BF15 /* PBXTextBookmark */ = 48134A1E12102F680015BF15 /* PBXTextBookmark */;
+ 4818B0A612D5B9CD006DD66E /* PBXTextBookmark */ = 4818B0A612D5B9CD006DD66E /* PBXTextBookmark */;
+ 4818B0A712D5B9CD006DD66E /* PBXTextBookmark */ = 4818B0A712D5B9CD006DD66E /* PBXTextBookmark */;
+ 4818B0BB12D5BA41006DD66E /* PBXTextBookmark */ = 4818B0BB12D5BA41006DD66E /* PBXTextBookmark */;
+ 4818B0BC12D5BA41006DD66E /* PBXTextBookmark */ = 4818B0BC12D5BA41006DD66E /* PBXTextBookmark */;
+ 4818B0BE12D5BA41006DD66E /* PBXTextBookmark */ = 4818B0BE12D5BA41006DD66E /* PBXTextBookmark */;
+ 4818B0C112D5BA41006DD66E /* PBXTextBookmark */ = 4818B0C112D5BA41006DD66E /* PBXTextBookmark */;
+ 4818B0C212D5BA41006DD66E /* PBXTextBookmark */ = 4818B0C212D5BA41006DD66E /* PBXTextBookmark */;
+ 4818B0CF12D5BCB4006DD66E /* PBXTextBookmark */ = 4818B0CF12D5BCB4006DD66E /* PBXTextBookmark */;
+ 4845112E1246256F0017BBC3 /* PBXTextBookmark */ = 4845112E1246256F0017BBC3 /* PBXTextBookmark */;
+ 484511D8124628040017BBC3 /* PBXTextBookmark */ = 484511D8124628040017BBC3 /* PBXTextBookmark */;
+ 484511D9124628040017BBC3 /* PBXTextBookmark */ = 484511D9124628040017BBC3 /* PBXTextBookmark */;
+ 4861FA9012144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9012144B5300BBDEF1 /* PBXTextBookmark */;
+ 4861FA9212144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9212144B5300BBDEF1 /* PBXTextBookmark */;
+ 4866F6FD12EB7F02009B345C /* PBXTextBookmark */ = 4866F6FD12EB7F02009B345C /* PBXTextBookmark */;
+ 4866F6FE12EB7F02009B345C /* PBXTextBookmark */ = 4866F6FE12EB7F02009B345C /* PBXTextBookmark */;
+ 4866F6FF12EB7F02009B345C /* PBXTextBookmark */ = 4866F6FF12EB7F02009B345C /* PBXTextBookmark */;
+ 486929FD133F92EE00A0F098 /* PBXTextBookmark */ = 486929FD133F92EE00A0F098 /* PBXTextBookmark */;
+ 48692AC9133FDEBF00A0F098 /* PBXTextBookmark */ = 48692AC9133FDEBF00A0F098 /* PBXTextBookmark */;
+ 48692BF91340A3FE00A0F098 /* PBXTextBookmark */ = 48692BF91340A3FE00A0F098 /* PBXTextBookmark */;
+ 48692C161340A47800A0F098 /* PBXTextBookmark */ = 48692C161340A47800A0F098 /* PBXTextBookmark */;
+ 48692C211340A4D600A0F098 /* PBXBookmark */ = 48692C211340A4D600A0F098 /* PBXBookmark */;
+ 48692C221340A4D600A0F098 /* PBXTextBookmark */ = 48692C221340A4D600A0F098 /* PBXTextBookmark */;
+ 48692C341340A52A00A0F098 /* PBXTextBookmark */ = 48692C341340A52A00A0F098 /* PBXTextBookmark */;
+ 48821E16120DF1150008EE50 /* PBXTextBookmark */ = 48821E16120DF1150008EE50 /* PBXTextBookmark */;
+ 4890A5541205C1FF00452753 /* PBXTextBookmark */ = 4890A5541205C1FF00452753 /* PBXTextBookmark */;
+ 48AE78AD133485A400821DBA /* PBXTextBookmark */ = 48AE78AD133485A400821DBA /* PBXTextBookmark */;
+ 48B5A12C131EDC840043FBD9 /* PBXTextBookmark */ = 48B5A12C131EDC840043FBD9 /* PBXTextBookmark */;
+ 48B5A12D131EDC840043FBD9 /* PBXTextBookmark */ = 48B5A12D131EDC840043FBD9 /* PBXTextBookmark */;
+ 48B5A14A131EDF5E0043FBD9 /* PBXTextBookmark */ = 48B5A14A131EDF5E0043FBD9 /* PBXTextBookmark */;
+ 48B5A14B131EDF5E0043FBD9 /* PBXTextBookmark */ = 48B5A14B131EDF5E0043FBD9 /* PBXTextBookmark */;
+ 48BB6B20124731BE001239EF /* PBXTextBookmark */ = 48BB6B20124731BE001239EF /* PBXTextBookmark */;
+ 48BB6B21124731BE001239EF /* PBXTextBookmark */ = 48BB6B21124731BE001239EF /* PBXTextBookmark */;
+ 48BB6B4D12473484001239EF /* PBXTextBookmark */ = 48BB6B4D12473484001239EF /* PBXTextBookmark */;
+ 48DB946212F03F2000FB5483 /* PBXTextBookmark */ = 48DB946212F03F2000FB5483 /* PBXTextBookmark */;
+ 48DB947612F03F9500FB5483 /* PBXTextBookmark */ = 48DB947612F03F9500FB5483 /* PBXTextBookmark */;
+ 48DB947712F03F9500FB5483 /* PBXTextBookmark */ = 48DB947712F03F9500FB5483 /* 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 */;
+ 48E31D7112474E88003972E7 /* PBXTextBookmark */ = 48E31D7112474E88003972E7 /* PBXTextBookmark */;
+ 48E31D7212474E88003972E7 /* PBXTextBookmark */ = 48E31D7212474E88003972E7 /* PBXTextBookmark */;
+ 48E953FF12D5CEF800BDC2B8 /* PBXTextBookmark */ = 48E953FF12D5CEF800BDC2B8 /* PBXTextBookmark */;
+ 48F89F411243A3BA00EB68FB /* PBXTextBookmark */ = 48F89F411243A3BA00EB68FB /* PBXTextBookmark */;
+ 48F89F611243AD1E00EB68FB /* PBXTextBookmark */ = 48F89F611243AD1E00EB68FB /* PBXTextBookmark */;
};
sourceControlManager = 4847CD5312057F2A000B560F /* Source Control */;
userBuildSettings = {
@@ -373,16 +370,16 @@
};
4818B0B212D5BA1A006DD66E /* snd_vorbis.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {2159, 2067}}";
- sepNavSelRange = "{1273, 1}";
- sepNavVisRange = "{424, 1711}";
+ sepNavIntBoundsRect = "{{0, 0}, {2159, 2080}}";
+ sepNavSelRange = "{1436, 0}";
+ sepNavVisRange = "{424, 1700}";
};
};
4818B0B412D5BA1A006DD66E /* snd_wave.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {2159, 3588}}";
- sepNavSelRange = "{690, 0}";
- sepNavVisRange = "{175, 1426}";
+ sepNavIntBoundsRect = "{{0, 0}, {2499, 3575}}";
+ sepNavSelRange = "{1149, 0}";
+ sepNavVisRange = "{175, 1245}";
sepNavWindowFrame = "{{15, 680}, {987, 733}}";
};
};
@@ -497,6 +494,13 @@
sepNavVisRange = "{12337, 1030}";
};
};
+ 483A781F0D2EEA5400CB2E4C /* view.c */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {2159, 11349}}";
+ sepNavSelRange = "{0, 0}";
+ sepNavVisRange = "{0, 2404}";
+ };
+ };
483A78360D2EEA6D00CB2E4C /* in_sdl.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1287, 5408}}";
@@ -745,83 +749,49 @@
vrLen = 2819;
vrLoc = 293;
};
- 48692B6913408B3E00A0F098 /* PBXTextBookmark */ = {
+ 48692BF91340A3FE00A0F098 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4818B0B412D5BA1A006DD66E /* snd_wave.c */;
+ name = "snd_wave.c: 27";
+ rLen = 14;
+ rLoc = 1007;
+ rType = 0;
+ vrLen = 1545;
+ vrLoc = 0;
+ };
+ 48692C161340A47800A0F098 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4818B0B212D5BA1A006DD66E /* snd_vorbis.c */;
- name = "snd_vorbis.c: 35";
- rLen = 1;
- rLoc = 1273;
+ name = "snd_vorbis.c: 46";
+ rLen = 0;
+ rLoc = 1436;
rType = 0;
- vrLen = 1711;
+ vrLen = 1700;
vrLoc = 424;
};
- 48692B6A13408B3E00A0F098 /* PBXTextBookmark */ = {
+ 48692C211340A4D600A0F098 /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 484AA4B30D3FF6C0005D917A /* QuakeSpasm.icns */;
+ };
+ 48692C221340A4D600A0F098 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- comments = "Compile /Users/kristian/Documents/Code/XCode/QuakeSpasm/MacOSX/../Quake/snd_wave.c";
- fRef = 4818B0B412D5BA1A006DD66E /* snd_wave.c */;
+ fRef = 483A781F0D2EEA5400CB2E4C /* view.c */;
+ name = "view.c: 1";
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;
+ vrLen = 2404;
+ vrLoc = 0;
};
- 48692BB513408E7300A0F098 /* PBXTextBookmark */ = {
+ 48692C341340A52A00A0F098 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 4818B0B412D5BA1A006DD66E /* snd_wave.c */;
- name = "snd_wave.c: 49";
+ fRef = 483A781F0D2EEA5400CB2E4C /* view.c */;
+ name = "view.c: 1";
rLen = 0;
- rLoc = 1308;
+ rLoc = 0;
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;
+ vrLen = 2404;
+ vrLoc = 0;
};
48728D280D3004A70004D61B /* net_dgrm.c */ = {
uiCtxt = {
@@ -949,7 +919,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 15;
- modificationTime = 322952956.076346;
+ modificationTime = 322999486.9035479;
originalNumberOfMultipleMatches = 1;
state = 0;
};
@@ -966,7 +936,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 25;
- modificationTime = 322952956.078416;
+ modificationTime = 322999486.907032;
originalNumberOfMultipleMatches = 1;
state = 0;
};
diff --git a/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3 b/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3
index 4c2d19bc..7ea7bf4d 100644
--- a/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3
+++ b/MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3
@@ -301,6 +301,8 @@
1058C7A2FEA54F0111CA2CBB
19C28FACFE9D520D11CA2CBB
1C37FBAC04509CD000000102
+ 48692C1F1340A4D600A0F098
+ 48692C201340A4D600A0F098
1C37FAAC04509CD000000102
1CC0EA4004350EF90041110B
1C77FABC04509CD000000102
@@ -308,11 +310,14 @@
PBXSmartGroupTreeModuleOutlineStateSelectionKey
- 0
+ 118
+ 115
+ 114
+ 113
PBXSmartGroupTreeModuleOutlineStateVisibleRectKey
- {{0, 0}, {318, 1237}}
+ {{0, 1109}, {318, 1237}}
PBXTopSmartGroupGIDs
@@ -345,7 +350,7 @@
PBXProjectModuleGUID
4890A4C11205A7AE00452753
PBXProjectModuleLabel
- snd_wave.c
+ view.c
PBXSplitModuleInNavigatorKey
Split0
@@ -353,11 +358,11 @@
PBXProjectModuleGUID
4890A4C21205A7AE00452753
PBXProjectModuleLabel
- snd_wave.c
+ view.c
_historyCapacity
0
bookmark
- 48692BC71340908800A0F098
+ 48692C341340A52A00A0F098
history
4890A5541205C1FF00452753
@@ -413,8 +418,10 @@
48AE78AD133485A400821DBA
486929FD133F92EE00A0F098
48692AC9133FDEBF00A0F098
- 48692B6913408B3E00A0F098
- 48692BBB13408E8200A0F098
+ 48692BF91340A3FE00A0F098
+ 48692C161340A47800A0F098
+ 48692C211340A4D600A0F098
+ 48692C221340A4D600A0F098
SplitCount
@@ -428,18 +435,18 @@
GeometryConfiguration
Frame
- {{0, 0}, {2220, 899}}
+ {{0, 0}, {2220, 893}}
RubberWindowFrame
0 122 2560 1296 0 0 2560 1418
Module
PBXNavigatorGroup
Proportion
- 899pt
+ 893pt
Proportion
- 351pt
+ 357pt
Tabs
@@ -453,7 +460,7 @@
GeometryConfiguration
Frame
- {{10, 27}, {2220, 324}}
+ {{10, 27}, {2220, 330}}
Module
XCDetailModule
@@ -507,7 +514,7 @@
GeometryConfiguration
Frame
- {{10, 27}, {2220, 324}}
+ {{10, 27}, {2220, 330}}
RubberWindowFrame
0 122 2560 1296 0 0 2560 1418
@@ -537,11 +544,11 @@
TableOfContents
- 48692BB613408E7300A0F098
+ 48692C241340A4D600A0F098
1CA23ED40692098700951B8B
- 48692BB713408E7300A0F098
+ 48692C251340A4D600A0F098
4890A4C11205A7AE00452753
- 48692BB813408E7300A0F098
+ 48692C261340A4D600A0F098
1CA23EDF0692099D00951B8B
1CA23EE00692099D00951B8B
1CA23EE10692099D00951B8B
@@ -691,14 +698,14 @@
TableOfContents
- 48692ADD133FDF1400A0F098
+ 48692C271340A4D600A0F098
1CCC7628064C1048000F2A68
1CCC7629064C1048000F2A68
- 48692ADE133FDF1400A0F098
- 48692ADF133FDF1400A0F098
- 48692AE0133FDF1400A0F098
- 48692AE1133FDF1400A0F098
- 4890A4C11205A7AE00452753
+ 48692C281340A4D600A0F098
+ 48692C291340A4D600A0F098
+ 48692C2A1340A4D600A0F098
+ 48692C2B1340A4D600A0F098
+ 48692C2C1340A4D600A0F098
ToolbarConfigUserDefaultsMinorVersion
2
@@ -715,7 +722,7 @@
StatusbarIsVisible
TimeStamp
- 322998408.400415
+ 323003690.87579799
ToolbarConfigUserDefaultsMinorVersion
2
ToolbarDisplayMode
diff --git a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj
index 2fb4dcbe..797ec9a4 100644
--- a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj
+++ b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj
@@ -94,6 +94,12 @@
486577CB0D31A22A00E7920A /* snd_dma.c in Sources */ = {isa = PBXBuildFile; fileRef = 486577C80D31A22A00E7920A /* snd_dma.c */; };
486577CC0D31A22A00E7920A /* snd_mem.c in Sources */ = {isa = PBXBuildFile; fileRef = 486577C90D31A22A00E7920A /* snd_mem.c */; };
486577CD0D31A22A00E7920A /* snd_mix.c in Sources */ = {isa = PBXBuildFile; fileRef = 486577CA0D31A22A00E7920A /* snd_mix.c */; };
+ 48692BED1340A08400A0F098 /* libvorbis.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 48692BEB1340A08400A0F098 /* libvorbis.0.dylib */; };
+ 48692BEE1340A08500A0F098 /* libvorbisfile.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 48692BEC1340A08400A0F098 /* libvorbisfile.3.dylib */; };
+ 48692BF41340A1EC00A0F098 /* libogg.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 48692BF31340A1EC00A0F098 /* libogg.0.dylib */; };
+ 48692C2D1340A4EE00A0F098 /* libogg.0.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 48692BF31340A1EC00A0F098 /* libogg.0.dylib */; };
+ 48692C2E1340A4F100A0F098 /* libvorbis.0.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 48692BEB1340A08400A0F098 /* libvorbis.0.dylib */; };
+ 48692C2F1340A4F600A0F098 /* libvorbisfile.3.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 48692BEC1340A08400A0F098 /* libvorbisfile.3.dylib */; };
48728D2D0D3004A80004D61B /* net_dgrm.c in Sources */ = {isa = PBXBuildFile; fileRef = 48728D280D3004A70004D61B /* net_dgrm.c */; };
48728D2E0D3004A80004D61B /* net_loop.c in Sources */ = {isa = PBXBuildFile; fileRef = 48728D2A0D3004A80004D61B /* net_loop.c */; };
48895DB90D4914A000849ABF /* pl_osx.m in Sources */ = {isa = PBXBuildFile; fileRef = 48895DB80D4914A000849ABF /* pl_osx.m */; };
@@ -133,6 +139,15 @@
name = "Copy Frameworks into .app bundle";
runOnlyForDeploymentPostprocessing = 0;
};
+ 48692C131340A46800A0F098 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 7;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
@@ -264,6 +279,9 @@
486577C80D31A22A00E7920A /* snd_dma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_dma.c; path = ../Quake/snd_dma.c; sourceTree = SOURCE_ROOT; };
486577C90D31A22A00E7920A /* snd_mem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_mem.c; path = ../Quake/snd_mem.c; sourceTree = SOURCE_ROOT; };
486577CA0D31A22A00E7920A /* snd_mix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_mix.c; path = ../Quake/snd_mix.c; sourceTree = SOURCE_ROOT; };
+ 48692BEB1340A08400A0F098 /* libvorbis.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libvorbis.0.dylib; sourceTree = ""; };
+ 48692BEC1340A08400A0F098 /* libvorbisfile.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libvorbisfile.3.dylib; sourceTree = ""; };
+ 48692BF31340A1EC00A0F098 /* libogg.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libogg.0.dylib; sourceTree = ""; };
48728D280D3004A70004D61B /* net_dgrm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = net_dgrm.c; path = ../Quake/net_dgrm.c; sourceTree = SOURCE_ROOT; };
48728D290D3004A80004D61B /* net_dgrm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = net_dgrm.h; path = ../Quake/net_dgrm.h; sourceTree = SOURCE_ROOT; };
48728D2A0D3004A80004D61B /* net_loop.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = net_loop.c; path = ../Quake/net_loop.c; sourceTree = SOURCE_ROOT; };
@@ -301,6 +319,9 @@
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
002F3C0109D093BD00EBEB88 /* OpenGL.framework in Frameworks */,
48348943120595B1004184BC /* Sparkle.framework in Frameworks */,
+ 48692BED1340A08400A0F098 /* libvorbis.0.dylib in Frameworks */,
+ 48692BEE1340A08500A0F098 /* libvorbisfile.3.dylib in Frameworks */,
+ 48692BF41340A1EC00A0F098 /* libogg.0.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -352,6 +373,9 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
+ 48692BF31340A1EC00A0F098 /* libogg.0.dylib */,
+ 48692BEB1340A08400A0F098 /* libvorbis.0.dylib */,
+ 48692BEC1340A08400A0F098 /* libvorbisfile.3.dylib */,
48FA25B612437EAB00667668 /* dsa_pub.pem */,
484AA4B30D3FF6C0005D917A /* QuakeSpasm.icns */,
48B9E7860D340B1E0001CACF /* Launcher.nib */,
@@ -619,6 +643,7 @@
buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "QuakeSpasm" */;
buildPhases = (
8D1107290486CEB800E47090 /* Resources */,
+ 48692C131340A46800A0F098 /* CopyFiles */,
8D11072C0486CEB800E47090 /* Sources */,
8D11072E0486CEB800E47090 /* Frameworks */,
002F39FD09D0883400EBEB88 /* Copy Frameworks into .app bundle */,
@@ -663,6 +688,9 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 48692C2D1340A4EE00A0F098 /* libogg.0.dylib in Resources */,
+ 48692C2E1340A4F100A0F098 /* libvorbis.0.dylib in Resources */,
+ 48692C2F1340A4F600A0F098 /* libvorbisfile.3.dylib in Resources */,
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
48B9E7880D340B1E0001CACF /* Launcher.nib in Resources */,
484AA4B40D3FF6C0005D917A /* QuakeSpasm.icns in Resources */,
@@ -852,6 +880,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/opt/local/lib,
+ "\"$(SRCROOT)\"",
);
PRODUCT_NAME = QuakeSpasm;
WRAPPER_EXTENSION = app;
@@ -885,6 +914,7 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/opt/local/lib,
+ "\"$(SRCROOT)\"",
);
OTHER_CFLAGS = "";
"OTHER_CFLAGS[arch=ppc64]" = (
@@ -950,7 +980,11 @@
"$(FRAMEWORK_SEARCH_PATHS)",
);
GCC_MODEL_TUNING = G3;
- GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ USE_CODEC_VORBIS,
+ USE_CODEC_WAVE,
+ USE_QS_CONBACK,
+ );
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
diff --git a/MacOSX/libogg.0.dylib b/MacOSX/libogg.0.dylib
new file mode 100755
index 00000000..7b57ecc0
Binary files /dev/null and b/MacOSX/libogg.0.dylib differ
diff --git a/MacOSX/libvorbis.0.dylib b/MacOSX/libvorbis.0.dylib
new file mode 100755
index 00000000..d04d1325
Binary files /dev/null and b/MacOSX/libvorbis.0.dylib differ
diff --git a/MacOSX/libvorbisfile.3.dylib b/MacOSX/libvorbisfile.3.dylib
new file mode 100755
index 00000000..3791c3c2
Binary files /dev/null and b/MacOSX/libvorbisfile.3.dylib differ