projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libaltos: Add Windows BT support. Split into separate source files.
[fw/altos]
/
libaltos
/
Makefile-standalone
diff --git
a/libaltos/Makefile-standalone
b/libaltos/Makefile-standalone
index a1f9f5bc27d5568f76bc9aff7079ca52b15e10d0..9a44b8e079a286e052ac676c3b9fe6bc869ad601 100644
(file)
--- a/
libaltos/Makefile-standalone
+++ b/
libaltos/Makefile-standalone
@@
-5,9
+5,11
@@
OS:=$(shell uname)
#
ifeq ($(OS),Linux)
#
ifeq ($(OS),Linux)
-JAVA_CFLAGS=-I/usr/lib/jvm/java-6-openjdk/include
+OS_SRCS=libaltos_posix.c libaltos_linux.c
-OS_LIB_CFLAGS=-DLINUX -DPOSIX_TTY $(JAVA_CFLAGS)
+JAVA_CFLAGS=-I/usr/lib/jvm/default-java/include -I/usr/lib/jvm/default-java/include/linux
+
+OS_LIB_CFLAGS=-DLINUX -DPOSIX_TTY $(JAVA_CFLAGS) -shared -fPIC
OS_APP_CFLAGS=$(OS_LIB_CFLAGS)
OS_APP_CFLAGS=$(OS_LIB_CFLAGS)
@@
-22,6
+24,8
@@
endif
#
ifeq ($(OS),Darwin)
#
ifeq ($(OS),Darwin)
+OS_SRCS=libaltos_posix.c libaltos_darwin.c
+
#OS_LIB_CFLAGS=\
# -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 \
# --sysroot=/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 \
#OS_LIB_CFLAGS=\
# -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 \
# --sysroot=/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 \
@@
-54,6
+58,8
@@
endif
#
ifneq (,$(findstring MINGW,$(OS)))
#
ifneq (,$(findstring MINGW,$(OS)))
+OS_SRCS=libaltos_windows.c
+
CC=gcc
OS_LIB_CFLAGS = -DWINDOWS -mconsole -DBUILD_DLL
CC=gcc
OS_LIB_CFLAGS = -DWINDOWS -mconsole -DBUILD_DLL
@@
-103,7
+109,7
@@
CFLAGS=$(OS_LIB_CFLAGS) -O -I.
LDFLAGS=$(OS_LDFLAGS)
HEADERS=libaltos.h
LDFLAGS=$(OS_LDFLAGS)
HEADERS=libaltos.h
-SRCS = libaltos
.c
$(SWIG_WRAP)
+SRCS = libaltos
_common.c $(OS_SRCS)
$(SWIG_WRAP)
OBJS = $(SRCS:%.c=%.o)
LIBS = $(DARWIN_LIBS)
OBJS = $(SRCS:%.c=%.o)
LIBS = $(DARWIN_LIBS)
@@
-111,7
+117,7
@@
$(CJNITEST): cjnitest.c $(LIBNAME)
$(CC) -o $@ $(OS_APP_CFLAGS) cjnitest.c $(LIBNAME) $(LIBS) $(LDFLAGS)
$(LIBNAME): $(OBJS)
$(CC) -o $@ $(OS_APP_CFLAGS) cjnitest.c $(LIBNAME) $(LIBS) $(LDFLAGS)
$(LIBNAME): $(OBJS)
- $(CC) -shared $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(LDFLAGS)
+ $(CC) -shared
-fPIC
$(CFLAGS) -o $@ $(OBJS) $(LIBS) $(LDFLAGS)
clean:
rm -f $(CLASSFILES) $(OBJS) $(LIBNAME) $(CJNITEST) cjnitest.o
clean:
rm -f $(CLASSFILES) $(OBJS) $(LIBNAME) $(CJNITEST) cjnitest.o