altos/easymega-v2.0: Change binary to easymega-v2.0 instead of easymega-v1.0

[fw/altos] / libaltos / Makefile-standalone

diff --git a/libaltos/Makefile-standalone b/libaltos/Makefile-standalone
index 4e438050435da162cd5f0764cf2c09b2030fefed..1430aacb2fb07cdd65d1be3a56ececd3096edb8e 100644 (file)
--- a/libaltos/Makefile-standalone
+++ b/libaltos/Makefile-standalone
@@ -5,9 +5,11 @@ OS:=$(shell uname)
 #
 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)
 
@@ -22,13 +24,26 @@ endif
 #
 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 \
+#      -iwithsysroot /System/Library/Frameworks/JavaVM.framework/Headers \
+#      -iwithsysroot /System/Library/Frameworks/IOKit.framework/Headers \
+#      -iwithsysroot /System/Library/Frameworks/CoreFoundation.framework/Headers
+
+XCODE=/Applications/Xcode-beta.app
+SDK=$(XCODE)/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk
+MINVERSION=10.5
+
 OS_LIB_CFLAGS=\
-       -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 \
-       --sysroot=/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 \
+       -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 -isysroot $(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
-OS_APP_CFLAGS=$(OS_LIB_CFLAGS)
+OS_APP_CFLAGS=$(OS_LIB_CFLAGS) -O0 -g
 
 OS_LDFLAGS =\
        -framework IOKit -framework CoreFoundation
@@ -43,6 +58,8 @@ endif
 #
 ifneq (,$(findstring MINGW,$(OS)))
 
+OS_SRCS=libaltos_windows.c
+
 CC=gcc
 
 OS_LIB_CFLAGS = -DWINDOWS -mconsole -DBUILD_DLL
@@ -92,7 +109,7 @@ CFLAGS=$(OS_LIB_CFLAGS) -O -I.
 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)
 
@@ -100,7 +117,7 @@ $(CJNITEST): cjnitest.c $(LIBNAME)
        $(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