fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

OS X launcher now uses -fullscreen argument to switch into fullscreen mode instead of just omitting the -windowed argument.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@279 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Kristian Duske 2010-08-14 22:31:28 +00:00
parent 14a4a5159e
commit ff5b99b6a4
3 changed files with 86 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
MacOSX/AppController.m
View file

@ -132,7 +132,9 @@ NSString *FQPrefScreenModeKey = @"ScreenMode";
[arguments addArgument:@"-height" withValue:[NSString stringWithFormat:@"%d", height]]; [arguments addArgument:@"-height" withValue:[NSString stringWithFormat:@"%d", height]];
[arguments addArgument:@"-bpp" withValue:[NSString stringWithFormat:@"%d", bpp]]; [arguments addArgument:@"-bpp" withValue:[NSString stringWithFormat:@"%d", bpp]];
if (!fullscreen) if (fullscreen)
[arguments addArgument:@"-fullscreen"];
else
[arguments addArgument:@"-window"]; [arguments addArgument:@"-window"];
} }

84
MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser
View file

@ -9,7 +9,7 @@
}; };
29B97313FDCFA39411CA2CEA /* Project object */ = { 29B97313FDCFA39411CA2CEA /* Project object */ = {
activeArchitecturePreference = i386; activeArchitecturePreference = i386;
activeBuildConfigurationName = Release; activeBuildConfigurationName = Debug;
activeExecutable = 4847CD3D12057F05000B560F /* QuakeSpasm */; activeExecutable = 4847CD3D12057F05000B560F /* QuakeSpasm */;
activeSDKPreference = macosx10.5; activeSDKPreference = macosx10.5;
activeTarget = 8D1107260486CEB800E47090 /* QuakeSpasm */; activeTarget = 8D1107260486CEB800E47090 /* QuakeSpasm */;
@ -29,7 +29,7 @@
PBXFileTableDataSourceColumnWidthsKey = ( PBXFileTableDataSourceColumnWidthsKey = (
22, 22,
300, 300,
1357.58349609375, 1118,
); );
PBXFileTableDataSourceColumnsKey = ( PBXFileTableDataSourceColumnsKey = (
PBXExecutablesDataSource_ActiveFlagID, PBXExecutablesDataSource_ActiveFlagID,
@ -42,7 +42,7 @@
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
PBXFileTableDataSourceColumnWidthsKey = ( PBXFileTableDataSourceColumnWidthsKey = (
20, 20,
1470, 1230,
20, 20,
48, 48,
43, 43,
@ -81,11 +81,15 @@
PBXFileDataSource_Warnings_ColumnID, PBXFileDataSource_Warnings_ColumnID,
); );
}; };
PBXPerProjectTemplateStateSaveDate = 303503139; PBXPerProjectTemplateStateSaveDate = 303516610;
PBXWorkspaceStateSaveDate = 303503139; PBXWorkspaceStateSaveDate = 303516610;
}; };
perUserProjectItems = { perUserProjectItems = {
48028D3E12156C670018F743 /* PBXTextBookmark */ = 48028D3E12156C670018F743 /* PBXTextBookmark */; 48028D3E12156C670018F743 /* PBXTextBookmark */ = 48028D3E12156C670018F743 /* PBXTextBookmark */;
480BB3A212174CA900939117 /* PBXTextBookmark */ = 480BB3A212174CA900939117 /* PBXTextBookmark */;
480BB3A312174CA900939117 /* PBXTextBookmark */ = 480BB3A312174CA900939117 /* PBXTextBookmark */;
480BB3A412174CA900939117 /* PBXBookmark */ = 480BB3A412174CA900939117 /* PBXBookmark */;
480BB3B4121750BB00939117 /* PBXTextBookmark */ = 480BB3B4121750BB00939117 /* PBXTextBookmark */;
48134A1C12102F680015BF15 /* PBXTextBookmark */ = 48134A1C12102F680015BF15 /* PBXTextBookmark */; 48134A1C12102F680015BF15 /* PBXTextBookmark */ = 48134A1C12102F680015BF15 /* PBXTextBookmark */;
48134A1D12102F680015BF15 /* PBXTextBookmark */ = 48134A1D12102F680015BF15 /* PBXTextBookmark */; 48134A1D12102F680015BF15 /* PBXTextBookmark */ = 48134A1D12102F680015BF15 /* PBXTextBookmark */;
48134A1E12102F680015BF15 /* PBXTextBookmark */ = 48134A1E12102F680015BF15 /* PBXTextBookmark */; 48134A1E12102F680015BF15 /* PBXTextBookmark */ = 48134A1E12102F680015BF15 /* PBXTextBookmark */;
@ -94,8 +98,6 @@
4861FA9212144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9212144B5300BBDEF1 /* PBXTextBookmark */; 4861FA9212144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9212144B5300BBDEF1 /* PBXTextBookmark */;
4861FA9312144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9312144B5300BBDEF1 /* PBXTextBookmark */; 4861FA9312144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9312144B5300BBDEF1 /* PBXTextBookmark */;
487EA7431217260D00315F97 /* PBXTextBookmark */ = 487EA7431217260D00315F97 /* PBXTextBookmark */; 487EA7431217260D00315F97 /* PBXTextBookmark */ = 487EA7431217260D00315F97 /* PBXTextBookmark */;
487EA7441217260D00315F97 /* PBXTextBookmark */ = 487EA7441217260D00315F97 /* PBXTextBookmark */;
487EA7451217260D00315F97 /* PBXTextBookmark */ = 487EA7451217260D00315F97 /* PBXTextBookmark */;
48821E15120DF1150008EE50 /* PBXTextBookmark */ = 48821E15120DF1150008EE50 /* PBXTextBookmark */; 48821E15120DF1150008EE50 /* PBXTextBookmark */ = 48821E15120DF1150008EE50 /* PBXTextBookmark */;
48821E16120DF1150008EE50 /* PBXTextBookmark */ = 48821E16120DF1150008EE50 /* PBXTextBookmark */; 48821E16120DF1150008EE50 /* PBXTextBookmark */ = 48821E16120DF1150008EE50 /* PBXTextBookmark */;
4890A5541205C1FF00452753 /* PBXTextBookmark */ = 4890A5541205C1FF00452753 /* PBXTextBookmark */; 4890A5541205C1FF00452753 /* PBXTextBookmark */ = 4890A5541205C1FF00452753 /* PBXTextBookmark */;
@ -127,6 +129,40 @@
vrLen = 1410; vrLen = 1410;
vrLoc = 0; vrLoc = 0;
}; };
480BB3A212174CA900939117 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 48243B130D33F01A00C29F8F /* main_sdl.c */;
name = "main_sdl.c: 66";
rLen = 0;
rLoc = 1687;
rType = 0;
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;
};
480BB3A412174CA900939117 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 48B9E7A60D340BEA0001CACF /* AppController.m */;
};
480BB3B4121750BB00939117 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 48B9E7A60D340BEA0001CACF /* AppController.m */;
name = "AppController.m: 133";
rLen = 0;
rLoc = 4329;
rType = 0;
vrLen = 1646;
vrLoc = 3495;
};
48134A1412102F400015BF15 /* net_bsd.c */ = { 48134A1412102F400015BF15 /* net_bsd.c */ = {
uiCtxt = { uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1408, 1157}}"; sepNavIntBoundsRect = "{{0, 0}, {1408, 1157}}";
@ -180,7 +216,7 @@
}; };
48243B130D33F01A00C29F8F /* main_sdl.c */ = { 48243B130D33F01A00C29F8F /* main_sdl.c */ = {
uiCtxt = { uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1408, 2340}}"; sepNavIntBoundsRect = "{{0, 0}, {1408, 2353}}";
sepNavSelRange = "{1687, 0}"; sepNavSelRange = "{1687, 0}";
sepNavVisRange = "{1109, 1050}"; sepNavVisRange = "{1109, 1050}";
}; };
@ -221,11 +257,18 @@
sepNavVisRange = "{11094, 861}"; sepNavVisRange = "{11094, 861}";
}; };
}; };
483A78540D2EEAC300CB2E4C /* snd_sdl.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1408, 2704}}";
sepNavSelRange = "{0, 0}";
sepNavVisRange = "{2734, 1405}";
};
};
4847CD3D12057F05000B560F /* QuakeSpasm */ = { 4847CD3D12057F05000B560F /* QuakeSpasm */ = {
isa = PBXExecutable; isa = PBXExecutable;
activeArgIndices = ( activeArgIndices = (
YES, YES,
YES, NO,
); );
argumentStrings = ( argumentStrings = (
"-basedir /Applications/Quake", "-basedir /Applications/Quake",
@ -343,23 +386,6 @@
vrLen = 919; vrLen = 919;
vrLoc = 0; vrLoc = 0;
}; };
487EA7441217260D00315F97 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 48243B130D33F01A00C29F8F /* main_sdl.c */;
rLen = 10;
rLoc = 1677;
rType = 0;
};
487EA7451217260D00315F97 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 48243B130D33F01A00C29F8F /* main_sdl.c */;
name = "main_sdl.c: 66";
rLen = 0;
rLoc = 1687;
rType = 0;
vrLen = 1050;
vrLoc = 1109;
};
48821E15120DF1150008EE50 /* PBXTextBookmark */ = { 48821E15120DF1150008EE50 /* PBXTextBookmark */ = {
isa = PBXTextBookmark; isa = PBXTextBookmark;
fRef = 487C0A5B0DA94A0700A49FF5 /* net_sdlnet.c */; fRef = 487C0A5B0DA94A0700A49FF5 /* net_sdlnet.c */;
@ -502,9 +528,9 @@
}; };
48B9E7A60D340BEA0001CACF /* AppController.m */ = { 48B9E7A60D340BEA0001CACF /* AppController.m */ = {
uiCtxt = { uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1648, 2184}}"; sepNavIntBoundsRect = "{{0, 0}, {1408, 2249}}";
sepNavSelRange = "{3436, 0}"; sepNavSelRange = "{4329, 0}";
sepNavVisRange = "{2715, 1113}"; sepNavVisRange = "{3495, 1646}";
}; };
}; };
48B9E7BE0D340EA80001CACF /* SDLApplication.h */ = { 48B9E7BE0D340EA80001CACF /* SDLApplication.h */ = {

50
MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3
View file

@ -267,13 +267,17 @@
<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key> <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
<array> <array>
<string>29B97314FDCFA39411CA2CEA</string> <string>29B97314FDCFA39411CA2CEA</string>
<string>48243B060D33ED0A00C29F8F</string>
<string>483A77D80D2EE8C500CB2E4C</string>
<string>483A77DC0D2EE8ED00CB2E4C</string>
<string>19C28FACFE9D520D11CA2CBB</string> <string>19C28FACFE9D520D11CA2CBB</string>
<string>1C37FAAC04509CD000000102</string> <string>1C37FAAC04509CD000000102</string>
</array> </array>
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array> <array>
<array> <array>
<integer>0</integer> <integer>39</integer>
<integer>38</integer>
</array> </array>
</array> </array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
@ -312,7 +316,7 @@
<key>PBXProjectModuleGUID</key> <key>PBXProjectModuleGUID</key>
<string>4890A4C11205A7AE00452753</string> <string>4890A4C11205A7AE00452753</string>
<key>PBXProjectModuleLabel</key> <key>PBXProjectModuleLabel</key>
<string>main_sdl.c</string> <string>AppController.m</string>
<key>PBXSplitModuleInNavigatorKey</key> <key>PBXSplitModuleInNavigatorKey</key>
<dict> <dict>
<key>Split0</key> <key>Split0</key>
@ -320,11 +324,11 @@
<key>PBXProjectModuleGUID</key> <key>PBXProjectModuleGUID</key>
<string>4890A4C21205A7AE00452753</string> <string>4890A4C21205A7AE00452753</string>
<key>PBXProjectModuleLabel</key> <key>PBXProjectModuleLabel</key>
<string>main_sdl.c</string> <string>AppController.m</string>
<key>_historyCapacity</key> <key>_historyCapacity</key>
<integer>0</integer> <integer>0</integer>
<key>bookmark</key> <key>bookmark</key>
<string>487EA7451217260D00315F97</string> <string>480BB3B4121750BB00939117</string>
<key>history</key> <key>history</key>
<array> <array>
<string>4890A5541205C1FF00452753</string> <string>4890A5541205C1FF00452753</string>
@ -345,7 +349,9 @@
<string>4861FA9312144B5300BBDEF1</string> <string>4861FA9312144B5300BBDEF1</string>
<string>48028D3E12156C670018F743</string> <string>48028D3E12156C670018F743</string>
<string>487EA7431217260D00315F97</string> <string>487EA7431217260D00315F97</string>
<string>487EA7441217260D00315F97</string> <string>480BB3A212174CA900939117</string>
<string>480BB3A312174CA900939117</string>
<string>480BB3A412174CA900939117</string>
</array> </array>
</dict> </dict>
<key>SplitCount</key> <key>SplitCount</key>
@ -359,18 +365,18 @@
<key>GeometryConfiguration</key> <key>GeometryConfiguration</key>
<dict> <dict>
<key>Frame</key> <key>Frame</key>
<string>{{0, 0}, {1469, 668}}</string> <string>{{0, 0}, {1469, 663}}</string>
<key>RubberWindowFrame</key> <key>RubberWindowFrame</key>
<string>0 122 1680 906 0 0 1680 1028 </string> <string>0 122 1680 906 0 0 1680 1028 </string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXNavigatorGroup</string> <string>PBXNavigatorGroup</string>
<key>Proportion</key> <key>Proportion</key>
<string>668pt</string> <string>663pt</string>
</dict> </dict>
<dict> <dict>
<key>Proportion</key> <key>Proportion</key>
<string>192pt</string> <string>197pt</string>
<key>Tabs</key> <key>Tabs</key>
<array> <array>
<dict> <dict>
@ -384,7 +390,9 @@
<key>GeometryConfiguration</key> <key>GeometryConfiguration</key>
<dict> <dict>
<key>Frame</key> <key>Frame</key>
<string>{{10, 27}, {1709, 165}}</string> <string>{{10, 27}, {1469, 170}}</string>
<key>RubberWindowFrame</key>
<string>0 122 1680 906 0 0 1680 1028 </string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>XCDetailModule</string> <string>XCDetailModule</string>
@ -401,8 +409,6 @@
<dict> <dict>
<key>Frame</key> <key>Frame</key>
<string>{{10, 27}, {1469, 165}}</string> <string>{{10, 27}, {1469, 165}}</string>
<key>RubberWindowFrame</key>
<string>0 122 1680 906 0 0 1680 1028 </string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXProjectFindModule</string> <string>PBXProjectFindModule</string>
@ -468,11 +474,11 @@
</array> </array>
<key>TableOfContents</key> <key>TableOfContents</key>
<array> <array>
<string>487EA7401217173200315F97</string> <string>480BB3A612174CA900939117</string>
<string>1CA23ED40692098700951B8B</string> <string>1CA23ED40692098700951B8B</string>
<string>487EA7411217173200315F97</string> <string>480BB3A712174CA900939117</string>
<string>4890A4C11205A7AE00452753</string> <string>4890A4C11205A7AE00452753</string>
<string>487EA7421217173200315F97</string> <string>480BB3A812174CA900939117</string>
<string>1CA23EDF0692099D00951B8B</string> <string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string> <string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string> <string>1CA23EE10692099D00951B8B</string>
@ -621,14 +627,14 @@
</array> </array>
<key>TableOfContents</key> <key>TableOfContents</key>
<array> <array>
<string>487EA7461217260D00315F97</string> <string>480BB3A912174CA900939117</string>
<string>1CCC7628064C1048000F2A68</string> <string>1CCC7628064C1048000F2A68</string>
<string>1CCC7629064C1048000F2A68</string> <string>1CCC7629064C1048000F2A68</string>
<string>487EA7471217260D00315F97</string> <string>480BB3AA12174CA900939117</string>
<string>487EA7481217260D00315F97</string> <string>480BB3AB12174CA900939117</string>
<string>487EA7491217260D00315F97</string> <string>480BB3AC12174CA900939117</string>
<string>487EA74A1217260D00315F97</string> <string>480BB3AD12174CA900939117</string>
<string>487EA74B1217260D00315F97</string> <string>480BB3AE12174CA900939117</string>
</array> </array>
<key>ToolbarConfigUserDefaultsMinorVersion</key> <key>ToolbarConfigUserDefaultsMinorVersion</key>
<string>2</string> <string>2</string>
@ -662,8 +668,8 @@
<integer>5</integer> <integer>5</integer>
<key>WindowOrderList</key> <key>WindowOrderList</key>
<array> <array>
<string>487EA74C1217260D00315F97</string> <string>480BB3B012174CA900939117</string>
<string>487EA74D1217260D00315F97</string> <string>480BB3B112174CA900939117</string>
<string>/Users/kristian/Documents/Code/XCode/QuakeSpasm/MacOSX/QuakeSpasm.xcodeproj</string> <string>/Users/kristian/Documents/Code/XCode/QuakeSpasm/MacOSX/QuakeSpasm.xcodeproj</string>
</array> </array>
<key>WindowString</key> <key>WindowString</key>