Seperate dependent package include files for different architectures. Speed up build.
authorDaniel G <giri@nwrk.biz>
Mon, 4 Feb 2019 16:16:13 +0000 (17:16 +0100)
committerDaniel G <giri@nwrk.biz>
Mon, 4 Feb 2019 16:16:13 +0000 (17:16 +0100)
19 files changed:
_template/.gitignore
_template/Makefile
_template/include/.gitignore [deleted file]
_template/packages/allegro5.1.13/Makefile
_template/packages/allegro5.2.4/Makefile
_template/packages/allegro5.2.4/setenv.sh
_template/packages/allegro5.2.4/setenv64.sh [deleted file]
_template/packages/boost1.68.0/Makefile
_template/packages/fltk1.3.4/Makefile
_template/packages/freetype2.9.1/Makefile
_template/packages/googletest1.8.1/Makefile
_template/packages/libao1.2.2/Makefile
_template/packages/libsndfile1.0.28/Makefile
_template/packages/nanox/Makefile
_template/packages/nanox/config_android_arm
_template/packages/nanox/microwindows-master.zip
_template/packages/tinyalsa1.0.2/Makefile
_template/packages/tinyxml2/Makefile
_template/src/Makefile

index c3af857..167a3d7 100644 (file)
@@ -1 +1,2 @@
 lib/
+lib_include/
\ No newline at end of file
index 9a43bfd..b37f8e8 100644 (file)
@@ -114,8 +114,7 @@ clean__template:
 clean_lib:
        rm -rf $(WORKDIR)/lib/
        rm -rf $(WORKDIR)/tools/
-       find $(WORKDIR)/include/ ! -name 'json.h' ! -name '.gitignore' -type f -exec rm -f {} +
-       find $(WORKDIR)/include/ -maxdepth 1 -mindepth 1 -type d -exec rm -rf '{}' \;
+       rm -rf $(WORKDIR)/lib_include/
 
 ### Create packages
 linux32_package:
@@ -156,4 +155,4 @@ android_package:
        mkdir -p $(WORKDIR)/install_package/
        cp $(WORKDIR)/src/bin/Android/_template.apk $(WORKDIR)/install_package/install__template_android.apk
 
-clean: clean_lib clean__template clean_fltk  clean_tinyxml clean_allegro clean_nanox clean_freetype clean_libsndfile clean_libao clean_boost clean_gtest clean_tinyalsa clean_alsa
+clean: clean_lib clean__template clean_fltk  clean_tinyxml clean_allegro clean_nanox clean_freetype clean_libsndfile clean_libao clean_boost clean_gtest clean_tinyalsa
diff --git a/_template/include/.gitignore b/_template/include/.gitignore
deleted file mode 100644 (file)
index 9bc88e1..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-# Ignore everything
-*
-
-# But not these files...
-!.gitignore
-!json.h
index 09caae4..c7ddee4 100644 (file)
@@ -22,24 +22,24 @@ android_arm:
        mkdir -p ./buildandroid; \
        cd ./buildandroid; \
        cmake ..  -DANDROID_NDK_TOOLCHAIN_ROOT=../android_toolchain -DWANT_ANDROID=on \
-       -DWANT_TTF=ON -DFREETYPE_INCLUDE_DIRS=$(WORKDIR)/../../include/ -DFREETYPE_LIBRARY=$(WORKDIR)/../../lib/android_arm/libfreetype.a \
+       -DWANT_TTF=ON -DFREETYPE_INCLUDE_DIRS=$(WORKDIR)/../../lib_include/android_arm -DFREETYPE_LIBRARY=$(WORKDIR)/../../lib/android_arm/libfreetype.a \
        -DCMAKE_BUILD_TYPE=Release -DANDROID_TARGET=android-$(ANDROID_TARGET_VER) -DARM_TARGETS=armeabi-v7a \
        -DSHARED=true -DWANT_MONOLITH=ON -DWANT_EXAMPLES=false -DWANT_DEMO=false  -DWANT_TESTS=false; \
-       make -j4 -i
-       mkdir -p $(WORKDIR)/../../include
+       make -j6 -i
+       mkdir -p $(WORKDIR)/../../lib_include/android_arm
        mkdir -p $(WORKDIR)/../../lib/android_arm
        mkdir -p $(WORKDIR)/../../lib/android_arm/liballeg
-       cp -rf $(WORKDIR)/allegro-5.1.13.1/include/* $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/allegro-5.1.13.1/include/* $(WORKDIR)/../../lib_include/android_arm
        cp -rf $(WORKDIR)/allegro-5.1.13.1/android/allegro_activity/src/* $(WORKDIR)/../../lib/android_arm/liballeg
-       cp -rf $(WORKDIR)/allegro-5.1.13.1/buildandroid/include/* $(WORKDIR)/../../include
-       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/acodec/allegro5/* $(WORKDIR)/../../include/allegro5
-       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/audio/allegro5/* $(WORKDIR)/../../include/allegro5
-       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/color/allegro5/* $(WORKDIR)/../../include/allegro5
-       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/font/allegro5/* $(WORKDIR)/../../include/allegro5
-       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/image/allegro5/* $(WORKDIR)/../../include/allegro5
-       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/memfile/allegro5/* $(WORKDIR)/../../include/allegro5
-       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/primitives/allegro5/* $(WORKDIR)/../../include/allegro5
-       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/ttf/allegro5/* $(WORKDIR)/../../include/allegro5
+       cp -rf $(WORKDIR)/allegro-5.1.13.1/buildandroid/include/* $(WORKDIR)/../../lib_include/android_arm
+       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/acodec/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
+       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/audio/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
+       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/color/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
+       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/font/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
+       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/image/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
+       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/memfile/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
+       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/primitives/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
+       cp -rf $(WORKDIR)/allegro-5.1.13.1/addons/ttf/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
        rename "s/_monolith//g" $(WORKDIR)/allegro-5.1.13.1/buildandroid/lib/*.so
        cp -rf $(WORKDIR)/allegro-5.1.13.1/buildandroid/lib/*.so $(WORKDIR)/../../lib/android_arm
 
index 5d09ec8..5ffd3af 100644 (file)
@@ -5,6 +5,7 @@
 # Description: Universal Makefile for Unix based Operating Systems
 ############################################################################
 WORKDIR = $(shell pwd)
+ANDROID_TARGET_VER=23
 
 all: unpack android_arm
 
@@ -12,8 +13,8 @@ all: unpack android_arm
 unpack:
        tar xvzf allegro-5.2.4.0.tar.gz
        find $(WORKDIR)/allegro-5.2.4.0 -name build.gradle -exec sed -i -e '/compileSdkVersion.*/a buildToolsVersion "25.0.0"' {} \;
-       find $(WORKDIR)/allegro-5.2.4.0 -name build.gradle -exec sed -i -e 's/compileSdkVersion.*/compileSdkVersion 23/g' {} \;
-       find $(WORKDIR)/allegro-5.2.4.0 -name build.gradle -exec sed -i -e 's/targetSdkVersion.*/targetSdkVersion 23/g' {} \;
+       find $(WORKDIR)/allegro-5.2.4.0 -name build.gradle -exec sed -i -e 's/compileSdkVersion.*/compileSdkVersion $(ANDROID_TARGET_VER)/g' {} \;
+       find $(WORKDIR)/allegro-5.2.4.0 -name build.gradle -exec sed -i -e 's/targetSdkVersion.*/targetSdkVersion $(ANDROID_TARGET_VER)/g' {} \;
        sed -i -e 's/classpath "com.android.tools.build:gradle:.*/classpath "com.android.tools.build:gradle:2.3.3"/g' $(WORKDIR)/allegro-5.2.4.0/android/gradle_project/build.gradle
        sed -i -e '/google()/a maven { url "file:\/\/\/usr\/share\/maven-repo" }' $(WORKDIR)/allegro-5.2.4.0/android/gradle_project/build.gradle
 
@@ -24,32 +25,27 @@ android_arm:
        . $(WORKDIR)/setenv.sh && \
        mkdir -p ./buildandroid; \
        cd ./buildandroid; \
-       cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-android.cmake -DCMAKE_BUILD_TYPE=Release -DANDROID_TARGET=android-23 -DARM_TARGETS=armeabi-v7a -DWANT_MONOLITH=ON -DSHARED=false -DWANT_EXAMPLES=false -DWANT_DEMO=false  -DWANT_TESTS=false; \
+       cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-android.cmake \
+       -DANDROID_NDK_TOOLCHAIN_ROOT=../android_toolchain -DWANT_ANDROID=on \
+       -DWANT_TTF=ON -DFREETYPE_INCLUDE_DIRS=$(WORKDIR)/../../lib_include/android_arm -DFREETYPE_LIBRARY=$(WORKDIR)/../../lib/android_arm/libfreetype.a \
+       -DCMAKE_BUILD_TYPE=Release -DANDROID_TARGET=android-$(ANDROID_TARGET_VER) -DARM_TARGETS=armeabi-v7a \
+       -DSHARED=true -DWANT_MONOLITH=ON -DWANT_EXAMPLES=false -DWANT_DEMO=false  -DWANT_TESTS=false; \
        make -j6
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/android_arm
        mkdir -p $(WORKDIR)/../../lib/android_arm
-       cp -rf $(WORKDIR)/allegro-5.2.4.0/include/* $(WORKDIR)/../../include
        cp -rf $(WORKDIR)/allegro-5.2.4.0/android/gradle_project/allegro/src/main/java/org/* $(WORKDIR)/../../lib/android_arm
-       cp -rf $(WORKDIR)/allegro-5.2.4.0/buildandroid/include/* $(WORKDIR)/../../include
-       rename "s/monolith-static//g" $(WORKDIR)/allegro-5.2.4.0/buildandroid/lib/*.a
-       cp -rf $(WORKDIR)/allegro-5.2.4.0/buildandroid/lib/*.a $(WORKDIR)/../../lib/android_arm
-
-.PHONY: android_arm64
-android_arm64:
-       cd $(WORKDIR)/allegro-5.2.4.0; \
-       set -e; \
-       . $(WORKDIR)/setenv64.sh && \
-       mkdir -p ./buildandroid64; \
-       cd ./buildandroid64; \
-       cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-android.cmake -DCMAKE_BUILD_TYPE=Release -DANDROID_TARGET=android-23 -DARM_TARGETS=arm64-v8a -DWANT_MONOLITH=ON -DSHARED=false  -DWANT_EXAMPLES=false -DWANT_DEMO=false  -DWANT_TESTS=false; \
-       make -j6
-       mkdir -p $(WORKDIR)/../../include
-       mkdir -p $(WORKDIR)/../../lib/android_arm64
-       cp -rf $(WORKDIR)/allegro-5.2.4.0/include/* $(WORKDIR)/../../include
-       cp -rf $(WORKDIR)/allegro-5.2.4.0/android/gradle_project/allegro/src/main/java/org/* $(WORKDIR)/../../lib/android_arm
-       cp -rf $(WORKDIR)/allegro-5.2.4.0/buildandroid64/include/* $(WORKDIR)/../../include
-       rename "s/monolith-static//g" $(WORKDIR)/allegro-5.2.4.0/buildandroid64/lib/*.a
-       cp -rf $(WORKDIR)/allegro-5.2.4.0/buildandroid64/lib/*.a $(WORKDIR)/../../lib/android_arm64
+       cp -rf $(WORKDIR)/allegro-5.2.4.0/buildandroid/include/* $(WORKDIR)/../../lib_include/android_arm
+       cp -rf $(WORKDIR)/allegro-5.2.4.0/include/* $(WORKDIR)/../../lib_include/android_arm
+       cp -rf $(WORKDIR)/allegro-5.2.4.0/addons/acodec/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
+       cp -rf $(WORKDIR)/allegro-5.2.4.0/addons/audio/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
+       cp -rf $(WORKDIR)/allegro-5.2.4.0/addons/color/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
+       cp -rf $(WORKDIR)/allegro-5.2.4.0/addons/font/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
+       cp -rf $(WORKDIR)/allegro-5.2.4.0/addons/image/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
+       cp -rf $(WORKDIR)/allegro-5.2.4.0/addons/memfile/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
+       cp -rf $(WORKDIR)/allegro-5.2.4.0/addons/primitives/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
+       cp -rf $(WORKDIR)/allegro-5.2.4.0/addons/ttf/allegro5/* $(WORKDIR)/../../lib_include/android_arm/allegro5
+       rename "s/_monolith//g" $(WORKDIR)/allegro-5.2.4.0/buildandroid/lib/*.so
+       cp -rf $(WORKDIR)/allegro-5.2.4.0/buildandroid/lib/*.so $(WORKDIR)/../../lib/android_arm
 
 .PHONY: clean
 clean:
index c40c6a2..f309eca 100755 (executable)
@@ -1,8 +1,16 @@
+#!/bin/sh
 WORKDIR=$(pwd)
 #git clone https://github.com/mherod/android-sdk-licenses.git
 #sudo cp -a $WORKDIR/android-sdk-licenses/*-license /usr/lib/android-sdk/licenses
-/usr/lib/android-ndk/build/tools/make_standalone_toolchain.py --api=21 --install-dir=$WORKDIR/android_toolchain --arch=arm
+/usr/lib/android-ndk/build/tools/make_standalone_toolchain.py --api=23 --install-dir=$WORKDIR/android_toolchain --stl=stlport --force --arch=arm
 export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64/
 export ANDROID_HOME=/usr/lib/android-sdk/
 export ANDROID_NDK_HOME=/usr/lib/android-ndk/
+export ANDROID_SDK_HOME=/usr/lib/android-sdk/
+export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME
 export ANDROID_NDK_TOOLCHAIN_ROOT=$WORKDIR/android_toolchain/
+
+# expand path
+export PATH=$PATH:$ANDROID_NDK_HOME
+export PATH=$PATH:$ANDROID_SDK_HOME/tools
+export PATH=$PATH:$ANDROID_NDK_TOOLCHAIN_ROOT/bin
diff --git a/_template/packages/allegro5.2.4/setenv64.sh b/_template/packages/allegro5.2.4/setenv64.sh
deleted file mode 100755 (executable)
index bccd770..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-WORKDIR=$(pwd)
-#git clone https://github.com/mherod/android-sdk-licenses.git
-#sudo cp -a $WORKDIR/android-sdk-licenses/*-license /usr/lib/android-sdk/licenses
-/usr/lib/android-ndk/build/tools/make_standalone_toolchain.py --api=21 --install-dir=$WORKDIR/android_toolchain64 --arch=arm64
-export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64/
-export ANDROID_HOME=/usr/lib/android-sdk/
-export ANDROID_NDK_HOME=/usr/lib/android-ndk/
-export ANDROID_NDK_TOOLCHAIN_ROOT=$WORKDIR/android_toolchain64/
index fb27ba3..8b73283 100644 (file)
@@ -27,20 +27,20 @@ windows:
        ./bootstrap.sh; \
        ./b2 --clean; \
        ./b2 --user-config="user-config.jam" cflags="-m32 -mwindows" cxxflags="-m32 -mwindows" linkflags="-m32 -static-libgcc -static-libstdc++"  address-model=32 toolset=gcc-mingw link=static target-os=windows runtime-link=static variant=release $(MODULES)
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/mingw32
        mkdir -p $(WORKDIR)/../../lib/mingw32
-       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../include
-       cp -r  $(WORKDIR)/boost_1_68_0/stage/lib/* ../../lib/mingw32/
+       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../lib_include/mingw32
+       cp -r  $(WORKDIR)/boost_1_68_0/stage/lib/* ../../lib/mingw32
 
 linux32:
        cd $(WORKDIR)/boost_1_68_0; \
        ./bootstrap.sh; \
        ./b2 --clean; \
        ./b2 cflags="-m32" cxxflags="-m32" linkflags="-m32 -static-libgcc -static-libstdc++" address-model=32 link=static runtime-link=static variant=release $(MODULES)
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/linux32
        mkdir -p $(WORKDIR)/../../lib/linux32
-       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../include
-       cp -r  $(WORKDIR)/boost_1_68_0/stage/lib/* ../../lib/linux32/
+       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../lib_include/linux32
+       cp -r  $(WORKDIR)/boost_1_68_0/stage/lib/* ../../lib/linux32
 
 linux_arm:
        echo "using gcc : arm : arm-linux-gnueabihf-g++ ;" > $(WORKDIR)/boost_1_68_0/user-config.jam
@@ -48,10 +48,10 @@ linux_arm:
        ./bootstrap.sh; \
        ./b2 --clean; \
        ./b2 --user-config="user-config.jam" linkflags="-static-libgcc -static-libstdc++" address-model=32 toolset=gcc-arm link=static runtime-link=static variant=release $(MODULES)
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/linux_arm
        mkdir -p $(WORKDIR)/../../lib/linux_arm
-       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../include
-       cp -r  $(WORKDIR)/boost_1_68_0/stage/lib/* ../../lib/linux_arm/
+       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../lib_include/linux_arm
+       cp -r  $(WORKDIR)/boost_1_68_0/stage/lib/* ../../lib/linux_arm
 
 android_arm:
        echo "using gcc : arm : arm-linux-androideabi-g++ ;" > $(WORKDIR)/boost_1_68_0/user-config.jam
@@ -62,10 +62,10 @@ android_arm:
        cxxflags="--sysroot=$(ANDROID_NDK_HOME)/platforms/android-23/arch-arm -I$(ANDROID_NDK_HOME)/sources/cxx-stl/llvm-libc++/libcxx/include -I$(ANDROID_NDK_HOME)/sources/android/support/include" \
        linkflags="--sysroot=$(ANDROID_NDK_HOME)/platforms/android-23/arch-arm -static-libgcc -static-libstdc++" \
        address-model=32 toolset=gcc-arm link=static runtime-link=static variant=release $(MODULES)
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/android_arm
        mkdir -p $(WORKDIR)/../../lib/android_arm
-       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../include
-       cp -r  $(WORKDIR)/boost_1_68_0/stage/lib/* ../../lib/android_arm/
+       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../lib_include/android_arm
+       cp -r  $(WORKDIR)/boost_1_68_0/stage/lib/* ../../lib/android_arm
 
 clean:
        rm -rf $(WORKDIR)/boost_1_68_0
index 9b597dd..a151351 100644 (file)
@@ -14,74 +14,86 @@ all: unpack windows linux32 linux_arm android_arm
 .PHONY: unpack
 unpack:
        tar xvzf fltk-1.3.4-1-source.tar.gz
-       mkdir -p $(WORKDIR)/../../include/X11
-       cp /usr/include/X11/Xmd.h ../../include/X11/
-       cp /usr/include/X11/cursorfont.h ../../include/X11/
 
 .PHONY: windows
 windows:
+       mkdir -p $(WORKDIR)/../../lib_include/mingw32/X11
+       cp /usr/include/X11/Xmd.h ../../lib_include/mingw32/X11/
+       cp /usr/include/X11/cursorfont.h ../../lib_include/mingw32/X11/
        cd $(WORKDIR)/fltk-1.3.4-1; \
        make clean; \
        ./configure CFLAGS="-m32 -mwindows" CXXFLAGS="-m32 -mwindows" LDFLAGS="-m32 -static -static-libgcc -static-libstdc++ -lpthread"  --enable-static --host=i686-w64-mingw32 --enable-cygwin --enable-localjpeg --enable-localzlib --enable-localpng --disable-xcursor --disable-xinerama --disable-xft --disable-xdbe --disable-xrender --disable-xfixes; \
-       make -j4
-       mkdir -p $(WORKDIR)/../../include
+       make -j6
+       mkdir -p $(WORKDIR)/../../lib_include/mingw32
        mkdir -p $(WORKDIR)/../../lib/mingw32
-       cp -rf $(WORKDIR)/fltk-1.3.4-1/FL $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/fltk-1.3.4-1/FL $(WORKDIR)/../../lib_include/mingw32
        cp -rf $(WORKDIR)/fltk-1.3.4-1/lib/*.a $(WORKDIR)/../../lib/mingw32
 
 .PHONY: linux32
 linux32:
+       mkdir -p $(WORKDIR)/../../lib_include/linux32/X11
+       cp /usr/include/X11/Xmd.h ../../lib_include/linux32/X11/
+       cp /usr/include/X11/cursorfont.h ../../lib_include/linux32/X11/
        cd $(WORKDIR)/fltk-1.3.4-1; \
        make clean; \
        ./configure CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32 -static-libgcc -static-libstdc++" --enable-static --enable-localjpeg --enable-localzlib --enable-localpng --disable-xcursor --disable-xinerama --disable-xft --disable-xdbe --disable-xrender --disable-xfixes; \
-       make -j4
-       mkdir -p $(WORKDIR)/../../include
+       make -j6
+       mkdir -p $(WORKDIR)/../../lib_include/linux32
        mkdir -p $(WORKDIR)/../../lib/linux32
        mkdir -p $(WORKDIR)/../../tools
-       cp -rf $(WORKDIR)/fltk-1.3.4-1/FL $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/fltk-1.3.4-1/FL $(WORKDIR)/../../lib_include/linux32
        cp -rf $(WORKDIR)/fltk-1.3.4-1/lib/*.a $(WORKDIR)/../../lib/linux32
        cp -rf $(WORKDIR)/fltk-1.3.4-1/fluid/fluid $(WORKDIR)/../../tools
 
 .PHONY: linux_arm
 linux_arm:
+       mkdir -p $(WORKDIR)/../../lib_include/linux_arm/X11
+       cp /usr/include/X11/Xmd.h ../../lib_include/linux_arm/X11/
+       cp /usr/include/X11/cursorfont.h ../../lib_include/linux_arm/X11/
        cd $(WORKDIR)/fltk-1.3.4-1; \
        make clean; \
        ./configure CFLAGS="" CXXFLAGS="" LDFLAGS="-static-libgcc -static-libstdc++" --host=arm-linux-gnueabihf  --enable-static --enable-localjpeg --enable-localzlib --enable-localpng --disable-xcursor --disable-xinerama --disable-xft --disable-xdbe --disable-xrender --disable-xfixes; \
-       make -j4
-       mkdir -p $(WORKDIR)/../../include
+       make -j6
+       mkdir -p $(WORKDIR)/../../lib_include/linux_arm
        mkdir -p $(WORKDIR)/../../lib/linux_arm
-       cp -rf $(WORKDIR)/fltk-1.3.4-1/FL $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/fltk-1.3.4-1/FL $(WORKDIR)/../../lib_include/linux_arm
        cp -rf $(WORKDIR)/fltk-1.3.4-1/lib/*.a $(WORKDIR)/../../lib/linux_arm
 
 .PHONY: linux_nanox
 linux_nanox:
+       mkdir -p $(WORKDIR)/../../lib_include/linux32/X11
+       cp /usr/include/X11/Xmd.h ../../lib_include/linux32/X11/
+       cp /usr/include/X11/cursorfont.h ../../lib_include/linux32/X11/
        cd $(WORKDIR)/fltk-1.3.4-1; \
        make clean; \
-       ./configure CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32 -static-libgcc -static-libstdc++" --enable-static --x-includes=../../../../include/  --x-libraries=../../../../lib/linux32 --enable-localjpeg --enable-localzlib --enable-localpng --disable-gl --disable-xinerama --disable-xft --disable-xdbe --disable-xfixes --disable-xcursor --disable-xrender; \
+       ./configure CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32 -static-libgcc -static-libstdc++" --enable-static --x-includes=../../../../lib_include/linux32  --x-libraries=../../../../lib/linux32 --enable-localjpeg --enable-localzlib --enable-localpng --disable-gl --disable-xinerama --disable-xft --disable-xdbe --disable-xfixes --disable-xcursor --disable-xrender; \
        sed -i -e 's/-lX11/-lNX11 -lnano-X/g' ./makeinclude; \
        sed -i -e 's/-lX11/-lNX11 -lnano-X/g' ./fltk-config; \
        sed -i -e '/#define USE_XRANDR/ a #undef USE_XRANDR' ./src/Fl_x.cxx; \
        sed -i -e '/#define USE_XRANDR/ a #undef USE_XRANDR' ./src/screen_xywh.cxx; \
-       make -k -j4
-       mkdir -p $(WORKDIR)/../../include
+       make -k -j6
+       mkdir -p $(WORKDIR)/../../lib_include/linux32
        mkdir -p $(WORKDIR)/../../lib/linux32
-       cp -rf $(WORKDIR)/fltk-1.3.4-1/FL $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/fltk-1.3.4-1/FL $(WORKDIR)/../../lib_include/linux32
        cp -rf $(WORKDIR)/fltk-1.3.4-1/lib/*.a $(WORKDIR)/../../lib/linux32
 
 .PHONY: android_arm
 android_arm:
+       mkdir -p $(WORKDIR)/../../lib_include/android_arm/X11
+       cp /usr/include/X11/Xmd.h ../../lib_include/android_arm/X11/
+       cp /usr/include/X11/cursorfont.h ../../lib_include/android_arm/X11/
        cd $(WORKDIR)/fltk-1.3.4-1; \
        make clean; \
-       ./configure CFLAGS="--sysroot=/usr/lib/android-ndk/platforms/android-23/arch-arm" CXXFLAGS="--sysroot=/usr/lib/android-ndk/platforms/android-23/arch-arm" LDFLAGS="-static-libgcc -static-libstdc++ --sysroot=/usr/lib/android-ndk/platforms/android-23/arch-arm" --enable-static  --x-includes=../../../../include/ --x-libraries=../../../../lib/android_arm --host=arm-linux-androideabi --enable-localjpeg --enable-localzlib --enable-localpng --disable-gl --disable-xinerama --disable-xft --disable-xdbe --disable-xfixes --disable-xcursor --disable-xrender; \
+       ./configure CFLAGS="--sysroot=/usr/lib/android-ndk/platforms/android-23/arch-arm" CXXFLAGS="--sysroot=/usr/lib/android-ndk/platforms/android-23/arch-arm" LDFLAGS="-static-libgcc -static-libstdc++ --sysroot=/usr/lib/android-ndk/platforms/android-23/arch-arm" --enable-static  --x-includes=../../../../lib_include/android_arm --x-libraries=../../../../lib/android_arm --host=arm-linux-androideabi --enable-localjpeg --enable-localzlib --enable-localpng --disable-gl --disable-xinerama --disable-xft --disable-xdbe --disable-xfixes --disable-xcursor --disable-xrender; \
        sed -i -e 's/-lX11/-lNX11 -lnano-X/g' ./makeinclude; \
        sed -i -e 's/-lX11/-lNX11 -lnano-X/g' ./fltk-config; \
        sed -i -e '/#define USE_XRANDR/ a #undef USE_XRANDR' ./src/Fl_x.cxx; \
        sed -i -e '/#define USE_XRANDR/ a #undef USE_XRANDR' ./src/screen_xywh.cxx; \
        sed -i -e 's/char \*pc_dl_error/const char \*pc_dl_error/g' ./src/Fl_Native_File_Chooser_GTK.cxx; \
-       make -i -j4
-       mkdir -p $(WORKDIR)/../../include
+       make -i -j6
+       mkdir -p $(WORKDIR)/../../lib_include/android_arm
        mkdir -p $(WORKDIR)/../../lib/android_arm
-       cp -rf $(WORKDIR)/fltk-1.3.4-1/FL $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/fltk-1.3.4-1/FL $(WORKDIR)/../../lib_include/android_arm
        cp -rf $(WORKDIR)/fltk-1.3.4-1/lib/*.a $(WORKDIR)/../../lib/android_arm
 
 .PHONY: clean
index 4c0ee43..0e51f7f 100644 (file)
@@ -22,9 +22,9 @@ windows:
        make clean; \
        ./configure CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32 -static-libgcc -static-libstdc++" --host=i686-w64-mingw32 --disable-shared --enable-static --without-png --without-zlib --without-harfbuzz; \
        make -j4
-       mkdir -p $(WORKDIR)/../../include/
+       mkdir -p $(WORKDIR)/../../lib_include/mingw32
        mkdir -p $(WORKDIR)/../../lib/mingw32
-       cp -rf $(WORKDIR)/freetype-2.9.1/include $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/freetype-2.9.1/include/* $(WORKDIR)/../../lib_include/mingw32
        cp -rf $(WORKDIR)/freetype-2.9.1/objs/.libs/libfreetype.a $(WORKDIR)/../../lib/mingw32
 
 .PHONY: linux32
@@ -33,9 +33,9 @@ linux32:
        make clean; \
        ./configure CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32 -static-libgcc -static-libstdc++" --disable-shared --enable-static --without-png --without-zlib --without-harfbuzz; \
        make -j4
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/linux32
        mkdir -p $(WORKDIR)/../../lib/linux32
-       cp -rf $(WORKDIR)/freetype-2.9.1/include/* $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/freetype-2.9.1/include/* $(WORKDIR)/../../lib_include/linux32
        cp -rf $(WORKDIR)/freetype-2.9.1/objs/.libs/libfreetype.a $(WORKDIR)/../../lib/linux32
 
 .PHONY: linux_arm
@@ -44,9 +44,9 @@ linux_arm:
        make clean; \
        ./configure CFLAGS="" CXXFLAGS="" LDFLAGS="-static-libgcc -static-libstdc++" --host=arm-linux-gnueabihf  --disable-shared --enable-static --without-png --without-zlib --without-harfbuzz; \
        make -i -j4
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/linux_arm
        mkdir -p $(WORKDIR)/../../lib/linux_arm
-       cp -rf $(WORKDIR)/freetype-2.9.1/include/* $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/freetype-2.9.1/include/* $(WORKDIR)/../../lib_include/linux_arm
        cp -rf $(WORKDIR)/freetype-2.9.1/objs/.libs/libfreetype.a $(WORKDIR)/../../lib/linux_arm
 
 .PHONY: android_arm
@@ -55,9 +55,9 @@ android_arm:
        make clean; \
        ./configure CFLAGS="--sysroot=/usr/lib/android-ndk/platforms/android-23/arch-arm" CXXFLAGS="--sysroot=/usr/lib/android-ndk/platforms/android-23/arch-arm" LDFLAGS="-static-libgcc -static-libstdc++ --sysroot=/usr/lib/android-ndk/platforms/android-23/arch-arm" --host=arm-linux-androideabi  --disable-shared --enable-static --without-png --without-zlib --without-harfbuzz; \
        make -i -j4
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/android_arm
        mkdir -p $(WORKDIR)/../../lib/android_arm
-       cp -rf $(WORKDIR)/freetype-2.9.1/include/* $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/freetype-2.9.1/include/* $(WORKDIR)/../../lib_include/android_arm
        cp -rf $(WORKDIR)/freetype-2.9.1/objs/.libs/libfreetype.a $(WORKDIR)/../../lib/android_arm
 
 .PHONY: clean
index 8c37512..b2c302f 100644 (file)
@@ -22,11 +22,11 @@ windows:
        make clean; \
        autoreconf -vfi; \
        ./configure CFLAGS="-m32 -mwindows" CXXFLAGS="-m32 -mwindows" LDFLAGS="-m32 -static-libgcc -static-libstdc++" --host=i686-w64-mingw32 --disable-pthreads --with-pthreads=no; \
-       make -j4
-       mkdir -p $(WORKDIR)/../../include
+       make -j6
+       mkdir -p $(WORKDIR)/../../lib_include/mingw32
        mkdir -p $(WORKDIR)/../../lib/mingw32
-       cp -rf $(WORKDIR)/googletest-release-1.8.1/googletest/include/gtest $(WORKDIR)/../../include
-       cp -rf $(WORKDIR)/googletest-release-1.8.1/googlemock/include/gmock $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/googletest-release-1.8.1/googletest/include/gtest $(WORKDIR)/../../lib_include/mingw32
+       cp -rf $(WORKDIR)/googletest-release-1.8.1/googlemock/include/gmock $(WORKDIR)/../../lib_include/mingw32
        cp $(WORKDIR)/googletest-release-1.8.1/googletest/lib/.libs/libgtest.a $(WORKDIR)/../../lib/mingw32
        cp $(WORKDIR)/googletest-release-1.8.1/googlemock/lib/.libs/libgmock.a $(WORKDIR)/../../lib/mingw32
 
@@ -36,11 +36,11 @@ linux32:
        make clean; \
        autoreconf -vfi; \
        ./configure CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32 -static-libgcc -static-libstdc++"; \
-       make -j4
-       mkdir -p $(WORKDIR)/../../include
+       make -j6
+       mkdir -p $(WORKDIR)/../../lib_include/linux32
        mkdir -p $(WORKDIR)/../../lib/linux32
-       cp -rf $(WORKDIR)/googletest-release-1.8.1/googletest/include/gtest $(WORKDIR)/../../include
-       cp -rf $(WORKDIR)/googletest-release-1.8.1/googlemock/include/gmock $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/googletest-release-1.8.1/googletest/include/gtest $(WORKDIR)/../../lib_include/linux32
+       cp -rf $(WORKDIR)/googletest-release-1.8.1/googlemock/include/gmock $(WORKDIR)/../../lib_include/linux32
        cp $(WORKDIR)/googletest-release-1.8.1/googletest/lib/.libs/libgtest.a $(WORKDIR)/../../lib/linux32
        cp $(WORKDIR)/googletest-release-1.8.1/googlemock/lib/.libs/libgmock.a $(WORKDIR)/../../lib/linux32
 
@@ -50,11 +50,11 @@ linux_arm:
        make clean; \
        autoreconf -vfi; \
        ./configure CFLAGS="" CXXFLAGS="" LDFLAGS="-static-libgcc -static-libstdc++" --host=arm-linux-gnueabihf; \
-       make -j4
-       mkdir -p $(WORKDIR)/../../include
+       make -j6
+       mkdir -p $(WORKDIR)/../../lib_include/linux_arm
        mkdir -p $(WORKDIR)/../../lib/linux_arm
-       cp -rf $(WORKDIR)/googletest-release-1.8.1/googletest/include/gtest $(WORKDIR)/../../include
-       cp -rf $(WORKDIR)/googletest-release-1.8.1/googlemock/include/gmock $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/googletest-release-1.8.1/googletest/include/gtest $(WORKDIR)/../../lib_include/linux_arm
+       cp -rf $(WORKDIR)/googletest-release-1.8.1/googlemock/include/gmock $(WORKDIR)/../../lib_include/linux_arm
        cp $(WORKDIR)/googletest-release-1.8.1/googletest/lib/.libs/libgtest.a $(WORKDIR)/../../lib/linux_arm
        cp $(WORKDIR)/googletest-release-1.8.1/googlemock/lib/.libs/libgmock.a $(WORKDIR)/../../lib/linux_arm
 
@@ -64,11 +64,11 @@ android_arm:
        make clean; \
        autoreconf -vfi; \
        ./configure --host=arm-linux-androideabi CXXFLAGS="--sysroot=$(ANDROID_NDK_HOME)/platforms/android-23/arch-arm -I$(ANDROID_NDK_HOME)/sources/cxx-stl/llvm-libc++/libcxx/include -I$(ANDROID_NDK_HOME)/sources/android/support/include -I$(ANDROID_NDK_HOME)/sources/cxx-stl/llvm-libc++abi/libcxxabi/include" LDFLAGS="--sysroot=$(ANDROID_NDK_HOME)/platforms/android-23/arch-arm -static-libgcc -static-libstdc++"; \
-       make -j4
-       mkdir -p $(WORKDIR)/../../include
+       make -j6
+       mkdir -p $(WORKDIR)/../../lib_include/android_arm
        mkdir -p $(WORKDIR)/../../lib/android_arm
-       cp -rf $(WORKDIR)/googletest-release-1.8.1/googletest/include/gtest $(WORKDIR)/../../include
-       cp -rf $(WORKDIR)/googletest-release-1.8.1/googlemock/include/gmock $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/googletest-release-1.8.1/googletest/include/gtest $(WORKDIR)/../../lib_include/android_arm
+       cp -rf $(WORKDIR)/googletest-release-1.8.1/googlemock/include/gmock $(WORKDIR)/../../lib_include/android_arm
        cp $(WORKDIR)/googletest-release-1.8.1/googletest/lib/.libs/libgtest.a $(WORKDIR)/../../lib/android_arm
        cp $(WORKDIR)/googletest-release-1.8.1/googlemock/lib/.libs/libgmock.a $(WORKDIR)/../../lib/android_arm
 
index 00c0615..1b36b84 100644 (file)
@@ -19,9 +19,9 @@ windows:
        ./autogen.sh; \
        ./configure CFLAGS="-m32 -static -mconsole" CXXFLAGS="-static -m32 -mconsole" LDFLAGS="-m32 -static -static-libgcc -static-libstdc++ -lpthread" --enable-static --disable-pulse --disable-alsa --disable-alsa-mmap --enable-wmm --host=i686-w64-mingw32; \
        make -j4
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/mingw32
        mkdir -p $(WORKDIR)/../../lib/mingw32
-       cp -rf $(WORKDIR)/libao-1.2.2/include/ao $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/libao-1.2.2/include/ao $(WORKDIR)/../../lib_include/mingw32
        cp -rf $(WORKDIR)/libao-1.2.2/src/.libs/libao.a $(WORKDIR)/../../lib/mingw32
 
 .PHONY: linux_dont_build_me
@@ -32,9 +32,9 @@ linux_dont_build_me:
        sed -i -e 's/@HAVE_ALSA_TRUE@//g' $(WORKDIR)/libao-1.2.2/src/plugins/alsa/Makefile.in; \
        sed -i -e 's/@HAVE_ALSA_FALSE@//g' $(WORKDIR)/libao-1.2.2/src/plugins/alsa/Makefile.in; \
        make -j4
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/linux32
        mkdir -p $(WORKDIR)/../../lib/linux32
-       cp -rf $(WORKDIR)/libao-1.2.2/include/ao $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/libao-1.2.2/include/ao $(WORKDIR)/../../lib_include/linux32
        cp -rf $(WORKDIR)/libao-1.2.2/src/.libs/libao.a $(WORKDIR)/../../lib/linux32
        cp -rf $(WORKDIR)/libao-1.2.2/src/plugins/pulse/.libs/libpulse.a $(WORKDIR)/../../lib/linux32
        cp -rf $(WORKDIR)/libao-1.2.2/src/plugins/alsa/.libs/libalsa.a $(WORKDIR)/../../lib/linux32
index c721de0..cb30c73 100644 (file)
@@ -23,9 +23,9 @@ windows:
        autoreconf -vfi; \
        ./configure CFLAGS="-m32 -mconsole" CXXFLAGS="-m32 -mconsole" LDFLAGS="-m32 -static-libgcc -static-libstdc++ -lpthread" --host=i686-w64-mingw32; \
        make -j4
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/mingw32
        mkdir -p $(WORKDIR)/../../lib/mingw32
-       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/sndfile.h $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/sndfile.h $(WORKDIR)/../../lib_include/mingw32
        cp -rf $(WORKDIR)/libsndfile-1.0.28/src/.libs/libsndfile.a $(WORKDIR)/../../lib/mingw32
        cp -rf $(WORKDIR)/libsndfile-1.0.28/src/.libs/libcommon.a $(WORKDIR)/../../lib/mingw32
 
@@ -36,9 +36,9 @@ linux32:
        autoreconf -vfi; \
        ./configure CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32 -static -static-libgcc -static-libstdc++"; \
        make -j4
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/linux32
        mkdir -p $(WORKDIR)/../../lib/linux32
-       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/sndfile.h $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/sndfile.h $(WORKDIR)/../../lib_include/linux32
        cp -rf $(WORKDIR)/libsndfile-1.0.28/src/.libs/libsndfile.a $(WORKDIR)/../../lib/linux32
        cp -rf $(WORKDIR)/libsndfile-1.0.28/src/.libs/libcommon.a $(WORKDIR)/../../lib/linux32
 
@@ -49,9 +49,9 @@ linux_arm:
        autoreconf -vfi; \
        ./configure CFLAGS="" CXXFLAGS="" LDFLAGS="-static-libgcc -static-libstdc++" --host=arm-linux-gnueabihf; \
        make -j4
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/linux_arm
        mkdir -p $(WORKDIR)/../../lib/linux_arm
-       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/sndfile.h $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/sndfile.h $(WORKDIR)/../../lib_include/linux_arm
        cp -rf $(WORKDIR)/libsndfile-1.0.28/src/.libs/libsndfile.a $(WORKDIR)/../../lib/linux_arm
        cp -rf $(WORKDIR)/libsndfile-1.0.28/src/.libs/libcommon.a $(WORKDIR)/../../lib/linux_arm
 
@@ -62,9 +62,9 @@ android_arm:
        autoreconf -vfi; \
        ./configure CFLAGS="" CXXFLAGS="--sysroot=$(ANDROID_NDK_HOME)/platforms/android-23/arch-arm -I$(ANDROID_NDK_HOME)/sources/cxx-stl/llvm-libc++/libcxx/include" LDFLAGS="--sysroot=$(ANDROID_NDK_HOME)/platforms/android-23/arch-arm -static-libgcc -static-libstdc++" --host=arm-linux-gnueabihf; \
        make -j4
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/android_arm
        mkdir -p $(WORKDIR)/../../lib/android_arm
-       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/sndfile.h $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/sndfile.h $(WORKDIR)/../../lib_include/android_arm
        cp -rf $(WORKDIR)/libsndfile-1.0.28/src/.libs/libsndfile.a $(WORKDIR)/../../lib/android_arm
        cp -rf $(WORKDIR)/libsndfile-1.0.28/src/.libs/libcommon.a $(WORKDIR)/../../lib/android_arm
 
index cfb0d64..0f3425a 100644 (file)
@@ -12,35 +12,29 @@ all: unpack android_arm
 
 unpack:
        unzip -o microwindows-master.zip
-       rm -rf $(WORKDIR)/microwindows-master/src/demos/nbreaker
-       rm -rf $(WORKDIR)/microwindows-master/src/demos/nanox/cannyedgedetect.cpp
-       sed -i -e "s/TARGETS +=.*demo-convimage/ /g" $(WORKDIR)/microwindows-master/src/demos/nanox/Makefile
-       sed -i -e "s/TARGETS +=.*demo-agg/ /g" $(WORKDIR)/microwindows-master/src/demos/nanox/Makefile
 
 linux:
        cp $(WORKDIR)/config_linux $(WORKDIR)/microwindows-master/src/config
        cd $(WORKDIR)/microwindows-master/src/; \
        sed -i -e 's/CFLAGS=.*/CFLAGS=-m32/g' ./Makefile.rules; \
        sed -i -e 's/LDFLAGS=.*/LDFLAGS=-m32/g' ./Makefile.rules; \
-       make -j4
+       make -j6
        mkdir -p $(WORKDIR)/../../lib/linux32
-       mkdir -p $(WORKDIR)/../../include/nanox
+       mkdir -p $(WORKDIR)/../../lib_include/linux32
        cp -rf $(WORKDIR)/microwindows-master/src/lib/*.a $(WORKDIR)/../../lib/linux32
-       cp -rf $(WORKDIR)/microwindows-master/src/include/*.h $(WORKDIR)/../../include/nanox
-       cp -rf $(WORKDIR)/microwindows-master/src/nx11/X11-local/* $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/microwindows-master/src/include/*.h $(WORKDIR)/../../lib_include/linux32
+       cp -rf $(WORKDIR)/microwindows-master/src/nx11/X11-local/* $(WORKDIR)/../../lib_include/linux32
 
 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/; \
-       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; \
-       make -j4
+       make -j6
        mkdir -p $(WORKDIR)/../../lib/android_arm
-       mkdir -p $(WORKDIR)/../../include/nanox
+       mkdir -p $(WORKDIR)/../../lib_include/android_arm
        cp -rf $(WORKDIR)/microwindows-master/src/lib/*.a $(WORKDIR)/../../lib/android_arm
-       cp -rf $(WORKDIR)/microwindows-master/src/include/*.h $(WORKDIR)/../../include/nanox
-       cp -rf $(WORKDIR)/microwindows-master/src/nx11/X11-local/* $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/microwindows-master/src/include/*.h $(WORKDIR)/../../lib_include/android_arm
+       cp -rf $(WORKDIR)/microwindows-master/src/nx11/X11-local/* $(WORKDIR)/../../lib_include/android_arm
 
 clean:
        rm -rf $(WORKDIR)/microwindows-master
index 61d8527..fefbc32 100644 (file)
 ####################################################################
-# config: Microwindows and Nano-X configuration file
+# config - Microwindows and Nano-X configuration file
 #
-# This package is configured using this file for desktop Linux running
-# framebuffer (FRAMEBUFFER=Y) or X11 (X11=Y), or cross-compiled
-# for a variety of architectures (see ARCH= below).
-# In addition, a variety of mouse and keyboards drivers can be
-# selected (see MOUSE AND KBD below)
+# Set target architecture using ARCH= from options in Arch.rules
+# Set drawing method: X11 or FRAMEBUFFER/MOUSE/KEYBOARD options
+# Set SCREEN/MOUSE/KEYBOARD drivers (typically X11 or FB)
+# Set various libraries to build or include and their locations
 #
 # See the src/Configs directory for pre-built config files.
-# Edit this or copy one src/config, and type "make clean; make"
+# Edit this or copy one from src/Configs, and type "make clean; make"
 ####################################################################
 
 ####################################################################
-# Build target platform.  Valid ARCH values are:
 #
-# LINUX-NATIVE
-# LINUX-AVR32 (BIGENDIAN=Y)
-# LINUX-TCC
-# LINUX-ARM
-# UCLINUX-ARM
-# LINUX-MIPS
-# LINUX-POWERPC (BIGENDIAN=Y)
-# LINUX-SPARC (BIGENDIAN=Y)
-# LINUX-BLACKFIN
-# LINUX-SH
-# SOLARIS (BIGENDIAN=Y)
-# PSP
-# NDS (Nintendo DS)
-# TRIMEDIA
-# MACOSX
-# RTEMS
-# ECOS
-# CYGWIN
-# LINUX-LINARO (RPI cross compile)
-# ANDROID
-####################################################################
-#ARCH                     = LINUX-NATIVE
-ARCH                     = ANDROID
-BIGENDIAN                = N
-NATIVETOOLSPREFIX        = 
-ARMTOOLSPREFIX           = arm-linux-
-ANDROIDTOOLSPREFIX       = arm-linux-androideabi-
-RPITOOLSPREFIX           = arm-linux-gnueabihf-
-MIPSTOOLSPREFIX          = mipsel-linux-
-POWERPCTOOLSPREFIX       = powerpc-linux-
-SHTOOLSPREFIX            = sh-linux-gnu
-AVR32TOOLSPREFIX        = avr32-linux-
-BLACKFINTOOLSPREFIX     = bfin-uclinux-
-PSPTOOLSPREFIX           = psp-
-
-####################################################################
-#
-# Compiling options
+# Target platform and compilation options
 #
 ####################################################################
-OPTIMIZE                 = Y
+ARCH                     = ANDROID
+SHAREDLIBS               = N
+SHAREDLINK               = N
+#EXTRAFLAGS               = -Wno-unused-result -Wno-implicit-int
 DEBUG                    = N
+OPTIMIZE                 = Y
+#OPTIMIZE                 = -O1
 VERBOSE                  = Y
 THREADSAFE               = N
-GPROF                    = N
+PARALLEL                 = N
+
+####################################################################
+# Screen Driver
+# Set SCREEN=X11 for X11, SCREEN=FB for framebuffer drawing
+# Screen size/depth for X11, FBE and non-dynamic framebuffer systems
+####################################################################
+SCREEN                   = ALLEGRO
+ALLEGRO5_INCLUDE        =../../../../../lib_include/android_arm
+ALLEGRO5_LIB            =../../../../../lib/android_arm
+ALLEGRO5_SRC            =../../../../packages/allegro5.2.4/allegro-5.2.4.0
+MOUSE                    =
+KEYBOARD                 =
+SCREEN_WIDTH             = 1080
+SCREEN_HEIGHT            = 1776
+X11HDRLOCATION           = $(MW_DIR_SRC)/nx11/X11-local
+#EXTENGINELIBS            = -lallegro
+
+####################################################################
+# Android specific settings (these also allow compiling android)
+# for different architectures + platform versions
+####################################################################
+ANDROID_NDK_HOME       = /usr/lib/android-ndk
+ANDROID_PLATFORM_VER   = android-23
+ANDROID_ARCH           = arm
+ANDROID_ARCH_VER       = armeabi-v7a
+ANDROID_TOOLCHAIN_NAME = arm-linux-androideabi-4.9
+ANDROIDTOOLSPREFIX      = arm-linux-androideabi-
 
 ####################################################################
 #
-# Libraries to build: microwin, nano-X, engine, object frameworks
+# Libraries to build: microwin, nano-X, nxlib, engine
 #
 ####################################################################
 MICROWIN                 = N
 NANOX                    = Y
-NX11                    = Y
-#INCLUDE_XRM            = Y
+NX11                     = Y
 ENGINE                   = Y
-SHAREDLIBS               = N
-OBJFRAMEWORK             = N
+TINYWIDGETS              = N
 
 ####################################################################
 #
-# Demos to build
+# Applications and demos to build
 #
 ####################################################################
+FBEMULATOR               = N
 MICROWINDEMO             = N
 NANOXDEMO                = N
+HAVE_VNCSERVER_SUPPORT   = N
+VNCSERVER_PTHREADED      = N
+LIBVNC                   = -lvncserver
+INCVNC                   =
 
 ####################################################################
-#
-# Applications to build
-#
-####################################################################
-NANOWM                   = Y
-FBEMULATOR               = N
-
-####################################################################
-#
-# If using Linux framebuffer, set to MWPF_TRUECOLOR8888, and use fbset.
-# When running X11, this sets the X11 pixel emulation at runtime.
-#
-# On Linux or when running the standard framebuffer subdrivers,
-# the runtime framebuffer BPP (bits per pixel) is used to select 
-# the runtime screen subdriver.  However, the format of the pixel
-# itself must be selected at compile time, which sets macros used
-# for MWCOLORVAL color conversions and conversion blit byte order.
-# This also sets sizeof(MWPIXELVAL) for optimizing buffers sizes
-# in GrArea/GrReadArea.
-#
-# define MWPF_PALETTE       /* pixel is packed 8 bits 1, 4 or 8 pal index*/
-# define MWPF_TRUECOLOR8888 /* pixel is packed 32 bits byte order |B|G|R|A|*/
-# define MWPF_TRUECOLORABGR /* pixel is packed 32 bits byte order |R|G|B|A|*/
-# define MWPF_TRUECOLOR888  /* pixel is packed 24 bits byte order |B|G|R|*/
-# define MWPF_TRUECOLOR565  /* pixel is packed 16 bits little endian RGB565*/
-# define MWPF_TRUECOLOR555  /* pixel is packed 16 bits little endian RGB555*/
-# define MWPF_TRUECOLOR332  /* pixel is packed 8 bits RGB 332*/
-# define MWPF_TRUECOLOR233  /* pixel is packed 8 bits BGR 332*/
-#
+# Mandatory settings to create android .apk files
 ####################################################################
-SCREEN_PIXTYPE           = MWPF_TRUECOLOR8888
-#SCREEN_PIXTYPE           = MWPF_TRUECOLORABGR 
-#SCREEN_PIXTYPE           = MWPF_TRUECOLOR565
+ANDROID_SDK_ROOT=/usr/lib/android-sdk
+ANDROID_BUILD_TOOLS_VERSION=24.0.0
+ANDROID_KEYSTORE_PATH=~/.android/debug.keystore
+ANDROID_KEYSTORE_NAME=androiddebugkey
+ANDROID_KEYSTORE_PW=android
+JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
 
 ####################################################################
-# NanoX: Put Y to the following line to link the nano-X application
-# with the server. This is required if UNIX sockets aren't available,
-# or for speed or debugging.  This affects the nano-X server only.
+# LINK_APP_INTO_SERVER links the nano-X server into the application,
+# by building a libnano-X.{a,so} that runs standalone.
+# Required if UNIX sockets aren't available, for debugging,
+# and also used to support running X11 apps through NXLIB on X11.
+# NANOWM links the window manager into the server.
 ####################################################################
 LINK_APP_INTO_SERVER     = Y
+NANOWM                   = Y
 
 ####################################################################
 # Shared memory support for Nano-X client/server protocol speedup
@@ -146,14 +120,14 @@ HAVE_XPM_SUPPORT         = Y
 # JPEG support through libjpeg, see README.txt in contrib/jpeg
 ####################################################################
 HAVE_JPEG_SUPPORT        = N
-INCJPEG                  = .
+INCJPEG                  =
 LIBJPEG                  = -ljpeg
 
 ####################################################################
 # PNG support via libpng and libz
 ####################################################################
 HAVE_PNG_SUPPORT         = N
-INCPNG                   = .
+INCPNG                   =
 LIBPNG                   = -lpng
 INCZ                     = .
 LIBZ                     = -lz
@@ -162,7 +136,7 @@ LIBZ                     = -lz
 # TIFF support through libtiff
 ####################################################################
 HAVE_TIFF_SUPPORT        = N
-INCTIFF                  = .
+INCTIFF                  =
 LIBTIFF                  = -ltiff
 
 ####################################################################
@@ -173,17 +147,14 @@ HAVE_PCFGZ_SUPPORT       = Y
 PCF_FONT_DIR             = "fonts/pcf"
 
 ####################################################################
-# Truetype fonts - .ttf loadable fonts thru Freetype 2.x
+# Truetype fonts - .ttf and .otf loadable fonts thru Freetype 2.x
 ####################################################################
 HAVE_FREETYPE_2_SUPPORT  = Y
+HAVE_HARFBUZZ_SUPPORT    = N
 INCFT2LIB                = /usr/include
-ifneq ($(ARCH),ANDROID)
-LIBFT2LIB                = -lfreetype
-FREETYPE_FONT_DIR        = "fonts/truetype"
-else
 LIBFT2LIB                = -lfreetype
+#LIBFT2LIB                += -lharfbuzz
 FREETYPE_FONT_DIR        = "/system/fonts"
-endif
 
 ####################################################################
 # T1 adobe type1 fonts - .pfb/.afm loadable thru t1lib
@@ -191,7 +162,7 @@ endif
 ####################################################################
 HAVE_T1LIB_SUPPORT       = N
 T1LIB_FONT_DIR           = "fonts/type1"
-INCT1LIB                 = /usr/include
+INCT1LIB                 =
 LIBT1LIB                 = -lt1
 
 ####################################################################
@@ -202,170 +173,109 @@ HAVE_FNTGZ_SUPPORT       = Y
 FNT_FONT_DIR             = "fonts/fnt"
 
 ####################################################################
+# Specialized font support
+#
+# Chinese Han Zi Ku HZK loadable font support
+# DBCS Chinese BIG5 compiled in font support (big5font.c)
+# DBCS Chinese GB2312 compiled in font support (gb2312font.c)
+# Chinese HBF font support (genfont.hbf.c, hbf.c)
+# DBCS Japanese JISX0213 compiled in font support (jisx0213-12x12.c)
 # Japanese EUC-JP support using loadable MGL font
-####################################################################
-HAVE_EUCJP_SUPPORT       = N
-EUCJP_FONT_DIR           = "fonts/japanese"
-
-####################################################################
-# Chinese Han Zi Ku loadable font support
+# DBCS Korean HANGUL font support (jo16x16.c)
+# Fribidi and shape/joining support for right to left rendering
 ####################################################################
 HAVE_HZK_SUPPORT         = N
 HZK_FONT_DIR             = "fonts/chinese"
-
-####################################################################
-# DBCS Chinese BIG5 compiled in font support (big5font.c)
-####################################################################
 HAVE_BIG5_SUPPORT        = N
-
-####################################################################
-# DBCS Chinese GB2312 compiled in font support (gb2312font.c)
-####################################################################
 HAVE_GB2312_SUPPORT      = N
-
-####################################################################
-# DBCS Japanese JISX0213 compiled in font support (jisx0213-12x12.c)
-####################################################################
+HAVE_HBF_SUPPORT         = N
 HAVE_JISX0213_SUPPORT    = N
-
-####################################################################
-# DBCS Korean HANGUL font support (jo16x16.c)
-####################################################################
+HAVE_EUCJP_SUPPORT       = N
+EUCJP_FONT_DIR           = "fonts/japanese"
 HAVE_KSC5601_SUPPORT     = N
-
-####################################################################
-# Fribidi and shape/joining support for right to left rendering
-####################################################################
 HAVE_FRIBIDI_SUPPORT     = N
 HAVE_SHAPEJOINING_SUPPORT = N
-INCFRIBIDI               = $(TOP)/../../../include
-LIBFRIBIDI               = $(TOP)/../../../lib/libfribidi.a
+INCFRIBIDI               =
+LIBFRIBIDI               = -lfribidi
 
 ####################################################################
-# Generate screen driver interface only with no fonts or clipping
+# Misc Options
 ####################################################################
-NOFONTS                  = N
-NOCLIPPING               = N
 
-####################################################################
 # Window move algorithms for Microwindows
 # Change for tradeoff between cpu speed and looks
 # ERASEMOVE (nanowm) repaints only backgrounds while window dragging
 # Otherwise an XOR redraw is used for window moves only after button up
 # UPDATEREGIONS (win32 api only)paints in update clipping region only
-####################################################################
 ERASEMOVE                = Y
 UPDATEREGIONS            = Y
 
-####################################################################
-# SCREEN DRIVERS
-####################################################################
-
-# X11 and FBE startup screen width, height, (depth for palette mode only)
-SCREEN_WIDTH             = 1080
-SCREEN_HEIGHT            = 1776
-SCREEN_DEPTH             = 8
-
-# X Window screen driver
-# USE_EXPOSURE for XFree86 4.x or if backing store not working
-X11                      = N
-#X11LIBLOCATION           = /usr/lib/i386-linux-gnu/
-X11HDRLOCATION           = ./X11-local
-#X11HDRLOCATION           =
-USE_EXPOSURE             = N
-
-# Framebuffer screen driver
-FRAMEBUFFER              = N
-
-# memory screen driver
-SCRMEM                   = N
-
-# PSP screen driver
-PSP                      = N
-
-# Nintendo DS screen driver
-SCRNDS                   = N
-
-# allegro drivers
-ALLEGRO4                  = N
-SCREEN = ALLEGRO5
-ALLEGRO5                  = Y
+# Generate screen driver interface only with no fonts or clipping
+NOFONTS                  = N
+NOCLIPPING               = N
 
+# set USE_EXPOSURE for X11 on XFree86 4.x or if backing store not working
 # set VTSWITCH to include virtual terminal switch code
 # set FBREVERSE to reverse bit orders in 1,2,4 bpp
 # set GRAYPALETTE to link with Gray Palette (valid only for 4bpp modes)
 # set HAVETEXTMODE=Y for systems that can switch between text & graphics.
+USE_EXPOSURE             = Y
 VTSWITCH                 = N
 FBREVERSE                = N
 GRAYPALETTE              = N
 HAVETEXTMODE             = N
 
-# SA1100_LCD_LTLEND 4bpp driver with arm SA1100 LCD controller
-# INVERT4BPP 4bpp inverted pixel driver for VTech Helio
-SA1100_LCD_LTLEND        = N
-INVERT4BPP               = N
-
 ####################################################################
-# Mouse drivers
-# GPMMOUSE     gpm mouse
-# SERMOUSE     serial Microsoft, PC, Logitech, PS/2 mice (/dev/psaux)
-# SUNMOUSE     Sun Workstation mouse (/dev/sunmouse)
-# NOMOUSE      no mouse driver
+# Screen pixel format
+# If using Linux framebuffer, set to MWPF_TRUECOLORARGB, and use fbset.
+# When running X11 or FBE, this sets the pixel emulation at runtime.
+#
+# On Linux or when running the standard framebuffer subdrivers,
+# the runtime framebuffer BPP (bits per pixel) is used to select 
+# the runtime screen subdriver.  However, the format of the pixel
+# itself must be selected at compile time, which sets macros used
+# for MWCOLORVAL color conversions and conversion blit byte order.
+# This also sets sizeof(MWPIXELVAL) for optimizing buffers sizes
+# in GrArea/GrReadArea.
 #
-# Touchscreen drivers
-# IPAQMOUSE    Compaq iPAQ, Intel Assabet (/dev/h3600_tsraw)
-# ZAURUSMOUSE  Sharp Zaurus (/dev/sharp_ts)
-# TUXMOUSE     TuxScreen (/dev/ucb1x00-ts)
-# ADSMOUSE     Applied Data Systems GC+ (/dev/ts)
-# ADS7846MOUSE ADS7846 chip, PSI OMAP Innovator (/dev/innnovator_ts)
-# EPMOUSE      Embedded Planet (/dev/tpanel)
-# VHMOUSE      Vtech Helio (/dev/tpanel)
-# MTMOUSE      MicroTouch serial (/dev/ttyS1)
-# PSIONMOUSE   Psion 5 (/dev/touch_psion)
-# YOPYMOUSE    Yopy (/dev/yopy-ts)
-# HARRIERMOUSE NEC Harrier (/dev/tpanel)
-# TSLIBMOUSE    Use tslib (/dev/input/event0)
-# EVENTMOUSE   Simple standard event interface (/dev/input/event0)
-# TTMOUSE       TomTom GO and ONE (/dev/ts)
-####################################################################
-GPMMOUSE                 = N
-SERMOUSE                 = N
-SUNMOUSE                 = N
-NOMOUSE                  = N
-IPAQMOUSE                = N
-ZAURUSMOUSE              = N
-TUXMOUSE                 = N
-ADSMOUSE                 = N
-ADS7846MOUSE             = N
-EPMOUSE                  = N
-VHMOUSE                  = N
-MTMOUSE                  = N
-PSIONMOUSE               = N
-YOPYMOUSE                = N
-HARRIERMOUSE             = N
-LIRCMOUSE                = N
-TSLIBMOUSE               = N
-TTMOUSE                  = N
-PSPMOUSE                 = N
-NDSMOUSE                 = N
-EVENTMOUSE               = N
+# define MWPF_PALETTE       /* pixel is packed 8 bits 1, 4 or 8 pal index*/
+# define MWPF_TRUECOLORARGB /* pixel is packed 32 bits byte order |B|G|R|A|*/
+# define MWPF_TRUECOLORABGR /* pixel is packed 32 bits byte order |R|G|B|A|*/
+# define MWPF_TRUECOLORRGB  /* pixel is packed 24 bits byte order |B|G|R|*/
+# define MWPF_TRUECOLOR565  /* pixel is packed 16 bits little endian RGB565*/
+# define MWPF_TRUECOLOR555  /* pixel is packed 16 bits little endian RGB555*/
+# define MWPF_TRUECOLOR332  /* pixel is packed 8 bits RGB 332*/
+# define MWPF_TRUECOLOR233  /* pixel is packed 8 bits BGR 332*/
+# SCREEN_DEPTH is bits per pixel, only used with MWPF_PALETTE palette mode
+####################################################################
+SCREEN_PIXTYPE           = MWPF_TRUECOLORARGB
+#SCREEN_PIXTYPE           = MWPF_TRUECOLORABGR 
+#SCREEN_PIXTYPE           = MWPF_TRUECOLOR565
+SCREEN_DEPTH             = 8
+
+####################################################################
+# Screen drivers
+# SCREEN=X11           X11
+# SCREEN=FB                    linux framebuffer
+# SCREEN=FBE           framebuffer emulator
+# SCREEN=SDL           SDL v2
+# SCREEN=ALLEGRO4
+# SCREEN=ALLEGRO5
+####################################################################
 
-# keyboard or null kbd driver
-TTYKBD                   = N
-SCANKBD                  = N
-PIPEKBD                  = N
-IPAQKBD                  = N
-LIRCKBD                  = N
-PSPKBD                   = N
-EVENTKBD                 = N
-NOKBD                    = N
-# Secondary keyboard drivers for IR input
-LIRCKBD2                 = N
+####################################################################
+# Mouse drivers
+# MOUSE=NOMOUSE                no mouse driver
+# MOUSE=GPMMOUSE       gpm mouse
+# MOUSE=SERMOUSE       serial Microsoft, PC, Logitech, PS/2 mice (/dev/psaux)
+# MOUSE=DEVMICEMOUSE Use Linux /dev/input/mice driver
+# MOUSE=TSLIBMOUSE     Use tslib (/dev/input/event0)
+####################################################################
 
 ####################################################################
-# VNC server support through libvncserver
+# Keyboard drivers
+# KEYBOARD=NOKBD               no keyboard driver
+# KEYBOARD=TTYKBD              tty keyboard
+# KEYBOARD=SCANKBD             scanmode keyboard
+# KEYBOARD=2NDKBD              two keyboards support
 ####################################################################
-HAVE_VNCSERVER_SUPPORT   = N
-VNCSERVER_PTHREADED      = N
-LIBVNC                   = -lvncserver
-INCVNC                   = /usr/include
index 4bce527..df125aa 100644 (file)
Binary files a/_template/packages/nanox/microwindows-master.zip and b/_template/packages/nanox/microwindows-master.zip differ
index 8c321ee..bf5bf59 100644 (file)
@@ -26,10 +26,10 @@ android_arm:
        sed -i -e 's/CROSS_COMPILE =/CROSS_COMPILE = arm-linux-androideabi-/g' src/Makefile; \
        cd $(WORKDIR)/tinyalsa-1.0.2/src; \
        make -j4 -i
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/android_arm
        mkdir -p $(WORKDIR)/../../lib/android_arm
-       mv $(WORKDIR)/tinyalsa-1.0.2/include/tinyalsa $(WORKDIR)/../../include/alsa
-       mv $(WORKDIR)/tinyalsa-1.0.2/include/sound $(WORKDIR)/../../include/sound
+       cp -r $(WORKDIR)/tinyalsa-1.0.2/include/tinyalsa $(WORKDIR)/../../lib_include/android_arm/alsa
+       cp -r $(WORKDIR)/tinyalsa-1.0.2/include/sound $(WORKDIR)/../../lib_include/android_arm/sound
        cp -rf $(WORKDIR)/tinyalsa-1.0.2/src/*.a $(WORKDIR)/../../lib/android_arm
 
 
index 25bb77e..f88574f 100644 (file)
@@ -21,40 +21,40 @@ windows:
        cd $(WORKDIR)/tinyxml2-master; \
        i686-w64-mingw32-g++ -c -o tinyxml2.o tinyxml2.cpp; \
        i686-w64-mingw32-ar rvs libtinyxml2.a tinyxml2.o
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/mingw32
        mkdir -p $(WORKDIR)/../../lib/mingw32
        cp -rf $(WORKDIR)/tinyxml2-master/libtinyxml2.a $(WORKDIR)/../../lib/mingw32
-       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../lib_include/mingw32
 
 .PHONY: linux32
 linux32:
        cd $(WORKDIR)/tinyxml2-master; \
        g++ -m32 -c -o tinyxml2.o tinyxml2.cpp; \
        ar rvs libtinyxml2.a tinyxml2.o
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/linux32
        mkdir -p $(WORKDIR)/../../lib/linux32
        cp -rf $(WORKDIR)/tinyxml2-master/libtinyxml2.a $(WORKDIR)/../../lib/linux32
-       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../lib_include/linux32
 
 .PHONY: linux_arm
 linux_arm:
        cd $(WORKDIR)/tinyxml2-master; \
        arm-linux-gnueabihf-g++ -c -o tinyxml2.o tinyxml2.cpp; \
        arm-linux-gnueabihf-ar rvs libtinyxml2.a tinyxml2.o
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/linux_arm
        mkdir -p $(WORKDIR)/../../lib/linux_arm
        cp -rf $(WORKDIR)/tinyxml2-master/libtinyxml2.a $(WORKDIR)/../../lib/linux_arm
-       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../lib_include/linux_arm
 
 .PHONY: android_arm
 android_arm:
        cd $(WORKDIR)/tinyxml2-master; \
        arm-linux-androideabi-g++ --sysroot=$(ANDROID_NDK_HOME)/platforms/android-23/arch-arm -I$(ANDROID_NDK_HOME)/sources/cxx-stl/llvm-libc++/libcxx/include -c -o tinyxml2.o tinyxml2.cpp; \
        arm-linux-androideabi-ar rvs libtinyxml2.a tinyxml2.o
-       mkdir -p $(WORKDIR)/../../include
+       mkdir -p $(WORKDIR)/../../lib_include/android_arm
        mkdir -p $(WORKDIR)/../../lib/android_arm
        cp -rf $(WORKDIR)/tinyxml2-master/libtinyxml2.a $(WORKDIR)/../../lib/android_arm
-       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../lib_include/android_arm
 
 .PHONY: clean
 clean:
index 60e62b6..63c843d 100644 (file)
@@ -12,7 +12,7 @@ WORKDIR = $(shell pwd)
 SOURCES := $(shell ls *.cxx)
 PROJNAME = _template
 LIBDIR =
-INC = -I$(WORKDIR)/../include
+INC = -I$(WORKDIR)/../include/
 LDFLAGS = -std=c++11 -static-libstdc++ -static-libgcc -Wl,-Bstatic
 CFLAGS = -Wall -fexceptions -std=c++11 -static-libstdc++ -static-libgcc
 LIB = -lfltk_images -lfltk_png -lfltk_z -lfltk_jpeg -lfltk -lfreetype
@@ -26,7 +26,7 @@ AR_LINUX32 = ar
 LD_LINUX32 = g++
 WINDRES_LINUX32 =
 
-INC_LINUX32 = $(INC)
+INC_LINUX32 = $(INC) -I$(WORKDIR)/../lib_include/linux32
 LIBDIR_LINUX32 = -L$(WORKDIR)/../lib/linux32
 CFLAGS_LINUX32 = -m32 $(CFLAGS)
 RESINC_LINUX32 =
@@ -42,7 +42,7 @@ AR_LINUXARM = arm-linux-gnueabihf-ar
 LD_LINUXARM = arm-linux-gnueabihf-g++
 WINDRES_LINUXARM =
 
-INC_LINUXARM = $(INC)
+INC_LINUXARM = $(INC) -I$(WORKDIR)/../lib_include/linux_arm
 LIBDIR_LINUXARM = -L$(WORKDIR)/../lib/linux_arm
 CFLAGS_LINUXARM = $(CFLAGS)
 RESINC_LINUXARM =
@@ -58,7 +58,7 @@ AR_WIN = i686-w64-mingw32-ar
 LD_WIN = i686-w64-mingw32-g++
 WINDRES_WIN = i686-w64-mingw32-windres
 
-INC_WIN = $(INC)
+INC_WIN = $(INC) -I$(WORKDIR)/../lib_include/mingw32
 LIBDIR_WIN = -L$(WORKDIR)/../lib/mingw32
 CFLAGS_WIN = -m32  $(CFLAGS) -mwindows -DWIN32 -D_WIN32 -DUSE_OPENGL32 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 RESINC_WIN = $(WORKDIR)/appinfo
@@ -110,10 +110,10 @@ AR_ANDROID = $(TOOLCHAIN_ANDROID_PATH)/$(ANDROID_COMPILER_PREFIX)-ar
 LD_ANDROID = $(TOOLCHAIN_ANDROID_PATH)/$(ANDROID_COMPILER_PREFIX)-g++
 WINDRES_ANDROID =
 
-INC_ANDROID=$(INC) -I$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include
+INC_ANDROID=$(INC) -I$(WORKDIR)/../lib_include/android_arm
+INC_ANDROID+=-I$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include
 INC_ANDROID+=-I$(ANDROID_NDK_ROOT)/sources/android/support/include
 INC_ANDROID+=-I$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++abi/libcxxabi/include
-INC_ANDROID+=-I$(WORKDIR)/../include/nanox
 LIBDIR_ANDROID = -L$(WORKDIR)/../lib/android_$(ANDROID_ARCH)
 LIBDIR_ANDROID += -L$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(ANDROID_ARCH_VER)
 CFLAGS_ANDROID  = $(CFLAGS) --sysroot=$(ANDROID_NDK_ROOT)/platforms/$(ANDROID_PLATORM)/arch-$(ANDROID_ARCH) -D_ANDROID