imgs

6 files changed, 51 insertions, 42 deletions

diff --git a/build-linux.sh b/build-linux.sh
index 2a6d2c1..545a940 100644
--- a/build-linux.sh
+++ b/build-linux.sh
@@ -34,18 +34,9 @@ rm -rf bin
 mkdir bin
 cd src
 
-ld -r -b binary -o ../bin/data.o \
-../data/imgs/en.png \
-../data/imgs/error.png \
-../data/imgs/folder.png \
-../data/imgs/nl.png \
-../data/imgs/search.png \
-../data/imgs/logo_64.png \
-../data/fonts/mono.ttf \
-../data/translations/en-English.mo \
-../data/translations/nl-Dutch.mo \
+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 -g -m64 -DMODE_DEVELOPER -Wno-unused-label -rdynamic -Wno-unused-variable text_search.c ../bin/data.o -o ../bin/text-search -lX11 -lGL -lGLU -lXrandr -lm -lpthread -ldl
+gcc -Wall -g -m64 -DMODE_DEVELOPER -Wno-unused-label -rdynamic -Wno-unused-variable mo_edit.c ../bin/data.o -o ../bin/mo-edit -lX11 -lGL -lGLU -lXrandr -lm -lpthread -ldl
 
 rm -f ../bin/data.o
 
@@ -58,7 +49,6 @@ cd ../
 
 if [ "$1" == "-r" ]; then
 	cd bin
-	./text-search
-#    ./text-search --directory "/home/aldrik/Projects/text-search" --filter "*.c,*.h" --text "TODO(Aldrik)" --max-file-size 200 --locale "nl" --threads 5
+	./mo-edit
 	cd ..
 fi
diff --git a/build-win.bat b/build-win.bat
index 934cccb..1ae96f2 100644
--- a/build-win.bat
+++ b/build-win.bat
@@ -9,7 +9,7 @@ ld -r -b binary -o ../bin/data.o ../data/imgs/en.png  ../data/imgs/nl.png ../dat
 
 if "%1"=="-w" (SET defs=-DMODE_DEVELOPER -DMODE_GDBDEBUG) else (SET defs=-DMODE_DEVELOPER)
 
-x86_64-w64-mingw32-gcc -m64 -Wall -g %defs% -Wno-unused-label -Wno-unused-variable mo_edit.c ../bin/data.o -o ../bin/moedit.exe ../misc/icon.res -lopengl32 -lkernel32 -lglu32 -lgdi32 -lcomdlg32 -lgdiplus -lole32 -lshlwapi
+x86_64-w64-mingw32-gcc -m64 -Wall -g %defs% -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
 
 DEL /Q "../bin/data.o"
 
@@ -18,5 +18,5 @@ echo size = %size%
 
 cd ../
 
-if "%1"=="-r" start bin/moedit.exe
-if "%1"=="-w" start gdb -ex run bin/moedit.exe
\ No newline at end of file
+if "%1"=="-r" start bin/mo-edit.exe
+if "%1"=="-w" start gdb -ex run bin/mo-edit.exe
\ No newline at end of file
diff --git a/data/marketing/main1.png b/data/marketing/main1.png
new file mode 100644
index 0000000..1a83cd6
--- /dev/null
+++ b/data/marketing/main1.png
diff --git a/data/marketing/settings1.png b/data/marketing/settings1.png
new file mode 100644
index 0000000..2bcf4fe
--- /dev/null
+++ b/data/marketing/settings1.png
diff --git a/install.sh b/install.sh
index d615539..6a10053 100644
--- a/install.sh
+++ b/install.sh
@@ -25,24 +25,15 @@ echo "Dependencies are installed"
 echo "Compiling program.."
 cd src
 
-ld -r -b binary -o ../bin/data.o \
-../data/imgs/en.png \
-../data/imgs/error.png \
-../data/imgs/folder.png \
-../data/imgs/nl.png \
-../data/imgs/search.png \
-../data/imgs/logo_64.png \
-../data/fonts/mono.ttf \
-../data/translations/en-English.mo \
-../data/translations/nl-Dutch.mo \
-
-gcc -Wall -O3 -m64 -Wno-unused-label -Wno-unused-variable text_search.c ../bin/data.o -o ../bin/text-search -lX11 -lGL -lGLU -lXrandr -lm -lpthread -ldl
+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
 
 rm -f ../bin/data.o
 
 echo "Done compiling program"
 
-cp --remove-destination ../bin/text-search /usr/local/bin/text-search
+cp --remove-destination ../bin/mo-edit /usr/local/bin/mo-edit
 
 cd ../
 
@@ -55,24 +46,15 @@ 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/error.png \
-../data/imgs/folder.png \
-../data/imgs/nl.png \
-../data/imgs/search.png \
-../data/imgs/logo_64.png \
-../data/fonts/mono.ttf \
-../data/translations/en-English.mo \
-../data/translations/nl-Dutch.mo \
+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 text_search.c ../bin/data.o -o ../bin/text-search.exe ../misc/icon.res -lopengl32 -lkernel32 -lglu32 -lgdi32 -lcomdlg32 -lgdiplus -lole32 -lshlwapi
+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
 
 rm -f ../bin/data.o
 
-echo "Done compiling program, text-search.exe is located in 'C:\Manually installed'"
+echo "Done compiling program, mo-edit.exe is located in 'C:\Manually installed'"
 
-cp --remove-destination "../bin/text-search.exe" "C:\Manually installed programs\text-search.exe"
+cp --remove-destination "../bin/mo-edit.exe" "C:\Manually installed programs\mo-edit.exe"
 
 cd ../
 
diff --git a/release.sh b/release.sh
new file mode 100644
index 0000000..85f960e
--- /dev/null
+++ b/release.sh
@@ -0,0 +1,37 @@
+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
+
+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
+
+rm -f ../bin/data.o
+cp --remove-destination ../bin/mo-edit.exe ../release/windows/mo-edit.exe