diff options
| author | Keith Packard <keithp@keithp.com> | 2010-07-26 18:04:10 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-07-26 18:04:10 -0700 |
| commit | b51497597868a40df039dd3ca11b35a6258bbbb3 (patch) | |
| tree | 815d5b8894c9570d34b766eb6bda1b389d97e90d /ao-tools/libaltos/Makefile | |
| parent | e9153c4f2c71ed965822fcfe5112d2bc38506baf (diff) | |
Re-enable Linux support for altosui.
This steals code from cc-usbdev for scanning the USB tree and uses the
same tty code as on Darwin
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'ao-tools/libaltos/Makefile')
| -rw-r--r-- | ao-tools/libaltos/Makefile | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/ao-tools/libaltos/Makefile b/ao-tools/libaltos/Makefile index 5ffbdadf..5cdc0fa7 100644 --- a/ao-tools/libaltos/Makefile +++ b/ao-tools/libaltos/Makefile @@ -1,3 +1,29 @@ +OS:=$(shell uname) + +ifeq ($(OS),Linux) + +JAVA_CFLAGS=-I/usr/lib/jvm/java-6-openjdk/include -I. + +OS_CFLAGS=-DLINUX -DPOSIX_TTY $(JAVA_CFLAGS) + +LIBEXT=so + +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 +DARWIN_LIBS=\ + -framework IOKit -framework CoreFoundation + +OS_CFLAGS = $(DARWIN_CFLAGS) -DDARWIN -DPOSIX_TTY +LIBEXT=dylib + +endif + .SUFFIXES: .java .class CLASSPATH=".:jnitest/*:libaltosJNI:/usr/share/java/*" @@ -14,8 +40,6 @@ JNI_SRCS=$(JNI_FILE) \ $(JNI_DIR)/altos_device.java \ $(JNI_DIR)/libaltos.java -LIBEXT=dylib - JAVAFILES=\ $(JNI_SRCS) @@ -28,14 +52,7 @@ all: libaltos.$(LIBEXT) cjnitest $(CLASSFILES) .java.class: javac -cp "$(CLASSPATH)" $(JAVAFLAGS) $*.java -DARWIN_CFLAGS=\ - -I/System/Library/Frameworks/JavaVM.framework/Headers \ - -I/System/Library/Frameworks/IOKit.framework/Headers \ - -I/System/Library/Frameworks/CoreFoundation.framework/Headers -DARWIN_LIBS=\ - -framework IOKit -framework CoreFoundation - -CFLAGS = $(DARWIN_CFLAGS) -I. -O0 -g +CFLAGS=$(OS_CFLAGS) -O0 -g HEADERS=libaltos.h SRCS = libaltos.c $(SWIG_WRAP) @@ -46,7 +63,7 @@ cjnitest: cjnitest.o $(OBJS) cc -o $@ $(CFLAGS) cjnitest.o $(OBJS) $(LIBS) libaltos.$(LIBEXT): $(OBJS) - gcc -shared -o $@ $(OBJS) $(LIBS) + gcc -shared -o $@ $(CFLAGS) $(OBJS) $(LIBS) clean: rm -f $(CLASSFILES) $(OBJS) libaltos.$(LIBEXT) cjnitest |