Upgrade to new aööegro 5.2.4 version.
authorDaniel G <giri@nwrk.biz>
Tue, 5 Feb 2019 15:50:56 +0000 (16:50 +0100)
committerDaniel G <giri@nwrk.biz>
Tue, 5 Feb 2019 15:50:56 +0000 (16:50 +0100)
_template/Makefile
_template/packages/nanox/microwindows-master.zip
_template/src/Makefile

index b37f8e8..5d439d7 100644 (file)
@@ -17,7 +17,7 @@ freetype:
        make
 
 allegro:
-       cd $(WORKDIR)/packages/allegro5.1.13; \
+       cd $(WORKDIR)/packages/allegro5.2.4; \
        make
 
 nanox:
@@ -68,7 +68,7 @@ clean_freetype:
        make clean
 
 clean_allegro:
-       cd $(WORKDIR)/packages/allegro5.1.13; \
+       cd $(WORKDIR)/packages/allegro5.2.4; \
        make clean
 
 clean_nanox:
index df125aa..935dfbc 100644 (file)
Binary files a/_template/packages/nanox/microwindows-master.zip and b/_template/packages/nanox/microwindows-master.zip differ
index 63c843d..ae9b9b5 100644 (file)
@@ -119,7 +119,7 @@ LIBDIR_ANDROID += -L$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(ANDRO
 CFLAGS_ANDROID  = $(CFLAGS) --sysroot=$(ANDROID_NDK_ROOT)/platforms/$(ANDROID_PLATORM)/arch-$(ANDROID_ARCH) -D_ANDROID
 RESINC_ANDROID = assets
 LDFLAGS_ANDROID  =  $(LDFLAGS) -shared --sysroot=$(ANDROID_NDK_ROOT)/platforms/$(ANDROID_PLATORM)/arch-$(ANDROID_ARCH)
-LIB_ANDROID  = $(LIB) -lc++ -lNX11 -lnano-X -lfreetype -lm -Wl,-Bdynamic -lallegro
+LIB_ANDROID  = $(LIB) -lc++ -lNX11 -lnano-X -lfreetype -lm -Wl,-Bdynamic -lallegro -lz
 RESLIST_ANDROID=$(shell find $(RESINC_ANDROID) -type f -follow)
 
 ###################################