[Windstille-devel] rev 407 - trunk/src

[Ingo Ruhnke]

Author: grumbel
Date: 2004-06-17 00:04:20 +0200 (Thu, 17 Jun 2004)
New Revision: 407

Modified:
   trunk/src/SConstruct
   trunk/src/flexlay.cxx
   trunk/src/string_converter.hxx
Log:
- added config.h workaround

Modified: trunk/src/SConstruct
===================================================================
--- trunk/src/SConstruct        2004-06-16 21:55:13 UTC (rev 406)
+++ trunk/src/SConstruct        2004-06-16 22:04:20 UTC (rev 407)
@@ -18,11 +18,15 @@
 ##  along with this program; if not, write to the Free Software
 ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+opts = Options('custom.py')
+opts.Add('CXX', 'The C++ compiler.', 'g++')
+opts.Add('CXXFLAGS', 'The C++ compiler flags.', '-g -O0 -Wall')
 
-env = Environment(CXX = 'g++',
-                  CXXFLAGS = '-g -O0 -Wall',
-                  SHLIBPREFIX='')
+env = Environment(SHLIBPREFIX='',
+                  options=opts)
 
+Help(opts.GenerateHelpText(env))
+
 Depends('flexlay_python_wrap.cxx', ['flexlay_wrap.i',
                              'clanlib.i',
                              'scripting/editor.hxx',

Modified: trunk/src/flexlay.cxx
===================================================================
--- trunk/src/flexlay.cxx       2004-06-16 21:55:13 UTC (rev 406)
+++ trunk/src/flexlay.cxx       2004-06-16 22:04:20 UTC (rev 407)
@@ -17,12 +17,12 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <config.h>
 #include <ClanLib/core.h>
 #include <ClanLib/display.h>
 #include <ClanLib/gui.h>
 #include <ClanLib/guistylesilver.h>
 #include <ClanLib/gl.h>
+#include "config.h"
 #include "globals.hxx"
 #include "fonts.hxx"
 #include "flexlay.hxx"

Modified: trunk/src/string_converter.hxx
===================================================================
--- trunk/src/string_converter.hxx      2004-06-16 21:55:13 UTC (rev 406)
+++ trunk/src/string_converter.hxx      2004-06-16 22:04:20 UTC (rev 407)
@@ -20,9 +20,9 @@
 #ifndef STRINGCONVERTER_HXX
 #define STRINGCONVERTER_HXX
 
-#include <config.h>
 #include <stdexcept>
 #include <sstream>
+#include "config.h"
 
 template <class T>
 std::string to_string(const T& any)