Incorporated Macintosh changes submitted by Luigi Ballabio

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@919 626c5289-ae23-0410-ae9c-e8d60b6d4f22

SWIG/Source/Include/swigver.h

@@ -2,9 +2,9 @@
 /* SWIG version information */
 
 #ifndef SWIG_VERSION
-#define SWIG_VERSION "1.3u-20000712-1502"
+#define SWIG_VERSION "1.3u-20001008-1349"
 #endif
 
 #ifndef SWIG_SPIN
-#define SWIG_SPIN "(Alpha 3)"
+#define SWIG_SPIN "(Alpha 5)"
 #endif

SWIG/Source/Modules1.1/swigmain.cxx

@@ -24,7 +24,9 @@ static char cvsroot[] = "$Header$";
  *
  ***********************************************************************/
 
+#ifndef MACSWIG
 #include "swigconfig.h"
+#endif
 #include "mod11.h"
 #include "tcl8.h"
 #include "python.h"
@@ -44,6 +46,11 @@ static char cvsroot[] = "$Header$";
 #define SWIG_LANG PYTHON
 #endif
 
+#ifdef MACSWIG
+#include <console.h>
+#include <SIOUX.h>
+#endif
+
 static char  *usage = (char*)"\
 swig <options> filename\n\n\
 Target Language Options:\n\
@@ -66,6 +73,12 @@ int main(int argc, char **argv) {
   int i;
   Language *dl = new SWIG_LANG;
   extern int SWIG_main(int, char **, Language *);
+  
+  #ifdef MACSWIG
+  SIOUXSettings.asktosaveonclose = false;
+  argc = ccommand(&argv);
+  #endif
+  
   Swig_init_args(argc,argv);
 
   // Get options

SWIG/Source/SWIG1.1/main.cxx

@@ -15,7 +15,9 @@
 static char cvsroot[] = "$Header$";
 
 #include "internal.h"
+#ifndef MACSWIG
 #include "swigconfig.h"
+#endif
 
 #include <time.h>
 #include <stdlib.h>
@@ -190,11 +192,17 @@ int SWIG_main(int argc, char *argv[], Language *l) {
 
   SwigLib = Swig_copy_string(LibDir);        // Make a copy of the real library location
 
+#ifdef MACSWIG
+  sprintf(temp,"%s:config", LibDir);
+  Swig_add_directory((DOH *) ":swig_lib:config");
+  Swig_add_directory((DOH *) ":swig_lib");
+#else
   sprintf(temp,"%s/config", LibDir);
-  Swig_add_directory((DOH *) temp);
   Swig_add_directory((DOH *) "./swig_lib/config");
-  Swig_add_directory((DOH *) LibDir);
   Swig_add_directory((DOH *) "./swig_lib");
+#endif
+  Swig_add_directory((DOH *) temp);
+  Swig_add_directory((DOH *) LibDir);
   sprintf(InitName,"init_wrap");
 
   libfiles = NewList();
@@ -292,7 +300,11 @@ int SWIG_main(int argc, char *argv[], Language *l) {
   // Add language dependent directory to the search path
   {
     DOH *rl = NewString("");
+#ifdef MACSWIG
+    Printf(r1,"%s:%s", SwigLib,LibDir);
+#else
     Printf(rl,"%s/%s", SwigLib,LibDir);
+#endif    
     Swig_add_directory(rl);
   }
 

SWIG/Source/SWIG1.1/swig11.h

@@ -28,9 +28,6 @@ extern "C" {
 
 #ifdef MACSWIG
 #define Status Swig_Status
-#undef stderr
-#define stderr swig_log
-extern  FILE   *swig_log;
 #endif
 
 #define PLAIN_VIRTUAL   1

SWIG/Source/Swig/cwrap.c

@@ -41,8 +41,9 @@ Swig_cparm_name(Parm *p, int i) {
 
 String *
 Swig_clocal(SwigType *t, String_or_char *name, String_or_char *value) {
-  String *decl;
+  String *decl = 0;
 
+  /*  *((char *) decl) = 'x';*/
   decl = NewString("");
   switch(SwigType_type(t)) {
   case T_USER:

SWIG/Source/Swig/include.c

@@ -87,7 +87,11 @@ Swig_search_path() {
   assert(slist);
   filename = NewString("");
   assert(filename);
+#ifdef MACSWIG
+  Printf(filename,"%s",SWIG_FILE_DELIMETER);
+#else
   Printf(filename,".%s", SWIG_FILE_DELIMETER);
+#endif
   Append(slist,filename);
   for (i = 0; i < Len(directories); i++) {
     dirname =  Getitem(directories,i);

SWIG/Source/Swig/swig.h

@@ -73,7 +73,11 @@ extern String  *Swig_swiglib_get();
 
 #define OUTFILE(x)   Swig_filebyname(x)
 
+#ifdef MACSWIG
+#define  SWIG_FILE_DELIMETER   ":"
+#else
 #define  SWIG_FILE_DELIMETER   "/"
+#endif
 
 /* --- Command line parsing --- */
 

SWIG/Source/Swig/swig.i

@@ -717,7 +717,11 @@ extern FILE *Swig_open(DOH *name);
 extern DOH  *Swig_read_file(FILE *file);
 extern DOH  *Swig_include(DOH *name);
 
+#ifdef MACSWIG
+#define  SWIG_FILE_DELIMETER   ":"
+#else
 #define  SWIG_FILE_DELIMETER   "/"
+#endif
 
 %section "Command Line Parsing"