[Pingus-CVS] r2560 - in trunk: . src

[jave27]

Author: jave27
Date: 2005-12-14 21:20:16 +0100 (Wed, 14 Dec 2005)
New Revision: 2560

Modified:
   trunk/Pingus.vcproj
   trunk/src/pingus_main.cxx
   trunk/src/pingus_main.hxx
Log:
Added a command line arg. to force SDL mode.
Set GL to be default on Windows, and SDL to be default on Linux.  There are 
some bugs in the SDL target for Windows.
Removed the caimagemanipulation compile targets in the MSVCProject file

Modified: trunk/Pingus.vcproj
===================================================================
--- trunk/Pingus.vcproj 2005-12-12 00:03:13 UTC (rev 2559)
+++ trunk/Pingus.vcproj 2005-12-14 20:20:16 UTC (rev 2560)
@@ -1676,9 +1676,21 @@
                                Filter="">
                                <File
                                        
RelativePath=".\src\caimagemanipulation\caimagemanipulation.cpp">
+                                       <FileConfiguration
+                                               Name="Debug|Win32"
+                                               ExcludedFromBuild="TRUE">
+                                               <Tool
+                                                       
Name="VCCLCompilerTool"/>
+                                       </FileConfiguration>
                                </File>
                                <File
                                        
RelativePath=".\src\caimagemanipulation\caimagemanipulation.h">
+                                       <FileConfiguration
+                                               Name="Debug|Win32"
+                                               ExcludedFromBuild="TRUE">
+                                               <Tool
+                                                       
Name="VCCustomBuildTool"/>
+                                       </FileConfiguration>
                                </File>
                        </Filter>
                        <Filter

Modified: trunk/src/pingus_main.cxx
===================================================================
--- trunk/src/pingus_main.cxx   2005-12-12 00:03:13 UTC (rev 2559)
+++ trunk/src/pingus_main.cxx   2005-12-14 20:20:16 UTC (rev 2560)
@@ -120,11 +120,18 @@
   throw "crash";
 }
 
-PingusMain::PingusMain()
+PingusMain::PingusMain() :
+  show_credits(false),
+  blitter_test(false),
+  refresh_rate(60)
 {
-  show_credits = false;
-  blitter_test = false;
-  refresh_rate = 60;
+#ifdef WIN32
+       // The clanSDL target is a little buggy on Windows - Use OpenGL by 
default
+       use_opengl = true;
+#else
+       // Use the clanSDL target by default otherwise.
+       use_opengl = false;
+#endif
 }
 
 PingusMain::~PingusMain()
@@ -197,6 +204,8 @@
                   _("Disable intro"));
   argp.add_option('G', "use-opengl", "",
                   _("Use OpenGL"));
+       argp.add_option('S', "use-sdl", "",
+                  _("Use SDL"));
   argp.add_option('w', "window", "",
                   _("Start in Window Mode"));
   argp.add_option('f', "fullscreen", "",
@@ -300,6 +309,10 @@
           use_opengl = true;
           break;
 
+                               case 'S':
+                                       use_opengl = false;
+                                       break;
+
         case 's': // -s, --disable-sound
           sound_enabled = false;
           break;
@@ -319,15 +332,11 @@
               }
           }
           break;
-        case 'S':
-          std::cout << "not impl. XALA" << std::endl;
-          //pingus_soundfile = argp.get_argument();
-          //if (verbose)
-          //std::cout << "check_args: Sound File = " << pingus_soundfile << 
std::endl;
-          break;
+
         case 'm': // -m, --disable-music
           music_enabled = false;
           break;
+
         case 'd': // -d, --datadir
           path_manager.add_path(argp.get_argument());
             
@@ -335,6 +344,7 @@
             std::cout << "check_args: Pingus Data Dir = "
                       << argp.get_argument() << std::endl;
           break;
+
         case 'V':
           std::cout << "Pingus Version " << VERSION
 #ifndef OFFICIAL_PINGUS_BUILD
@@ -654,7 +664,8 @@
             << (fullscreen_enabled ? _(" enabled") : _("disabled"))
             << std::endl;
   std::cout << _("refresh rate:            ") << refresh_rate << std::endl;
-  
+       std::cout << _("using OpenGL:            ") << use_opengl << std::endl;
+
   std::cout << std::endl;
 }
 
@@ -847,7 +858,7 @@
   else
     {
       CL_SetupCore::init ();
-  
+
       if (use_opengl) CL_SetupGL::init();
       else            CL_SetupSDL::init();
 

Modified: trunk/src/pingus_main.hxx
===================================================================
--- trunk/src/pingus_main.hxx   2005-12-12 00:03:13 UTC (rev 2559)
+++ trunk/src/pingus_main.hxx   2005-12-14 20:20:16 UTC (rev 2560)
@@ -37,6 +37,8 @@
   bool    blitter_test;
   bool    no_config_file;
   bool    show_credits;
+       bool    use_opengl;
+
   /// the name of the exe: argv[0]
   std::string executable_name;
   std::string levelfile;