X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Flibaltos%2FMakefile;h=fa5127ebc271e3ad755fa48ae6591637f41f7160;hp=7ed45b78dbe239a7fea59e0df1da419d765fe550;hb=669c5f52abb972a82ed6efbee7a8c7d20afb5cd0;hpb=fb8507975c6e081de2e909eca6faaa8f868b609e

diff --git a/ao-tools/libaltos/Makefile b/ao-tools/libaltos/Makefile
index 7ed45b78..fa5127eb 100644
--- a/ao-tools/libaltos/Makefile
+++ b/ao-tools/libaltos/Makefile
@@ -13,13 +13,14 @@ endif
 ifeq ($(OS),Darwin)
 
 DARWIN_CFLAGS=\
-	-I/System/Library/Frameworks/JavaVM.framework/Headers \
-	-I/System/Library/Frameworks/IOKit.framework/Headers \
-	-I/System/Library/Frameworks/CoreFoundation.framework/Headers
+	--sysroot=/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 \
+	-iwithsysroot /System/Library/Frameworks/JavaVM.framework/Headers \
+	-iwithsysroot /System/Library/Frameworks/IOKit.framework/Headers \
+	-iwithsysroot /System/Library/Frameworks/CoreFoundation.framework/Headers
 DARWIN_LIBS=\
 	-framework IOKit -framework CoreFoundation
 
-OS_CFLAGS = $(DARWIN_CFLAGS) -DDARWIN -DPOSIX_TTY
+OS_CFLAGS = $(DARWIN_CFLAGS) -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64
 LIBEXT=dylib
 
 endif
@@ -50,7 +51,7 @@ JAVAFLAGS=-Xlint:unchecked
 all: libaltos.$(LIBEXT) cjnitest $(CLASSFILES)
 
 .java.class:
-	javac -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java
+	javac -encoding UTF8 -classpath "$(CLASSPATH)" $(JAVAFLAGS) $*.java
 
 CFLAGS=$(OS_CFLAGS) -O0 -g -I.
 
@@ -63,10 +64,11 @@ cjnitest: cjnitest.o $(OBJS)
 	cc -o $@ $(CFLAGS) cjnitest.o $(OBJS) $(LIBS)
 
 libaltos.$(LIBEXT): $(OBJS)
-	gcc -shared -o $@ $(CFLAGS) $(OBJS) $(LIBS)
+	gcc -shared $(CFLAGS) -o $@ $(OBJS) $(LIBS)
 
 clean:
-	rm -f $(CLASSFILES) $(OBJS) libaltos.$(LIBEXT) cjnitest
+	rm -f $(CLASSFILES) $(OBJS) libaltos.$(LIBEXT) cjnitest cjnitest.o
+	rm -rf swig_bindings libaltosJNI
 
 $(JNI_FILE): libaltos.i0 $(HEADERS)
 	mkdir -p $(SWIG_DIR)