From dffb38068b91112f839298b52ff0fc365592128d Mon Sep 17 00:00:00 2001
From: Aldrik Ramaekers <aldrik.ramaekers@protonmail.com>
Date: Wed, 19 Feb 2020 17:35:00 +0100
Subject: work

---
 install.sh         | 69 ------------------------------------------------------
 release-linux.sh   | 18 ++++++++++++++
 release-windows.sh | 18 ++++++++++++++
 release.sh         | 39 ------------------------------
 src/project-base   |  2 +-
 5 files changed, 37 insertions(+), 109 deletions(-)
 delete mode 100644 install.sh
 create mode 100644 release-linux.sh
 create mode 100644 release-windows.sh
 delete mode 100755 release.sh

diff --git a/install.sh b/install.sh
deleted file mode 100644
index 07f961d..0000000
--- a/install.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-########################################################################
-########################################################################
-if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
-
-if [ "$EUID" -ne 0 ]
-  then echo "Please run this script as root."
-  exit
-fi
-
-echo "Checking if dependencies are installed.."
-if [ $(dpkg-query -W -f='${Status}' libglu1-mesa-dev 2>/dev/null | grep -c "ok installed") -eq 0 ];
-then
-  apt-get install libglu1-mesa-dev;
-fi
-
-
-if [ $(dpkg-query -W -f='${Status}' libgl1-mesa-dev 2>/dev/null | grep -c "ok installed") -eq 0 ];
-then
-  apt-get install libgl1-mesa-dev;
-fi
-echo "Dependencies are installed"
-
-echo "Compiling program.."
-cd src
-
-ld -r -b binary -o ../bin/data.o ../data/imgs/en.png  ../data/imgs/nl.png ../data/imgs/logo_64.png ../data/fonts/mono.ttf ../data/translations/en-English.mo ../data/translations/nl-Dutch.mo ../data/imgs/list.png ../data/imgs/delete.png ../data/imgs/exclaim.png ../data/imgs/add.png ../data/imgs/set.png
-
-gcc -Wall -O3 -m64 -Wno-unused-label -Wno-unused-variable mo_edit.c ../bin/data.o -o ../bin/mo-edit -lX11 -lGL -lGLU -lXrandr -lm -lpthread -ldl -lcurl
-
-rm -f ../bin/data.o
-
-echo "Done compiling program"
-
-cp --remove-destination ../bin/mo-edit /usr/local/bin/mo-edit
-
-cd ../
-
-########################################################################
-########################################################################
-elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ]; then
-
-windres misc/icon.rc -O coff -o misc/icon.res
-
-echo "Compiling program.."
-cd src
-
-ld -r -b binary -o ../bin/data.o ../data/imgs/en.png  ../data/imgs/nl.png ../data/imgs/logo_64.png ../data/fonts/mono.ttf ../data/translations/en-English.mo ../data/translations/nl-Dutch.mo ../data/imgs/list.png ../data/imgs/delete.png ../data/imgs/exclaim.png ../data/imgs/add.png ../data/imgs/set.png
-
-x86_64-w64-mingw32-gcc -Wall -m64 -O3 -Wno-unused-label -Wno-unused-variable mo_edit.c ../bin/data.o -o ../bin/mo-edit.exe ../misc/icon.res -lopengl32 -lkernel32 -lglu32 -lgdi32 -lcomdlg32 -lgdiplus -lole32 -lshlwapi -lwininet
-
-rm -f ../bin/data.o
-
-echo "Done compiling program, mo-edit.exe is located in 'C:\Manually installed'"
-
-cp --remove-destination "../bin/mo-edit.exe" "C:\Manually installed programs\mo-edit.exe"
-
-cd ../
-
-########################################################################
-########################################################################
-elif [ "$(uname)" == "Darwin" ]; then
-    echo "OSX Platform not supported"
-########################################################################
-########################################################################
-elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ]; then
-	echo "32bit Windows versions not supported"
-fi
\ No newline at end of file
diff --git a/release-linux.sh b/release-linux.sh
new file mode 100644
index 0000000..efc84ff
--- /dev/null
+++ b/release-linux.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+mkdir -p release
+rm -rf release/linux
+mkdir release/linux
+rm -rf bin
+mkdir bin
+
+cd src
+
+ld -r -b binary -o ../bin/data.o ../data/imgs/en.png  ../data/imgs/nl.png ../data/imgs/logo_64.png ../data/fonts/mono.ttf ../data/translations/en-English.mo ../data/translations/nl-Dutch.mo ../data/imgs/list.png ../data/imgs/delete.png ../data/imgs/exclaim.png ../data/imgs/add.png ../data/imgs/set.png
+
+gcc -Wall -O3 -m64 -Wno-unused-label -Wno-unused-variable mo_edit.c ../bin/data.o -o ../bin/mo-edit -lX11 -lGL -lGLU -lXrandr -lm -lpthread -ldl -lcurl
+
+rm -f ../bin/data.o
+cp --remove-destination ../bin/mo-edit ../release/linux/mo-edit
+
+cd ..
\ No newline at end of file
diff --git a/release-windows.sh b/release-windows.sh
new file mode 100644
index 0000000..d9a5daf
--- /dev/null
+++ b/release-windows.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+mkdir -p release
+rm -rf release/windows
+mkdir release/windows
+rm -rf bin
+mkdir bin
+
+cd src 
+
+ld -r -b binary -o ../bin/data.o ../data/imgs/en.png  ../data/imgs/nl.png ../data/imgs/logo_64.png ../data/fonts/mono.ttf ../data/translations/en-English.mo ../data/translations/nl-Dutch.mo ../data/imgs/list.png ../data/imgs/delete.png ../data/imgs/exclaim.png ../data/imgs/add.png ../data/imgs/set.png
+
+x86_64-w64-mingw32-gcc -Wall -m64 -O3 -Wno-unused-label -Wno-unused-variable mo_edit.c ../bin/data.o -o ../bin/mo-edit.exe ../misc/icon.res -lopengl32 -lkernel32 -lglu32 -lgdi32 -lcomdlg32 -lgdiplus -lole32 -lshlwapi -lwininet
+
+rm -f ../bin/data.o
+cp --remove-destination ../bin/mo-edit.exe ../release/windows/mo-edit.exe
+
+cd ..
\ No newline at end of file
diff --git a/release.sh b/release.sh
deleted file mode 100755
index 6b5f4e8..0000000
--- a/release.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-rm -rf release
-mkdir release
-rm -rf release/linux
-mkdir release/linux
-rm -rf release/windows
-mkdir release/windows
-rm -rf bin
-mkdir bin
-
-###################################
-# linux
-###################################
-
-cd src
-
-ld -r -b binary -o ../bin/data.o ../data/imgs/en.png  ../data/imgs/nl.png ../data/imgs/logo_64.png ../data/fonts/mono.ttf ../data/translations/en-English.mo ../data/translations/nl-Dutch.mo ../data/imgs/list.png ../data/imgs/delete.png ../data/imgs/exclaim.png ../data/imgs/add.png ../data/imgs/set.png
-
-gcc -Wall -O3 -m64 -Wno-unused-label -Wno-unused-variable mo_edit.c ../bin/data.o -o ../bin/mo-edit -lX11 -lGL -lGLU -lXrandr -lm -lpthread -ldl -lcurl
-
-rm -f ../bin/data.o
-cp --remove-destination ../bin/mo-edit ../release/linux/mo-edit
-
-cd ..
-
-
-###################################
-# windows
-###################################
-
-cd src 
-
-x86_64-w64-mingw32-ld -r -b binary -o ../bin/data.o ../data/imgs/en.png  ../data/imgs/nl.png ../data/imgs/logo_64.png ../data/fonts/mono.ttf ../data/translations/en-English.mo ../data/translations/nl-Dutch.mo ../data/imgs/list.png ../data/imgs/delete.png ../data/imgs/exclaim.png ../data/imgs/add.png ../data/imgs/set.png
-
-x86_64-w64-mingw32-gcc -Wall -m64 -O3 -Wno-unused-label -Wno-unused-variable mo_edit.c ../bin/data.o -o ../bin/mo-edit.exe ../misc/icon.res -lopengl32 -lkernel32 -lglu32 -lgdi32 -lcomdlg32 -lgdiplus -lole32 -lshlwapi -lwininet
-
-rm -f ../bin/data.o
-cp --remove-destination ../bin/mo-edit.exe ../release/windows/mo-edit.exe
-
-cd ..
\ No newline at end of file
diff --git a/src/project-base b/src/project-base
index 9458d8c..bc66a0b 160000
--- a/src/project-base
+++ b/src/project-base
@@ -1 +1 @@
-Subproject commit 9458d8cf75ecbe7657a44ada629dfa6474acf937
+Subproject commit bc66a0b5ff2777d8b2c5326a5645fe0353677bdf
-- 
cgit v1.2.3-70-g09d2