[simspark-svn] SF.net SVN: simspark:[226] trunk/spark

[<yx...@us...>]

Revision: 226
          http://simspark.svn.sourceforge.net/simspark/?rev=226&view=rev
Author:   yxu
Date:     2010-12-14 17:07:14 +0000 (Tue, 14 Dec 2010)

Log Message:
-----------
support ruby 1.9.1

Modified Paths:
--------------
    trunk/spark/cmake/FindRuby.cmake
    trunk/spark/lib/zeitgeist/scriptserver/gcvalue.h

Modified: trunk/spark/cmake/FindRuby.cmake
===================================================================
--- trunk/spark/cmake/FindRuby.cmake	2010-11-15 00:01:13 UTC (rev 225)
+++ trunk/spark/cmake/FindRuby.cmake	2010-12-14 17:07:14 UTC (rev 226)
@@ -17,7 +17,7 @@
 #   RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
 #   RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
 
-FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.8 ruby18 ruby1.9 ruby19)
+FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby1.8 ruby18 ruby1.9 ruby19 ruby1.9.1)
 
 
 IF(RUBY_EXECUTABLE  AND NOT  RUBY_ARCH_DIR)
@@ -86,7 +86,7 @@
 
 # search the ruby library, the version for MSVC can have the "msvc" prefix and the "static" suffix
 FIND_LIBRARY(RUBY_LIBRARY
-  NAMES ruby ruby1.8 ruby1.9
+  NAMES ruby ruby1.8 ruby1.9 ruby-1.9.1
         msvcrt-ruby18 msvcrt-ruby19 msvcrt-ruby191 msvcrt-ruby18-static msvcrt-ruby19-static msvcrt-ruby191-static
   PATHS ${RUBY_POSSIBLE_LIB_DIR}
   C:/library/ruby/lib/

Modified: trunk/spark/lib/zeitgeist/scriptserver/gcvalue.h
===================================================================
--- trunk/spark/lib/zeitgeist/scriptserver/gcvalue.h	2010-11-15 00:01:13 UTC (rev 225)
+++ trunk/spark/lib/zeitgeist/scriptserver/gcvalue.h	2010-12-14 17:07:14 UTC (rev 226)
@@ -29,6 +29,10 @@
 #include <string>
 #include <zeitgeist/zeitgeist_defines.h>
 
+#ifndef STR2CSTR
+#define STR2CSTR StringValueCStr
+#endif
+
 namespace zeitgeist
 {
 /** \class GCValue is a ruby VALUE wrapper. It is responsible to


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.