Added version number to package folder (allow different versions of a package)
authorDaniel G <giri@nwrk.biz>
Wed, 30 Jan 2019 16:51:07 +0000 (17:51 +0100)
committerDaniel G <giri@nwrk.biz>
Wed, 30 Jan 2019 16:51:07 +0000 (17:51 +0100)
Extended setup script to install debian dependencies via apt.
Fix gitignore files.

48 files changed:
.gitignore
_template/Makefile
_template/packages/allegro5.1.13/.gitignore
_template/packages/allegro5.2.0/.gitignore
_template/packages/allegro5.2.4/.gitignore
_template/packages/boost/.gitignore [deleted file]
_template/packages/boost/Makefile [deleted file]
_template/packages/boost/boost_1_68_0.zip [deleted file]
_template/packages/boost1.68.0/.gitignore [new file with mode: 0644]
_template/packages/boost1.68.0/Makefile [new file with mode: 0644]
_template/packages/boost1.68.0/boost_1_68_0.zip [new file with mode: 0644]
_template/packages/fltk1.3.4/.gitignore [new file with mode: 0644]
_template/packages/fltk1.3.4/Makefile [new file with mode: 0644]
_template/packages/fltk1.3.4/fltk-1.3.4-1-source.tar.gz [new file with mode: 0644]
_template/packages/fltk1.3/.gitignore [deleted file]
_template/packages/fltk1.3/Makefile [deleted file]
_template/packages/fltk1.3/fltk-1.3.4-1-source.tar.gz [deleted file]
_template/packages/freetype2.9.1/.gitignore [new file with mode: 0644]
_template/packages/freetype2.9.1/Makefile [new file with mode: 0644]
_template/packages/freetype2.9.1/freetype-2.9.1.tar.gz [new file with mode: 0644]
_template/packages/freetype2/Makefile [deleted file]
_template/packages/freetype2/freetype-2.9.1.tar.gz [deleted file]
_template/packages/googletest/.gitignore [deleted file]
_template/packages/googletest/Makefile [deleted file]
_template/packages/googletest/googletest-release-1.8.1.zip [deleted file]
_template/packages/googletest1.8.1/.gitignore [new file with mode: 0644]
_template/packages/googletest1.8.1/Makefile [new file with mode: 0644]
_template/packages/googletest1.8.1/googletest-release-1.8.1.zip [new file with mode: 0644]
_template/packages/libao/.gitignore [deleted file]
_template/packages/libao/Makefile [deleted file]
_template/packages/libao/libao-1.2.2.tar.gz [deleted file]
_template/packages/libao1.2.2/.gitignore [new file with mode: 0644]
_template/packages/libao1.2.2/Makefile [new file with mode: 0644]
_template/packages/libao1.2.2/libao-1.2.2.tar.gz [new file with mode: 0644]
_template/packages/libsndfile/.gitignore [deleted file]
_template/packages/libsndfile/Makefile [deleted file]
_template/packages/libsndfile/libsndfile-1.0.28.tar.gz [deleted file]
_template/packages/libsndfile1.0.28/.gitignore [new file with mode: 0644]
_template/packages/libsndfile1.0.28/Makefile [new file with mode: 0644]
_template/packages/libsndfile1.0.28/libsndfile-1.0.28.tar.gz [new file with mode: 0644]
_template/packages/nanox/.gitignore
_template/packages/tinyxml/.gitignore [deleted file]
_template/packages/tinyxml/Makefile [deleted file]
_template/packages/tinyxml/tinyxml-2.src.zip [deleted file]
_template/packages/tinyxml2/.gitignore [new file with mode: 0644]
_template/packages/tinyxml2/Makefile [new file with mode: 0644]
_template/packages/tinyxml2/tinyxml-2.src.zip [new file with mode: 0644]
setup.sh

index f28dac1..926a91e 100644 (file)
@@ -1,8 +1,9 @@
 # Ignore everything
-*
+./*
 
 # But not these files...
 !.gitignore
 !.git
 !_template/
-!setup.sh
\ No newline at end of file
+!_template/*
+!setup.sh
index 148bda6..bc13eb4 100644 (file)
@@ -12,7 +12,7 @@ create_installers: linux32_package linux_arm_package windows_package android_pac
 
 #### Dependencies
 freetype:
-       cd $(WORKDIR)/packages/freetype2; \
+       cd $(WORKDIR)/packages/freetype2.9.1; \
        make
 
 allegro:
@@ -24,27 +24,27 @@ nanox:
        make
 
 fltk:
-       cd $(WORKDIR)/packages/fltk1.3; \
+       cd $(WORKDIR)/packages/fltk1.3.4; \
        make
 
 tinyxml:
-       cd $(WORKDIR)/packages/tinyxml; \
+       cd $(WORKDIR)/packages/tinyxml2; \
        make
 
 libsndfile:
-       cd $(WORKDIR)/packages/libsndfile; \
+       cd $(WORKDIR)/packages/libsndfile1.0.28; \
        make
 
 libao:
-       cd $(WORKDIR)/packages/libao; \
+       cd $(WORKDIR)/packages/libao1.2.2; \
        make
 
 gtest:
-       cd $(WORKDIR)/packages/googletest; \
+       cd $(WORKDIR)/packages/googletest1.8.1; \
        make
 
 boost:
-       cd $(WORKDIR)/packages/boost; \
+       cd $(WORKDIR)/packages/boost1.68.0; \
        make
 
 #### _template App
@@ -55,7 +55,7 @@ _template:
 
 #### Clean
 clean_freetype:
-       cd $(WORKDIR)/packages/freetype2; \
+       cd $(WORKDIR)/packages/freetype2.9.1; \
        make clean
 
 clean_allegro:
@@ -67,27 +67,27 @@ clean_nanox:
        make clean
 
 clean_fltk:
-       cd $(WORKDIR)/packages/fltk1.3; \
+       cd $(WORKDIR)/packages/fltk1.3.4; \
        make clean
 
 clean_tinyxml:
-       cd $(WORKDIR)/packages/tinyxml; \
+       cd $(WORKDIR)/packages/tinyxml2; \
        make clean
 
 clean_libsndfile:
-       cd $(WORKDIR)/packages/libsndfile; \
+       cd $(WORKDIR)/packages/libsndfile1.0.28; \
        make clean
 
 clean_libao:
-       cd $(WORKDIR)/packages/libao; \
+       cd $(WORKDIR)/packages/libao1.2.2; \
        make clean
 
 clean_gtest:
-       cd $(WORKDIR)/packages/googletest; \
+       cd $(WORKDIR)/packages/googletest1.8.1; \
        make clean
 
 clean_boost:
-       cd $(WORKDIR)/packages/boost; \
+       cd $(WORKDIR)/packages/boost1.68.0; \
        make clean
 
 clean__template:
@@ -109,9 +109,9 @@ linux32_package:
        cp $(WORKDIR)/src/start__template $(WORKDIR)/install_package/linux32/
        cp $(WORKDIR)/src/start__template.desktop $(WORKDIR)/install_package/linux32/
        cp $(WORKDIR)/src/Icon.png $(WORKDIR)/install_package/linux32/
-       tar -zcvf $(WORKDIR)/install_package/install_linux32 -C $(WORKDIR)/install_package/linux32/ .
-       $(WORKDIR)/scripts/gen_package_linux.sh $(WORKDIR)/install_package/install_linux32
-       rm $(WORKDIR)/install_package/install_linux32 
+       tar -zcvf $(WORKDIR)/install_package/install__template_linux32 -C $(WORKDIR)/install_package/linux32/ .
+       $(WORKDIR)/scripts/gen_package_linux.sh $(WORKDIR)/install_package/install__template_linux32
+       rm $(WORKDIR)/install_package/install__template_linux32 
 
 linux_arm_package:
        mkdir -p $(WORKDIR)/install_package/linux_arm/lib
@@ -121,16 +121,16 @@ linux_arm_package:
        cp $(WORKDIR)/src/start__template $(WORKDIR)/install_package/linux_arm/
        cp $(WORKDIR)/src/start__template.desktop $(WORKDIR)/install_package/linux_arm/
        cp $(WORKDIR)/src/Icon.png $(WORKDIR)/install_package/linux_arm/
-       tar -zcvf $(WORKDIR)/install_package/install_linux_arm -C $(WORKDIR)/install_package/linux_arm/ .
-       $(WORKDIR)/scripts/gen_package_linux.sh $(WORKDIR)/install_package/install_linux_arm
-       rm $(WORKDIR)/install_package/install_linux_arm 
+       tar -zcvf $(WORKDIR)/install_package/install__template_linux_arm -C $(WORKDIR)/install_package/linux_arm/ .
+       $(WORKDIR)/scripts/gen_package_linux.sh $(WORKDIR)/install_package/install__template_linux_arm
+       rm $(WORKDIR)/install_package/install__template_linux_arm 
 
 windows_package:
        mkdir -p $(WORKDIR)/install_package/windows/
        cp $(WORKDIR)/src/bin/Release_Windows/_template.exe $(WORKDIR)/install_package/windows/
        cd $(WORKDIR)/scripts/; \
        ./gen_package_windows.sh $(WORKDIR)/install_package/windows/*; \
-       mv ./*.exe $(WORKDIR)/install_package/install_windows.exe
+       mv ./*.exe $(WORKDIR)/install_package/install__template_windows.exe
 
 android_package:
        mkdir -p $(WORKDIR)/install_package/
index 7ec1593..dfe3e1e 100644 (file)
@@ -1,5 +1,5 @@
 # Ignore everything
-*
+./*
 
 # But not these files...
 !.gitignore
index 09b3315..8f5bb6d 100644 (file)
@@ -1,5 +1,5 @@
 # Ignore everything
-*
+./*
 
 # But not these files...
 !.gitignore
index 71e2983..b7ebe2e 100644 (file)
@@ -1,5 +1,5 @@
 # Ignore everything
-*
+./*
 
 # But not these files...
 !.gitignore
diff --git a/_template/packages/boost/.gitignore b/_template/packages/boost/.gitignore
deleted file mode 100644 (file)
index 5f2cde1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-boost_1_68_0/
diff --git a/_template/packages/boost/Makefile b/_template/packages/boost/Makefile
deleted file mode 100644 (file)
index fb27ba3..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-############################################################################
-# Workfile: Makefile
-# Author: Daniel Giritzer, S1810567004 (daniel@giritzer.eu)
-# Date: 03.12.2018
-# Description: Universal Makefile for Unix based Operating Systems
-############################################################################
-WORKDIR = $(shell pwd)
-
-MODULES=--with-system --with-date_time --with-regex --with-thread
-
-# Avaiable Modules
-# atomic, chrono, container, context, contract, coroutine, date_time, exception, fiber, filesystem, graph, graph_parallel, iostreams, locale
-# log, math, mpi, program_options, python, random, regex, serialization, signals, stacktrace, system, test, thread, timer, type_erasure, wave
-
-# Add android ndk toolchain
-ANDROID_NDK_HOME=/usr/lib/android-ndk
-export PATH := $(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/:$(PATH)
-
-all: unpack linux32 linux_arm windows android_arm
-
-unpack:
-       unzip -o boost_1_68_0.zip
-
-windows:
-       echo "using gcc : mingw : i686-w64-mingw32-g++ : <rc>/usr/bin/x86_64-w64-mingw32-windres ;" > $(WORKDIR)/boost_1_68_0/user-config.jam
-       cd $(WORKDIR)/boost_1_68_0; \
-       ./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/mingw32
-       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../include
-       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/linux32
-       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../include
-       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
-       cd $(WORKDIR)/boost_1_68_0; \
-       ./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/linux_arm
-       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../include
-       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
-       cd $(WORKDIR)/boost_1_68_0; \
-       ./bootstrap.sh; \
-       ./b2 --clean; \
-       ./b2 --user-config="user-config.jam" cflags="--sysroot=$(ANDROID_NDK_HOME)/platforms/android-23/arch-arm -I$(ANDROID_NDK_HOME)/sources/cxx-stl/llvm-libc++/libcxx/include" \
-       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/android_arm
-       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../include
-       cp -r  $(WORKDIR)/boost_1_68_0/stage/lib/* ../../lib/android_arm/
-
-clean:
-       rm -rf $(WORKDIR)/boost_1_68_0
diff --git a/_template/packages/boost/boost_1_68_0.zip b/_template/packages/boost/boost_1_68_0.zip
deleted file mode 100644 (file)
index 45d7082..0000000
Binary files a/_template/packages/boost/boost_1_68_0.zip and /dev/null differ
diff --git a/_template/packages/boost1.68.0/.gitignore b/_template/packages/boost1.68.0/.gitignore
new file mode 100644 (file)
index 0000000..b467ef3
--- /dev/null
@@ -0,0 +1,7 @@
+# Ignore everything
+./*
+
+# But not these files...
+!.gitignore
+!boost_1_68_0.zip
+!Makefile
\ No newline at end of file
diff --git a/_template/packages/boost1.68.0/Makefile b/_template/packages/boost1.68.0/Makefile
new file mode 100644 (file)
index 0000000..fb27ba3
--- /dev/null
@@ -0,0 +1,71 @@
+############################################################################
+# Workfile: Makefile
+# Author: Daniel Giritzer, S1810567004 (daniel@giritzer.eu)
+# Date: 03.12.2018
+# Description: Universal Makefile for Unix based Operating Systems
+############################################################################
+WORKDIR = $(shell pwd)
+
+MODULES=--with-system --with-date_time --with-regex --with-thread
+
+# Avaiable Modules
+# atomic, chrono, container, context, contract, coroutine, date_time, exception, fiber, filesystem, graph, graph_parallel, iostreams, locale
+# log, math, mpi, program_options, python, random, regex, serialization, signals, stacktrace, system, test, thread, timer, type_erasure, wave
+
+# Add android ndk toolchain
+ANDROID_NDK_HOME=/usr/lib/android-ndk
+export PATH := $(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/:$(PATH)
+
+all: unpack linux32 linux_arm windows android_arm
+
+unpack:
+       unzip -o boost_1_68_0.zip
+
+windows:
+       echo "using gcc : mingw : i686-w64-mingw32-g++ : <rc>/usr/bin/x86_64-w64-mingw32-windres ;" > $(WORKDIR)/boost_1_68_0/user-config.jam
+       cd $(WORKDIR)/boost_1_68_0; \
+       ./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/mingw32
+       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../include
+       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/linux32
+       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../include
+       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
+       cd $(WORKDIR)/boost_1_68_0; \
+       ./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/linux_arm
+       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../include
+       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
+       cd $(WORKDIR)/boost_1_68_0; \
+       ./bootstrap.sh; \
+       ./b2 --clean; \
+       ./b2 --user-config="user-config.jam" cflags="--sysroot=$(ANDROID_NDK_HOME)/platforms/android-23/arch-arm -I$(ANDROID_NDK_HOME)/sources/cxx-stl/llvm-libc++/libcxx/include" \
+       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/android_arm
+       cp -rf $(WORKDIR)/boost_1_68_0/boost $(WORKDIR)/../../include
+       cp -r  $(WORKDIR)/boost_1_68_0/stage/lib/* ../../lib/android_arm/
+
+clean:
+       rm -rf $(WORKDIR)/boost_1_68_0
diff --git a/_template/packages/boost1.68.0/boost_1_68_0.zip b/_template/packages/boost1.68.0/boost_1_68_0.zip
new file mode 100644 (file)
index 0000000..45d7082
Binary files /dev/null and b/_template/packages/boost1.68.0/boost_1_68_0.zip differ
diff --git a/_template/packages/fltk1.3.4/.gitignore b/_template/packages/fltk1.3.4/.gitignore
new file mode 100644 (file)
index 0000000..b4d0ec1
--- /dev/null
@@ -0,0 +1,7 @@
+# Ignore everything
+./*
+
+# But not these files...
+!.gitignore
+!fltk-1.3.4-1-source.tar.gz
+!Makefile
diff --git a/_template/packages/fltk1.3.4/Makefile b/_template/packages/fltk1.3.4/Makefile
new file mode 100644 (file)
index 0000000..9b597dd
--- /dev/null
@@ -0,0 +1,89 @@
+############################################################################
+# Workfile: Makefile
+# Author: Daniel Giritzer, S1810567004 (daniel@giritzer.eu)
+# Date: 03.12.2018
+# Description: Universal Makefile for Unix based Operating Systems
+############################################################################
+WORKDIR = $(shell pwd)
+
+# Add android ndk toolchain
+export PATH := /usr/lib/android-ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/:$(PATH)
+
+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:
+       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
+       mkdir -p $(WORKDIR)/../../lib/mingw32
+       cp -rf $(WORKDIR)/fltk-1.3.4-1/FL $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/fltk-1.3.4-1/lib/*.a $(WORKDIR)/../../lib/mingw32
+
+.PHONY: linux32
+linux32:
+       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
+       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/lib/*.a $(WORKDIR)/../../lib/linux32
+       cp -rf $(WORKDIR)/fltk-1.3.4-1/fluid/fluid $(WORKDIR)/../../tools
+
+.PHONY: linux_arm
+linux_arm:
+       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
+       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/lib/*.a $(WORKDIR)/../../lib/linux_arm
+
+.PHONY: linux_nanox
+linux_nanox:
+       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; \
+       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
+       mkdir -p $(WORKDIR)/../../lib/linux32
+       cp -rf $(WORKDIR)/fltk-1.3.4-1/FL $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/fltk-1.3.4-1/lib/*.a $(WORKDIR)/../../lib/linux32
+
+.PHONY: android_arm
+android_arm:
+       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; \
+       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
+       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/lib/*.a $(WORKDIR)/../../lib/android_arm
+
+.PHONY: clean
+clean:
+       rm -rf $(WORKDIR)/fltk-1.3.4-1
diff --git a/_template/packages/fltk1.3.4/fltk-1.3.4-1-source.tar.gz b/_template/packages/fltk1.3.4/fltk-1.3.4-1-source.tar.gz
new file mode 100644 (file)
index 0000000..c2fabc0
Binary files /dev/null and b/_template/packages/fltk1.3.4/fltk-1.3.4-1-source.tar.gz differ
diff --git a/_template/packages/fltk1.3/.gitignore b/_template/packages/fltk1.3/.gitignore
deleted file mode 100644 (file)
index 1245055..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# Ignore everything
-*
-
-# But not these files...
-!.gitignore
-!fltk-1.3.4-1-source.tar.gz
-!Makefile
diff --git a/_template/packages/fltk1.3/Makefile b/_template/packages/fltk1.3/Makefile
deleted file mode 100644 (file)
index 9b597dd..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-############################################################################
-# Workfile: Makefile
-# Author: Daniel Giritzer, S1810567004 (daniel@giritzer.eu)
-# Date: 03.12.2018
-# Description: Universal Makefile for Unix based Operating Systems
-############################################################################
-WORKDIR = $(shell pwd)
-
-# Add android ndk toolchain
-export PATH := /usr/lib/android-ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/:$(PATH)
-
-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:
-       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
-       mkdir -p $(WORKDIR)/../../lib/mingw32
-       cp -rf $(WORKDIR)/fltk-1.3.4-1/FL $(WORKDIR)/../../include
-       cp -rf $(WORKDIR)/fltk-1.3.4-1/lib/*.a $(WORKDIR)/../../lib/mingw32
-
-.PHONY: linux32
-linux32:
-       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
-       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/lib/*.a $(WORKDIR)/../../lib/linux32
-       cp -rf $(WORKDIR)/fltk-1.3.4-1/fluid/fluid $(WORKDIR)/../../tools
-
-.PHONY: linux_arm
-linux_arm:
-       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
-       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/lib/*.a $(WORKDIR)/../../lib/linux_arm
-
-.PHONY: linux_nanox
-linux_nanox:
-       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; \
-       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
-       mkdir -p $(WORKDIR)/../../lib/linux32
-       cp -rf $(WORKDIR)/fltk-1.3.4-1/FL $(WORKDIR)/../../include
-       cp -rf $(WORKDIR)/fltk-1.3.4-1/lib/*.a $(WORKDIR)/../../lib/linux32
-
-.PHONY: android_arm
-android_arm:
-       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; \
-       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
-       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/lib/*.a $(WORKDIR)/../../lib/android_arm
-
-.PHONY: clean
-clean:
-       rm -rf $(WORKDIR)/fltk-1.3.4-1
diff --git a/_template/packages/fltk1.3/fltk-1.3.4-1-source.tar.gz b/_template/packages/fltk1.3/fltk-1.3.4-1-source.tar.gz
deleted file mode 100644 (file)
index c2fabc0..0000000
Binary files a/_template/packages/fltk1.3/fltk-1.3.4-1-source.tar.gz and /dev/null differ
diff --git a/_template/packages/freetype2.9.1/.gitignore b/_template/packages/freetype2.9.1/.gitignore
new file mode 100644 (file)
index 0000000..1462b15
--- /dev/null
@@ -0,0 +1,7 @@
+# Ignore everything
+./*
+
+# But not these files...
+!.gitignore
+!freetype-2.9.1.tar.gz
+!Makefile
diff --git a/_template/packages/freetype2.9.1/Makefile b/_template/packages/freetype2.9.1/Makefile
new file mode 100644 (file)
index 0000000..4c0ee43
--- /dev/null
@@ -0,0 +1,65 @@
+############################################################################
+# Workfile: Makefile
+# Author: Daniel Giritzer, S1810567004 (daniel@giritzer.eu)
+# Date: 03.12.2018
+# Description: Universal Makefile for Unix based Operating Systems
+############################################################################
+WORKDIR = $(shell pwd)
+
+# Add android ndk toolchain
+export PATH := /usr/lib/android-ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/:$(PATH)
+
+all: unpack windows linux32 linux_arm android_arm
+
+.PHONY: unpack
+unpack:
+       tar xvzf freetype-2.9.1.tar.gz
+       cd $(WORKDIR)/freetype-2.9.1
+       
+.PHONY: windows
+windows:
+       cd $(WORKDIR)/freetype-2.9.1; \
+       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/mingw32
+       cp -rf $(WORKDIR)/freetype-2.9.1/include $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/freetype-2.9.1/objs/.libs/libfreetype.a $(WORKDIR)/../../lib/mingw32
+
+.PHONY: linux32
+linux32:
+       cd $(WORKDIR)/freetype-2.9.1; \
+       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/linux32
+       cp -rf $(WORKDIR)/freetype-2.9.1/include/* $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/freetype-2.9.1/objs/.libs/libfreetype.a $(WORKDIR)/../../lib/linux32
+
+.PHONY: linux_arm
+linux_arm:
+       cd $(WORKDIR)/freetype-2.9.1; \
+       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/linux_arm
+       cp -rf $(WORKDIR)/freetype-2.9.1/include/* $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/freetype-2.9.1/objs/.libs/libfreetype.a $(WORKDIR)/../../lib/linux_arm
+
+.PHONY: android_arm
+android_arm:
+       cd $(WORKDIR)/freetype-2.9.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" --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/android_arm
+       cp -rf $(WORKDIR)/freetype-2.9.1/include/* $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/freetype-2.9.1/objs/.libs/libfreetype.a $(WORKDIR)/../../lib/android_arm
+
+.PHONY: clean
+clean:
+       rm -rf $(WORKDIR)/freetype-2.9.1
diff --git a/_template/packages/freetype2.9.1/freetype-2.9.1.tar.gz b/_template/packages/freetype2.9.1/freetype-2.9.1.tar.gz
new file mode 100644 (file)
index 0000000..01ad8ea
Binary files /dev/null and b/_template/packages/freetype2.9.1/freetype-2.9.1.tar.gz differ
diff --git a/_template/packages/freetype2/Makefile b/_template/packages/freetype2/Makefile
deleted file mode 100644 (file)
index 4c0ee43..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-############################################################################
-# Workfile: Makefile
-# Author: Daniel Giritzer, S1810567004 (daniel@giritzer.eu)
-# Date: 03.12.2018
-# Description: Universal Makefile for Unix based Operating Systems
-############################################################################
-WORKDIR = $(shell pwd)
-
-# Add android ndk toolchain
-export PATH := /usr/lib/android-ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/:$(PATH)
-
-all: unpack windows linux32 linux_arm android_arm
-
-.PHONY: unpack
-unpack:
-       tar xvzf freetype-2.9.1.tar.gz
-       cd $(WORKDIR)/freetype-2.9.1
-       
-.PHONY: windows
-windows:
-       cd $(WORKDIR)/freetype-2.9.1; \
-       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/mingw32
-       cp -rf $(WORKDIR)/freetype-2.9.1/include $(WORKDIR)/../../include
-       cp -rf $(WORKDIR)/freetype-2.9.1/objs/.libs/libfreetype.a $(WORKDIR)/../../lib/mingw32
-
-.PHONY: linux32
-linux32:
-       cd $(WORKDIR)/freetype-2.9.1; \
-       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/linux32
-       cp -rf $(WORKDIR)/freetype-2.9.1/include/* $(WORKDIR)/../../include
-       cp -rf $(WORKDIR)/freetype-2.9.1/objs/.libs/libfreetype.a $(WORKDIR)/../../lib/linux32
-
-.PHONY: linux_arm
-linux_arm:
-       cd $(WORKDIR)/freetype-2.9.1; \
-       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/linux_arm
-       cp -rf $(WORKDIR)/freetype-2.9.1/include/* $(WORKDIR)/../../include
-       cp -rf $(WORKDIR)/freetype-2.9.1/objs/.libs/libfreetype.a $(WORKDIR)/../../lib/linux_arm
-
-.PHONY: android_arm
-android_arm:
-       cd $(WORKDIR)/freetype-2.9.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" --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/android_arm
-       cp -rf $(WORKDIR)/freetype-2.9.1/include/* $(WORKDIR)/../../include
-       cp -rf $(WORKDIR)/freetype-2.9.1/objs/.libs/libfreetype.a $(WORKDIR)/../../lib/android_arm
-
-.PHONY: clean
-clean:
-       rm -rf $(WORKDIR)/freetype-2.9.1
diff --git a/_template/packages/freetype2/freetype-2.9.1.tar.gz b/_template/packages/freetype2/freetype-2.9.1.tar.gz
deleted file mode 100644 (file)
index 01ad8ea..0000000
Binary files a/_template/packages/freetype2/freetype-2.9.1.tar.gz and /dev/null differ
diff --git a/_template/packages/googletest/.gitignore b/_template/packages/googletest/.gitignore
deleted file mode 100644 (file)
index ae10544..0000000
+++ /dev/null
@@ -1 +0,0 @@
-googletest-release-1.8.1/
diff --git a/_template/packages/googletest/Makefile b/_template/packages/googletest/Makefile
deleted file mode 100644 (file)
index 506115d..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-############################################################################
-# Workfile: Makefile
-# Author: Daniel Giritzer, S1810567004 (daniel@giritzer.eu)
-# Date: 03.12.2018
-# Description: Universal Makefile for Unix based Operating Systems
-############################################################################
-WORKDIR = $(shell pwd)
-
-# Add android ndk toolchain
-ANDROID_NDK_HOME=/usr/lib/android-ndk
-export PATH := $(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/:$(PATH)
-
-all: unpack windows linux32 linux_arm
-
-.PHONY: unpack
-unpack:
-       unzip -o googletest-release-1.8.1.zip
-
-.PHONY: windows
-windows:
-       cd $(WORKDIR)/googletest-release-1.8.1; \
-       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
-       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 $(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
-
-.PHONY: linux32
-linux32:
-       cd $(WORKDIR)/googletest-release-1.8.1; \
-       make clean; \
-       autoreconf -vfi; \
-       ./configure CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32 -static-libgcc -static-libstdc++"; \
-       make -j4
-       mkdir -p $(WORKDIR)/../../include
-       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 $(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
-
-.PHONY: linux_arm
-linux_arm:
-       cd $(WORKDIR)/googletest-release-1.8.1; \
-       make clean; \
-       autoreconf -vfi; \
-       ./configure CFLAGS="" CXXFLAGS="" LDFLAGS="-static-libgcc -static-libstdc++" --host=arm-linux-gnueabihf; \
-       make -j4
-       mkdir -p $(WORKDIR)/../../include
-       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 $(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
-
-## not working...
-.PHONY: android_arm
-android_arm:
-       cd $(WORKDIR)/googletest-release-1.8.1; \
-       make clean; \
-       autoreconf -vfi; \
-       ./configure --host=arm-linux-androideabi CFLAGS="--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
-       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 $(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
-
-
-.PHONY: clean
-clean:
-       rm -rf $(WORKDIR)/googletest-release-1.8.1
-
diff --git a/_template/packages/googletest/googletest-release-1.8.1.zip b/_template/packages/googletest/googletest-release-1.8.1.zip
deleted file mode 100644 (file)
index 457af9b..0000000
Binary files a/_template/packages/googletest/googletest-release-1.8.1.zip and /dev/null differ
diff --git a/_template/packages/googletest1.8.1/.gitignore b/_template/packages/googletest1.8.1/.gitignore
new file mode 100644 (file)
index 0000000..33e52c4
--- /dev/null
@@ -0,0 +1,7 @@
+# Ignore everything
+./*
+
+# But not these files...
+!.gitignore
+!googletest-release-1.8.1.zip
+!Makefile
\ No newline at end of file
diff --git a/_template/packages/googletest1.8.1/Makefile b/_template/packages/googletest1.8.1/Makefile
new file mode 100644 (file)
index 0000000..506115d
--- /dev/null
@@ -0,0 +1,80 @@
+############################################################################
+# Workfile: Makefile
+# Author: Daniel Giritzer, S1810567004 (daniel@giritzer.eu)
+# Date: 03.12.2018
+# Description: Universal Makefile for Unix based Operating Systems
+############################################################################
+WORKDIR = $(shell pwd)
+
+# Add android ndk toolchain
+ANDROID_NDK_HOME=/usr/lib/android-ndk
+export PATH := $(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/:$(PATH)
+
+all: unpack windows linux32 linux_arm
+
+.PHONY: unpack
+unpack:
+       unzip -o googletest-release-1.8.1.zip
+
+.PHONY: windows
+windows:
+       cd $(WORKDIR)/googletest-release-1.8.1; \
+       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
+       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 $(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
+
+.PHONY: linux32
+linux32:
+       cd $(WORKDIR)/googletest-release-1.8.1; \
+       make clean; \
+       autoreconf -vfi; \
+       ./configure CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32 -static-libgcc -static-libstdc++"; \
+       make -j4
+       mkdir -p $(WORKDIR)/../../include
+       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 $(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
+
+.PHONY: linux_arm
+linux_arm:
+       cd $(WORKDIR)/googletest-release-1.8.1; \
+       make clean; \
+       autoreconf -vfi; \
+       ./configure CFLAGS="" CXXFLAGS="" LDFLAGS="-static-libgcc -static-libstdc++" --host=arm-linux-gnueabihf; \
+       make -j4
+       mkdir -p $(WORKDIR)/../../include
+       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 $(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
+
+## not working...
+.PHONY: android_arm
+android_arm:
+       cd $(WORKDIR)/googletest-release-1.8.1; \
+       make clean; \
+       autoreconf -vfi; \
+       ./configure --host=arm-linux-androideabi CFLAGS="--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
+       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 $(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
+
+
+.PHONY: clean
+clean:
+       rm -rf $(WORKDIR)/googletest-release-1.8.1
+
diff --git a/_template/packages/googletest1.8.1/googletest-release-1.8.1.zip b/_template/packages/googletest1.8.1/googletest-release-1.8.1.zip
new file mode 100644 (file)
index 0000000..457af9b
Binary files /dev/null and b/_template/packages/googletest1.8.1/googletest-release-1.8.1.zip differ
diff --git a/_template/packages/libao/.gitignore b/_template/packages/libao/.gitignore
deleted file mode 100644 (file)
index 3a0c00e..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# Ignore everything
-*
-
-# But not these files...
-!.gitignore
-!libao-1.2.2.tar.gz
-!Makefile
\ No newline at end of file
diff --git a/_template/packages/libao/Makefile b/_template/packages/libao/Makefile
deleted file mode 100644 (file)
index 00c0615..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-############################################################################
-# Workfile: Makefile
-# Author: Daniel Giritzer, S1810567004 (daniel@giritzer.eu)
-# Date: 03.12.2018
-# Description: Universal Makefile for Unix based Operating Systems
-# For Linux please use libao of your distribution!
-############################################################################
-WORKDIR = $(shell pwd)
-
-all: unpack windows
-
-.PHONY: unpack
-unpack:
-       tar xvzf libao-1.2.2.tar.gz
-
-.PHONY: windows
-windows:
-       cd $(WORKDIR)/libao-1.2.2; \
-       ./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/mingw32
-       cp -rf $(WORKDIR)/libao-1.2.2/include/ao $(WORKDIR)/../../include
-       cp -rf $(WORKDIR)/libao-1.2.2/src/.libs/libao.a $(WORKDIR)/../../lib/mingw32
-
-.PHONY: linux_dont_build_me
-linux_dont_build_me:
-       cd $(WORKDIR)/libao-1.2.2; \
-       ./autogen.sh; \
-       ./configure CFLAGS='-m32 -static -static-libgcc -static-libstdc++' --enable-static --enable-pulse --enable-alsa --enable-alsa-mmap; \
-       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/linux32
-       cp -rf $(WORKDIR)/libao-1.2.2/include/ao $(WORKDIR)/../../include
-       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
-
-.PHONY: clean
-clean:
-       rm -rf $(WORKDIR)/libao-1.2.2;
diff --git a/_template/packages/libao/libao-1.2.2.tar.gz b/_template/packages/libao/libao-1.2.2.tar.gz
deleted file mode 100644 (file)
index 2c424d3..0000000
Binary files a/_template/packages/libao/libao-1.2.2.tar.gz and /dev/null differ
diff --git a/_template/packages/libao1.2.2/.gitignore b/_template/packages/libao1.2.2/.gitignore
new file mode 100644 (file)
index 0000000..bb11cbb
--- /dev/null
@@ -0,0 +1,7 @@
+# Ignore everything
+./*
+
+# But not these files...
+!.gitignore
+!libao-1.2.2.tar.gz
+!Makefile
\ No newline at end of file
diff --git a/_template/packages/libao1.2.2/Makefile b/_template/packages/libao1.2.2/Makefile
new file mode 100644 (file)
index 0000000..00c0615
--- /dev/null
@@ -0,0 +1,44 @@
+############################################################################
+# Workfile: Makefile
+# Author: Daniel Giritzer, S1810567004 (daniel@giritzer.eu)
+# Date: 03.12.2018
+# Description: Universal Makefile for Unix based Operating Systems
+# For Linux please use libao of your distribution!
+############################################################################
+WORKDIR = $(shell pwd)
+
+all: unpack windows
+
+.PHONY: unpack
+unpack:
+       tar xvzf libao-1.2.2.tar.gz
+
+.PHONY: windows
+windows:
+       cd $(WORKDIR)/libao-1.2.2; \
+       ./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/mingw32
+       cp -rf $(WORKDIR)/libao-1.2.2/include/ao $(WORKDIR)/../../include
+       cp -rf $(WORKDIR)/libao-1.2.2/src/.libs/libao.a $(WORKDIR)/../../lib/mingw32
+
+.PHONY: linux_dont_build_me
+linux_dont_build_me:
+       cd $(WORKDIR)/libao-1.2.2; \
+       ./autogen.sh; \
+       ./configure CFLAGS='-m32 -static -static-libgcc -static-libstdc++' --enable-static --enable-pulse --enable-alsa --enable-alsa-mmap; \
+       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/linux32
+       cp -rf $(WORKDIR)/libao-1.2.2/include/ao $(WORKDIR)/../../include
+       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
+
+.PHONY: clean
+clean:
+       rm -rf $(WORKDIR)/libao-1.2.2;
diff --git a/_template/packages/libao1.2.2/libao-1.2.2.tar.gz b/_template/packages/libao1.2.2/libao-1.2.2.tar.gz
new file mode 100644 (file)
index 0000000..2c424d3
Binary files /dev/null and b/_template/packages/libao1.2.2/libao-1.2.2.tar.gz differ
diff --git a/_template/packages/libsndfile/.gitignore b/_template/packages/libsndfile/.gitignore
deleted file mode 100644 (file)
index 252ef37..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# Ignore everything
-*
-
-# But not these files...
-!.gitignore
-!libsndfile-1.0.28.tar.gz
-!Makefile
\ No newline at end of file
diff --git a/_template/packages/libsndfile/Makefile b/_template/packages/libsndfile/Makefile
deleted file mode 100644 (file)
index c721de0..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-############################################################################
-# Workfile: Makefile
-# Author: Daniel Giritzer, S1810567004 (daniel@giritzer.eu)
-# Date: 03.12.2018
-# Description: Universal Makefile for Unix based Operating Systems
-############################################################################
-WORKDIR = $(shell pwd)
-
-# Add android ndk toolchain
-ANDROID_NDK_HOME=/usr/lib/android-ndk
-export PATH := $(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/:$(PATH)
-
-all: unpack windows linux32 linux_arm
-
-.PHONY: unpack
-unpack:
-       tar xvzf libsndfile-1.0.28.tar.gz
-
-.PHONY: windows
-windows:
-       cd $(WORKDIR)/libsndfile-1.0.28; \
-       make clean; \
-       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/mingw32
-       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/sndfile.h $(WORKDIR)/../../include
-       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
-
-.PHONY: linux32
-linux32:
-       cd $(WORKDIR)/libsndfile-1.0.28; \
-       make clean; \
-       autoreconf -vfi; \
-       ./configure CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32 -static -static-libgcc -static-libstdc++"; \
-       make -j4
-       mkdir -p $(WORKDIR)/../../include
-       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/.libs/libsndfile.a $(WORKDIR)/../../lib/linux32
-       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/.libs/libcommon.a $(WORKDIR)/../../lib/linux32
-
-.PHONY: linux_arm
-linux_arm:
-       cd $(WORKDIR)/libsndfile-1.0.28; \
-       make clean; \
-       autoreconf -vfi; \
-       ./configure CFLAGS="" CXXFLAGS="" LDFLAGS="-static-libgcc -static-libstdc++" --host=arm-linux-gnueabihf; \
-       make -j4
-       mkdir -p $(WORKDIR)/../../include
-       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/.libs/libsndfile.a $(WORKDIR)/../../lib/linux_arm
-       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/.libs/libcommon.a $(WORKDIR)/../../lib/linux_arm
-
-.PHONY: android_arm
-android_arm:
-       cd $(WORKDIR)/libsndfile-1.0.28; \
-       make clean; \
-       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/android_arm
-       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/sndfile.h $(WORKDIR)/../../include
-       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
-
-.PHONY: clean
-clean:
-       rm -rf $(WORKDIR)/libsndfile-1.0.28
diff --git a/_template/packages/libsndfile/libsndfile-1.0.28.tar.gz b/_template/packages/libsndfile/libsndfile-1.0.28.tar.gz
deleted file mode 100644 (file)
index a184f3b..0000000
Binary files a/_template/packages/libsndfile/libsndfile-1.0.28.tar.gz and /dev/null differ
diff --git a/_template/packages/libsndfile1.0.28/.gitignore b/_template/packages/libsndfile1.0.28/.gitignore
new file mode 100644 (file)
index 0000000..b4b115d
--- /dev/null
@@ -0,0 +1,7 @@
+# Ignore everything
+./*
+
+# But not these files...
+!.gitignore
+!libsndfile-1.0.28.tar.gz
+!Makefile
\ No newline at end of file
diff --git a/_template/packages/libsndfile1.0.28/Makefile b/_template/packages/libsndfile1.0.28/Makefile
new file mode 100644 (file)
index 0000000..c721de0
--- /dev/null
@@ -0,0 +1,73 @@
+############################################################################
+# Workfile: Makefile
+# Author: Daniel Giritzer, S1810567004 (daniel@giritzer.eu)
+# Date: 03.12.2018
+# Description: Universal Makefile for Unix based Operating Systems
+############################################################################
+WORKDIR = $(shell pwd)
+
+# Add android ndk toolchain
+ANDROID_NDK_HOME=/usr/lib/android-ndk
+export PATH := $(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/:$(PATH)
+
+all: unpack windows linux32 linux_arm
+
+.PHONY: unpack
+unpack:
+       tar xvzf libsndfile-1.0.28.tar.gz
+
+.PHONY: windows
+windows:
+       cd $(WORKDIR)/libsndfile-1.0.28; \
+       make clean; \
+       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/mingw32
+       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/sndfile.h $(WORKDIR)/../../include
+       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
+
+.PHONY: linux32
+linux32:
+       cd $(WORKDIR)/libsndfile-1.0.28; \
+       make clean; \
+       autoreconf -vfi; \
+       ./configure CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32 -static -static-libgcc -static-libstdc++"; \
+       make -j4
+       mkdir -p $(WORKDIR)/../../include
+       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/.libs/libsndfile.a $(WORKDIR)/../../lib/linux32
+       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/.libs/libcommon.a $(WORKDIR)/../../lib/linux32
+
+.PHONY: linux_arm
+linux_arm:
+       cd $(WORKDIR)/libsndfile-1.0.28; \
+       make clean; \
+       autoreconf -vfi; \
+       ./configure CFLAGS="" CXXFLAGS="" LDFLAGS="-static-libgcc -static-libstdc++" --host=arm-linux-gnueabihf; \
+       make -j4
+       mkdir -p $(WORKDIR)/../../include
+       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/.libs/libsndfile.a $(WORKDIR)/../../lib/linux_arm
+       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/.libs/libcommon.a $(WORKDIR)/../../lib/linux_arm
+
+.PHONY: android_arm
+android_arm:
+       cd $(WORKDIR)/libsndfile-1.0.28; \
+       make clean; \
+       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/android_arm
+       cp -rf $(WORKDIR)/libsndfile-1.0.28/src/sndfile.h $(WORKDIR)/../../include
+       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
+
+.PHONY: clean
+clean:
+       rm -rf $(WORKDIR)/libsndfile-1.0.28
diff --git a/_template/packages/libsndfile1.0.28/libsndfile-1.0.28.tar.gz b/_template/packages/libsndfile1.0.28/libsndfile-1.0.28.tar.gz
new file mode 100644 (file)
index 0000000..a184f3b
Binary files /dev/null and b/_template/packages/libsndfile1.0.28/libsndfile-1.0.28.tar.gz differ
index 56c8a86..ee5d336 100644 (file)
@@ -1,5 +1,5 @@
 # Ignore everything
-*
+./*
 
 # But not these files...
 !.gitignore
diff --git a/_template/packages/tinyxml/.gitignore b/_template/packages/tinyxml/.gitignore
deleted file mode 100644 (file)
index 3747c55..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# Ignore everything
-*
-
-# But not these files...
-!.gitignore
-!tinyxml-2.src.zip
-!Makefile
diff --git a/_template/packages/tinyxml/Makefile b/_template/packages/tinyxml/Makefile
deleted file mode 100644 (file)
index 25bb77e..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-############################################################################
-# Workfile: Makefile
-# Author: Daniel Giritzer, S1810567004 (daniel@giritzer.eu)
-# Date: 03.12.2018
-# Description: Universal Makefile for Unix based Operating Systems
-############################################################################
-WORKDIR = $(shell pwd)
-
-# Add android ndk toolchain
-ANDROID_NDK_HOME=/usr/lib/android-ndk
-export PATH := $(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/:$(PATH)
-
-all: unpack windows linux32 linux_arm android_arm
-
-.PHONY: unpack
-unpack:
-       unzip -o  tinyxml-2.src.zip
-
-.PHONY: windows
-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/mingw32
-       cp -rf $(WORKDIR)/tinyxml2-master/libtinyxml2.a $(WORKDIR)/../../lib/mingw32
-       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../include
-
-.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/linux32
-       cp -rf $(WORKDIR)/tinyxml2-master/libtinyxml2.a $(WORKDIR)/../../lib/linux32
-       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../include
-
-.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/linux_arm
-       cp -rf $(WORKDIR)/tinyxml2-master/libtinyxml2.a $(WORKDIR)/../../lib/linux_arm
-       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../include
-
-.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/android_arm
-       cp -rf $(WORKDIR)/tinyxml2-master/libtinyxml2.a $(WORKDIR)/../../lib/android_arm
-       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../include
-
-.PHONY: clean
-clean:
-       rm -rf $(WORKDIR)/tinyxml2-master
diff --git a/_template/packages/tinyxml/tinyxml-2.src.zip b/_template/packages/tinyxml/tinyxml-2.src.zip
deleted file mode 100644 (file)
index 0c92ffa..0000000
Binary files a/_template/packages/tinyxml/tinyxml-2.src.zip and /dev/null differ
diff --git a/_template/packages/tinyxml2/.gitignore b/_template/packages/tinyxml2/.gitignore
new file mode 100644 (file)
index 0000000..b9bca15
--- /dev/null
@@ -0,0 +1,7 @@
+# Ignore everything
+./*
+
+# But not these files...
+!.gitignore
+!tinyxml-2.src.zip
+!Makefile
diff --git a/_template/packages/tinyxml2/Makefile b/_template/packages/tinyxml2/Makefile
new file mode 100644 (file)
index 0000000..25bb77e
--- /dev/null
@@ -0,0 +1,61 @@
+############################################################################
+# Workfile: Makefile
+# Author: Daniel Giritzer, S1810567004 (daniel@giritzer.eu)
+# Date: 03.12.2018
+# Description: Universal Makefile for Unix based Operating Systems
+############################################################################
+WORKDIR = $(shell pwd)
+
+# Add android ndk toolchain
+ANDROID_NDK_HOME=/usr/lib/android-ndk
+export PATH := $(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/:$(PATH)
+
+all: unpack windows linux32 linux_arm android_arm
+
+.PHONY: unpack
+unpack:
+       unzip -o  tinyxml-2.src.zip
+
+.PHONY: windows
+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/mingw32
+       cp -rf $(WORKDIR)/tinyxml2-master/libtinyxml2.a $(WORKDIR)/../../lib/mingw32
+       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../include
+
+.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/linux32
+       cp -rf $(WORKDIR)/tinyxml2-master/libtinyxml2.a $(WORKDIR)/../../lib/linux32
+       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../include
+
+.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/linux_arm
+       cp -rf $(WORKDIR)/tinyxml2-master/libtinyxml2.a $(WORKDIR)/../../lib/linux_arm
+       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../include
+
+.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/android_arm
+       cp -rf $(WORKDIR)/tinyxml2-master/libtinyxml2.a $(WORKDIR)/../../lib/android_arm
+       cp -rf $(WORKDIR)/tinyxml2-master/tinyxml2.h $(WORKDIR)/../../include
+
+.PHONY: clean
+clean:
+       rm -rf $(WORKDIR)/tinyxml2-master
diff --git a/_template/packages/tinyxml2/tinyxml-2.src.zip b/_template/packages/tinyxml2/tinyxml-2.src.zip
new file mode 100644 (file)
index 0000000..0c92ffa
Binary files /dev/null and b/_template/packages/tinyxml2/tinyxml-2.src.zip differ
index d6bcdd2..b64dd58 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -1,11 +1,64 @@
 #!/bin/bash
+#######################################
+# Author: Daniel Giritzer
+# E-Mail: daniel@giritzer.eu
+# Remarks: Tested with debian 9 stretch
+#######################################
 
-if [ "$#" -ne 1 ]; then
-    echo "Usage: setup.sh name_of_project"
-    exit 1
-fi
+## Create new template
+setup(){
+       cp -rf ./_template ./$1
+       find ./$1 ! -name '*.zip' ! -name '*.tar.gz' -type f -exec sed -i 's/_template/'"$1"'/g' {} \;
+       find ./$1 -depth -name '*_template*' -exec rename 's/_template/'"$1"'/' {} ";"
+}
 
-cp -rf ./_template ./$1
-find ./$1 -type f -exec sed -i 's/_template/'"$1"'/g' {} \;
-find ./$1 -depth -name '*_template*' -exec rename 's/_template/'"$1"'/' {} ";"
+
+## Install and setup your Debian system for this template
+install_deps(){
+       # add architectures
+       sudo dpkg --add-architecture i386
+       sudo dpkg --add-architecture armhf
+       sudo apt update
+
+       # install packages
+       sudo apt install -y rename sed make cmake libtool autoconf automake \
+       build-essential gcc-multilib g++-multilib libasound2-dev:i386 libx11-dev:i386 \
+       crossbuild-essential-armhf libasound2-dev:armhf libx11-dev:armhf qemu-user-static \
+       mingw-w64 binutils-mingw-w64 p7zip-full \
+       wine wine32 wine64 libwine libwine:i386 fonts-wine wine-binfmt \
+       android-sdk google-android-ndk-installer android-sdk-platform-23
+
+       # register .exe files to be executed via wine
+       sudo update-binfmts --import /usr/share/binfmts/wine
+
+       # create debug keystore to sign android packages
+       mkdir ~/.android
+       cd ~/.android
+       keytool -genkey -v -keystore debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000
+}
+
+case "$1" in
+  setup)
+       if [ "$#" -ne 2 ]; then
+               echo "Usage: setup.sh setup [name_of_project]"
+               exit 1
+       fi
+       setup $2
+        ;;
+
+  install_deps)
+       install_deps
+        ;;
+
+  *)
+        echo "Usage: ./setup.sh [option] [parameter]"
+        echo "........................"
+        echo "avaiable options:"
+       echo "setup        - Create new project. (pass as parameter your project name.)"
+       echo "install_deps - Install and setup all needed dependencies (cross compilers etc.)."
+        echo "........................"
+       echo "(c) Daniel Giritzer 2019"
+        ;;
+esac
+: