Fix for nanoX receipe now android build should work.
authorDaniel G <giri@nwrk.biz>
Fri, 1 Feb 2019 03:18:19 +0000 (04:18 +0100)
committerDaniel G <giri@nwrk.biz>
Fri, 1 Feb 2019 03:18:19 +0000 (04:18 +0100)
_template/packages/nanox/Makefile
_template/packages/nanox/config_android_arm
_template/packages/nanox/microwindows-master.zip

index d68b5cb..938d98d 100644 (file)
@@ -33,9 +33,9 @@ android_arm:
        cp $(WORKDIR)/config_android_arm $(WORKDIR)/microwindows-master/src/config
        export PATH=/usr/lib/android-ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/:${PATH}; \
        cd $(WORKDIR)/microwindows-master/src/; \
        cp $(WORKDIR)/config_android_arm $(WORKDIR)/microwindows-master/src/config
        export PATH=/usr/lib/android-ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/:${PATH}; \
        cd $(WORKDIR)/microwindows-master/src/; \
-       sed -i -e 's/CFLAGS=.*/CFLAGS=--sysroot=\/usr\/lib\/android-ndk\/platforms\/android-$(ANDROID_TARGET_VER)\/arch-arm\/ -I..\/..\/..\/..\/..\/include/g' ./Makefile.rules; \
+       sed -i -e 's/CFLAGS=.*/CFLAGS=--sysroot=\/usr\/lib\/android-ndk\/platforms\/android-$(ANDROID_TARGET_VER)\/arch-arm\/ -I..\/..\/..\/..\/..\/include  -DHAVE_SELECT=0/g' ./Makefile.rules; \
        sed -i -e 's/LDFLAGS=.*/LDFLAGS=--sysroot=\/usr\/lib\/android-ndk\/platforms\/android-$(ANDROID_TARGET_VER)\/arch-arm\//g' ./Makefile.rules; \
        sed -i -e 's/LDFLAGS=.*/LDFLAGS=--sysroot=\/usr\/lib\/android-ndk\/platforms\/android-$(ANDROID_TARGET_VER)\/arch-arm\//g' ./Makefile.rules; \
-       make -j4
+       make -j1
        mkdir -p $(WORKDIR)/../../lib/android_arm
        mkdir -p $(WORKDIR)/../../include/nanox
        cp -rf $(WORKDIR)/microwindows-master/src/lib/*.a $(WORKDIR)/../../lib/android_arm
        mkdir -p $(WORKDIR)/../../lib/android_arm
        mkdir -p $(WORKDIR)/../../include/nanox
        cp -rf $(WORKDIR)/microwindows-master/src/lib/*.a $(WORKDIR)/../../lib/android_arm
index 08103f1..61d8527 100644 (file)
@@ -56,7 +56,7 @@ PSPTOOLSPREFIX           = psp-
 ####################################################################
 OPTIMIZE                 = Y
 DEBUG                    = N
 ####################################################################
 OPTIMIZE                 = Y
 DEBUG                    = N
-VERBOSE                  = N
+VERBOSE                  = Y
 THREADSAFE               = N
 GPROF                    = N
 
 THREADSAFE               = N
 GPROF                    = N
 
@@ -262,8 +262,8 @@ UPDATEREGIONS            = Y
 ####################################################################
 
 # X11 and FBE startup screen width, height, (depth for palette mode only)
 ####################################################################
 
 # X11 and FBE startup screen width, height, (depth for palette mode only)
-SCREEN_WIDTH             = 640
-SCREEN_HEIGHT            = 480
+SCREEN_WIDTH             = 1080
+SCREEN_HEIGHT            = 1776
 SCREEN_DEPTH             = 8
 
 # X Window screen driver
 SCREEN_DEPTH             = 8
 
 # X Window screen driver
@@ -288,7 +288,7 @@ SCRNDS                   = N
 
 # allegro drivers
 ALLEGRO4                  = N
 
 # allegro drivers
 ALLEGRO4                  = N
-#SCREEN = ALLEGRO5
+SCREEN = ALLEGRO5
 ALLEGRO5                  = Y
 
 # set VTSWITCH to include virtual terminal switch code
 ALLEGRO5                  = Y
 
 # set VTSWITCH to include virtual terminal switch code
index 2ee9a93..4bce527 100644 (file)
Binary files a/_template/packages/nanox/microwindows-master.zip and b/_template/packages/nanox/microwindows-master.zip differ