[Euslisp-commit] SF.net SVN: euslisp:[658] trunk/EusLisp/lisp

[<k-...@us...>]

Revision: 658
          http://sourceforge.net/p/euslisp/code/658
Author:   k-okada
Date:     2013-11-29 09:29:09 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
fix Darwin support, thanks furushchev, see Issue #45 (https://sourceforge.net/p/jskeus/tickets/45/) 

Modified Paths:
--------------
    trunk/EusLisp/lisp/Makefile.Darwin
    trunk/EusLisp/lisp/xwindow/xforeign.c.c

Modified: trunk/EusLisp/lisp/Makefile.Darwin
===================================================================
--- trunk/EusLisp/lisp/Makefile.Darwin	2013-11-23 00:00:14 UTC (rev 657)
+++ trunk/EusLisp/lisp/Makefile.Darwin	2013-11-29 09:29:09 UTC (rev 658)
@@ -53,11 +53,11 @@
 # If you use libc.so.5, remove -DLIB6 option.
 # In order to include thread library, libc.so.6 is preferrable.
 
-CFLAGS=-D$(MACHINE) -DLinux -D_REENTRANT -DVERSION=\"$(VERSION)\" -DDarwin \
+CFLAGS=-D$(MACHINE) -Wno-return-type -DLinux -D_REENTRANT -DVERSION=\"$(VERSION)\" -DDarwin \
 	-DLIB6 $(ALIGN_FUNCTIONS)  \
         $(DEBUG) $(CPU_OPTIMIZE) $(THREAD) -D$(XVERSION) \
 	-DGCC $(GCC3) \
-        -I/usr/include -I/opt/local/include -I/usr/X11/include -I$(EUSDIR)/include
+        -I/usr/include -I/opt/local/include -I/opt/X11/include -I$(EUSDIR)/include
 
 # Use gcc for C-compiling on SunOS4. Sun's cc is ok on Solaris.
 # /usr/ucb/cc cannot compile because of its incapability of recognizing
@@ -78,11 +78,11 @@
 # On Solaris, XLIB and EUSLIB are combined together into lib/libeusx.so.
 
 RAWLIB=-ldl -lm -lpthread
-XLIB= -L/opt/local/lib -L/usr/X11/lib -lX11
+XLIB= -L/opt/local/lib -L/opt/X11/lib -lX11
 
 # specify directories where euslisp's libraries are located.
 EUSLIB= -L$(ADLIBDIR)
-GLLIB= -L$(ADLIBDIR) -lGLU -lGL -lXext -leusgl
+GLLIB= -L$/opt/X11/lib -lGLU -lGL -lXext -leusgl
 
 # POSIX Thread 
 THREADDEP=mthread_posix.c

Modified: trunk/EusLisp/lisp/xwindow/xforeign.c.c
===================================================================
--- trunk/EusLisp/lisp/xwindow/xforeign.c.c	2013-11-23 00:00:14 UTC (rev 657)
+++ trunk/EusLisp/lisp/xwindow/xforeign.c.c	2013-11-29 09:29:09 UTC (rev 658)
@@ -426,7 +426,7 @@
    entry=(eusinteger_t)dlsym(dlhandle, xentry);
 #elif Darwin
    eusinteger_t dlhandle;
-   dlhandle=(eusinteger_t)dlopen("/opt/local/lib/libX11.dylib", RTLD_LAZY);
+   dlhandle=(eusinteger_t)dlopen("/opt/X11/lib/libX11.dylib", RTLD_LAZY);
    if( dlhandle==0 )
      dlhandle=(eusinteger_t)dlopen("libX11.dylib", RTLD_LAZY);
    entry=(eusinteger_t)dlsym(dlhandle, xentry);

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