[Pingus-CVS] r2589 - in trunk: Pingus.xcodeproj src

[jave27]

Author: jave27
Date: 2006-01-13 00:06:25 +0100 (Fri, 13 Jan 2006)
New Revision: 2589

Modified:
   trunk/Pingus.xcodeproj/project.pbxproj
   trunk/src/globals.cxx
Log:
Applied Sean Heber's patch to use clanGL for MacOSX and updated the 
xcode project file.



Modified: trunk/Pingus.xcodeproj/project.pbxproj
===================================================================
--- trunk/Pingus.xcodeproj/project.pbxproj      2006-01-11 18:06:35 UTC (rev 
2588)
+++ trunk/Pingus.xcodeproj/project.pbxproj      2006-01-12 23:06:25 UTC (rev 
2589)
@@ -11,6 +11,8 @@
                144F23F30948D374006107D1 /* file_dialog_listener.hxx in 
CopyFiles */ = {isa = PBXBuildFile; fileRef = 144F23F20948D374006107D1 /* 
file_dialog_listener.hxx */; };
                144F23FA0948D398006107D1 /* worldmap_story.cxx in Sources */ = 
{isa = PBXBuildFile; fileRef = 144F23F80948D398006107D1 /* worldmap_story.cxx 
*/; };
                144F23FB0948D398006107D1 /* worldmap_story.hxx in CopyFiles */ 
= {isa = PBXBuildFile; fileRef = 144F23F90948D398006107D1 /* worldmap_story.hxx 
*/; };
+               1492D09909770C4300BDCB27 /* context_menu.cxx in Sources */ = 
{isa = PBXBuildFile; fileRef = 1492D09709770C4300BDCB27 /* context_menu.cxx */; 
};
+               1492D09A09770C4300BDCB27 /* context_menu.hxx in CopyFiles */ = 
{isa = PBXBuildFile; fileRef = 1492D09809770C4300BDCB27 /* context_menu.hxx */; 
};
                149C3FF9093F79D900FCA6C1 /* file_dialog_item.cxx in Sources */ 
= {isa = PBXBuildFile; fileRef = 149C3FF5093F79D900FCA6C1 /* 
file_dialog_item.cxx */; };
                149C3FFA093F79D900FCA6C1 /* file_dialog_item.hxx in CopyFiles 
*/ = {isa = PBXBuildFile; fileRef = 149C3FF6093F79D900FCA6C1 /* 
file_dialog_item.hxx */; };
                149C3FFB093F79D900FCA6C1 /* file_dialog.cxx in Sources */ = 
{isa = PBXBuildFile; fileRef = 149C3FF7093F79D900FCA6C1 /* file_dialog.cxx */; 
};
@@ -338,6 +340,7 @@
                                149C48ED093FD58300FCA6C1 /* tinygettext.hxx in 
CopyFiles */,
                                144F23F30948D374006107D1 /* 
file_dialog_listener.hxx in CopyFiles */,
                                144F23FB0948D398006107D1 /* worldmap_story.hxx 
in CopyFiles */,
+                               1492D09A09770C4300BDCB27 /* context_menu.hxx in 
CopyFiles */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -349,6 +352,8 @@
                144F23F20948D374006107D1 /* file_dialog_listener.hxx */ = {isa 
= PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; 
name = file_dialog_listener.hxx; path = src/file_dialog_listener.hxx; 
sourceTree = "<group>"; };
                144F23F80948D398006107D1 /* worldmap_story.cxx */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; 
path = worldmap_story.cxx; sourceTree = "<group>"; };
                144F23F90948D398006107D1 /* worldmap_story.hxx */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path 
= worldmap_story.hxx; sourceTree = "<group>"; };
+               1492D09709770C4300BDCB27 /* context_menu.cxx */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; 
path = context_menu.cxx; sourceTree = "<group>"; };
+               1492D09809770C4300BDCB27 /* context_menu.hxx */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path 
= context_menu.hxx; sourceTree = "<group>"; };
                149C3FF5093F79D900FCA6C1 /* file_dialog_item.cxx */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; 
name = file_dialog_item.cxx; path = src/file_dialog_item.cxx; sourceTree = 
"<group>"; };
                149C3FF6093F79D900FCA6C1 /* file_dialog_item.hxx */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; name 
= file_dialog_item.hxx; path = src/file_dialog_item.hxx; sourceTree = 
"<group>"; };
                149C3FF7093F79D900FCA6C1 /* file_dialog.cxx */ = {isa = 
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; 
name = file_dialog.cxx; path = src/file_dialog.cxx; sourceTree = "<group>"; };
@@ -887,6 +892,8 @@
                14BB77040923CCF30055EC6A /* editor */ = {
                        isa = PBXGroup;
                        children = (
+                               1492D09709770C4300BDCB27 /* context_menu.cxx */,
+                               1492D09809770C4300BDCB27 /* context_menu.hxx */,
                                14BB77050923CCF30055EC6A /* editor_panel.cxx */,
                                14BB77060923CCF30055EC6A /* editor_panel.hxx */,
                                14BB77070923CCF30055EC6A /* editor_screen.cxx 
*/,
@@ -1812,6 +1819,7 @@
                                149C48EA093FD58300FCA6C1 /* ground_map.cxx in 
Sources */,
                                149C48EC093FD58300FCA6C1 /* tinygettext.cxx in 
Sources */,
                                144F23FA0948D398006107D1 /* worldmap_story.cxx 
in Sources */,
+                               1492D09909770C4300BDCB27 /* context_menu.cxx in 
Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

Modified: trunk/src/globals.cxx
===================================================================
--- trunk/src/globals.cxx       2006-01-11 18:06:35 UTC (rev 2588)
+++ trunk/src/globals.cxx       2006-01-12 23:06:25 UTC (rev 2589)
@@ -57,13 +57,13 @@
 
 int         pingus_debug_flags              = 0;
 
-#ifdef WIN32
 bool        fullscreen_enabled              = false;
-// The clanSDL target is a little buggy on Windows - Use OpenGL by default
+
+#if defined(WIN32) || defined(__APPLE__)
+// The clanSDL target is a little buggy on Windows and OSX - Use OpenGL by 
default
 bool        use_opengl                      = true;
 #else
-bool        fullscreen_enabled              = false;
-// Use the clanSDL target by default for systems other than Windows.
+// Use the clanSDL target by default for systems other than Windows and OSX 
(aka Linux).
 bool        use_opengl                      = false;
 #endif
 } // namespace Pingus