X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Flibaltos%2FMakefile;h=0bbd304c741587693337b92112497ad73c5eee72;hp=5cdc0fa7f779a29d908eed9d6ad51134ea8d5809;hb=a58c44cd904e5429b807e5c23913051ed6484edc;hpb=b51497597868a40df039dd3ca11b35a6258bbbb3

diff --git a/ao-tools/libaltos/Makefile b/ao-tools/libaltos/Makefile
index 5cdc0fa7..0bbd304c 100644
--- a/ao-tools/libaltos/Makefile
+++ b/ao-tools/libaltos/Makefile
@@ -2,7 +2,7 @@ OS:=$(shell uname)
 
 ifeq ($(OS),Linux)
 
-JAVA_CFLAGS=-I/usr/lib/jvm/java-6-openjdk/include -I.
+JAVA_CFLAGS=-I/usr/lib/jvm/java-6-openjdk/include
 
 OS_CFLAGS=-DLINUX -DPOSIX_TTY $(JAVA_CFLAGS)
 
@@ -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
@@ -52,7 +53,7 @@ all: libaltos.$(LIBEXT) cjnitest $(CLASSFILES)
 .java.class:
 	javac -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java
 
-CFLAGS=$(OS_CFLAGS) -O0 -g
+CFLAGS=$(OS_CFLAGS) -O0 -g -I.
 
 HEADERS=libaltos.h
 SRCS = libaltos.c $(SWIG_WRAP)
@@ -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)