diff --git i/jni/mdxmini/Makefile w/jni/mdxmini/Makefile index 9b63041..53bc547 100644 --- i/jni/mdxmini/Makefile +++ w/jni/mdxmini/Makefile @@ -73,10 +73,9 @@ $(TARGET) : $(OBJS) $(LIB) $(LIB): $(MKLIB) $(MKLIB): - make -f Makefile.lib + $(MAKE) -f Makefile.lib -$(OBJDIR)/nlg.o: src/nlg.c - $(CC) -o $@ $< -c $(CFLAGS) +$(OBJDIR)/nlg.o: src/nlg.c $(MKLIB) $(OBJDIR)/sdlplay.o: sdlplay.c $(CC) -o $@ $< -c $(CFLAGS) diff --git i/jni/mdxmini/mak/general.mak w/jni/mdxmini/mak/general.mak index e56323b..51872ec 100644 --- i/jni/mdxmini/mak/general.mak +++ w/jni/mdxmini/mak/general.mak @@ -10,17 +10,16 @@ SLIBS = LFLAGS = ifdef DEBUG -CFLAGS = -g -O0 +CFLAGS ?= -g -O0 OBJDIR = obj_dbg else -CFLAGS = -g -O3 +CFLAGS ?= -g -O3 OBJDIR = obj endif # iconv ifneq ($(OS),Windows_NT) -CFLAGS += -DUSE_ICONV -LIBS += -liconv +LIBS += -lm endif # diff --git i/jni/mdxmini/mak/lib.mak w/jni/mdxmini/mak/lib.mak index 38af592..c24a1af 100644 --- i/jni/mdxmini/mak/lib.mak +++ w/jni/mdxmini/mak/lib.mak @@ -3,13 +3,13 @@ LIB = $(OBJDIR)/libmdxmini.a OBJFILES = mdxmini.o mdx2151.o mdxmml_ym2151.o OBJFILES += pdxfile.o mdxfile.o pcm8.o ym2151.o nlg.o -CFLAGS += -DUSE_NLG -I. +CFLAGS += -DUSE_NLG -I. -fPIC SRCDIR = src OBJS = $(addprefix $(OBJDIR)/,$(OBJFILES)) -all : $(OBJDIR) $(LIB) +all : $(OBJDIR) $(LIB) $(OBJDIR)/libmdxmini.so $(OBJDIR) : mkdir $(OBJDIR) @@ -17,5 +17,8 @@ $(OBJDIR) : $(LIB) : $(OBJS) $(AR) rcs $@ $(OBJS) +$(OBJDIR)/libmdxmini.so : $(OBJS) + $(CC) $(CFLAGS) -Wl,-Bsymbolic -shared -o $@ $^ $(LIBS) + $(OBJDIR)/%.o : $(SRCDIR)/%.c $(CC) $(CFLAGS) -o $@ $< -c