Command line version is made buildable again

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/molby/trunk@468 a2be9bc6-48de-4e38-9406-05402d4bc13c

diff --git a/MolLib/cmdtool_stubs.c b/MolLib/cmdtool_stubs.c
index 5f5e0b6..218b213 100644 (file)
--- a/MolLib/cmdtool_stubs.c
+++ b/MolLib/cmdtool_stubs.c
@@ -25,6 +25,9 @@
 #include <stdarg.h>
 #include <string.h>
 #include <fcntl.h>
+#include <unistd.h>
+
+#include <ruby.h>
 
 Molecule *
 MoleculeCallback_moleculeAtOrderedIndex(int idx)
@@ -97,6 +100,14 @@ MyAppCallback_getDocumentHomeDir(void)
        return (s == NULL ? NULL : strdup(s));
 }
 
+char *
+MyAppCallback_getHomeDir(void)
+{
+       char *s;
+       s = getenv("HOME");
+       return (s == NULL ? NULL : strdup(s));
+}
+
 RubyValue
 MyAppCallback_executeScriptFromFile(const char *path, int *status)
 {
@@ -299,7 +310,7 @@ MolActionCallback_registerUndo(Molecule *mol, MolAction *action)
 }
 
 int
-main(int argc, const char **argv)
+main(int argc, char **argv)
 {
        int fd;
        char *scriptdir;
@@ -320,7 +331,7 @@ main(int argc, const char **argv)
        
        free(scriptdir);
        
-       ruby_options(argc, argv);
-       ruby_run();
+       ruby_run_node(ruby_options(argc, argv));
+
        return 0;
 }

diff --git a/xcode-build/Molby.xcodeproj/project.pbxproj b/xcode-build/Molby.xcodeproj/project.pbxproj
index ee708bb..af83e84 100644 (file)
--- a/xcode-build/Molby.xcodeproj/project.pbxproj
+++ b/xcode-build/Molby.xcodeproj/project.pbxproj
@@ -772,15 +772,19 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                COPY_PHASE_STRIP = NO;
+                               GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;
                                GCC_VERSION = 4.2;
                                HEADER_SEARCH_PATHS = (
                                        "$(PROJECT_DIR)/../../fftw-3.3.2/osx-build/include",
-                                       "$(PROJECT_DIR)/../../ruby-1.8.7-p160/osx-build/include",
+                                       "$(PROJECT_DIR)/../../ruby-2.0.0-p353",
+                                       "$(PROJECT_DIR)/../../ruby-2.0.0-p353/osx-build/include/ruby-2.0.0",
+                                       "$(PROJECT_DIR)/../../ruby-2.0.0-p353/osx-build/include/ruby-2.0.0/universal-darwin10.8.0",
                                );
                                INSTALL_PATH = /usr/local/bin;
                                LIBRARY_SEARCH_PATHS = (
                                        "$(PROJECT_DIR)/../../fftw-3.3.2/osx-build/lib",
-                                       "$(PROJECT_DIR)/../../ruby-1.8.7-p160/osx-build/lib",
+                                       "$(PROJECT_DIR)/../../ruby-2.0.0-p353/osx-build/lib",
                                );
                                OTHER_CFLAGS = "-D__CMDMAC__=1";
                                OTHER_LDFLAGS = (
@@ -798,15 +802,19 @@
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                COPY_PHASE_STRIP = YES;
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;
                                GCC_VERSION = 4.2;
                                HEADER_SEARCH_PATHS = (
                                        "$(PROJECT_DIR)/../../fftw-3.3.2/osx-build/include",
-                                       "$(PROJECT_DIR)/../../ruby-1.8.7-p160/osx-build/include",
+                                       "$(PROJECT_DIR)/../../ruby-2.0.0-p353",
+                                       "$(PROJECT_DIR)/../../ruby-2.0.0-p353/osx-build/include/ruby-2.0.0",
+                                       "$(PROJECT_DIR)/../../ruby-2.0.0-p353/osx-build/include/ruby-2.0.0/universal-darwin10.8.0",
                                );
                                INSTALL_PATH = /usr/local/bin;
                                LIBRARY_SEARCH_PATHS = (
                                        "$(PROJECT_DIR)/../../fftw-3.3.2/osx-build/lib",
-                                       "$(PROJECT_DIR)/../../ruby-1.8.7-p160/osx-build/lib",
+                                       "$(PROJECT_DIR)/../../ruby-2.0.0-p353/osx-build/lib",
                                );
                                OTHER_CFLAGS = "-D__CMDMAC__=1";
                                OTHER_LDFLAGS = (