Handle some stuff a little bit neater. (i.e. setting android target version)

[fltk_mvc_template.git] / _template / src / Makefile

diff --git a/_template/src/Makefile b/_template/src/Makefile
index fd988ef..60886fb 100644 (file)
--- a/_template/src/Makefile
+++ b/_template/src/Makefile
@@ -44,10 +44,10 @@ WINDRES_LINUXARM =
 
 INC_LINUXARM = $(INC)
 LIBDIR_LINUXARM = -L$(WORKDIR)/../lib/linux_arm
-CFLAGS_LINUXARM = $(CFLAGS) -fPIC
+CFLAGS_LINUXARM = $(CFLAGS)
 RESINC_LINUXARM =
 LDFLAGS_LINUXARM = $(LDFLAGS)
-LIB_LINUXARM = $(LIB) -lm -lX11 -lxcb -lXau -lXdmcp -Wl,-Bdynamic -lpthread -lrt -ldl
+LIB_LINUXARM = $(LIB) -lm -Wl,-Bdynamic -lX11 -lxcb -lXau -lXdmcp -lpthread -lrt -ldl
 
 ###################################
 #MinGW | EDIT 4/14
@@ -428,7 +428,7 @@ before_android_apk:
        test -d $(CLASSDIR_ANDROID) || mkdir -p $(CLASSDIR_ANDROID)
        test -d $(ANDROID_SRC)/res/mipmap-hdpi || mkdir -p $(ANDROID_SRC)/res/mipmap-hdpi
        test -d $(ANDROID_SRC)/java/liballeg || mkdir -p $(ANDROID_SRC)/java/liballeg
-       cp $(WORKDIR)/../lib/android_arm/liballeg/* $(ANDROID_SRC)/java/liballeg
+       cp -r $(WORKDIR)/../lib/android_arm/liballeg/* $(ANDROID_SRC)/java/liballeg
        cp $(WORKDIR)/../lib/android_arm/liballegro.so $(ANDROID_SRC)/lib/$(ANDROID_ARCH_VER)/
        cp $(WORKDIR)/Icon.png $(ANDROID_SRC)/res/mipmap-hdpi/ic_launcher.png
        $(AAPT) package -f -m -J $(GENDIR_ANDROID) -M $(ANDROID_SRC)/AndroidManifest.xml -S $(ANDROID_SRC)/res -I $(ANDROID_CP)