From f053ecde0496e538f4fef939edeea9fb6786f121 Mon Sep 17 00:00:00 2001
From: George Sokianos <walkero@gmail.com>
Date: Mon, 26 Sep 2022 14:28:59 +0100
Subject: [PATCH] Makefiles cleanup and readme updated

---
 Makefile.mos    |  4 ++--
 Makefile.os4    | 16 +++++++++++-----
 README_Amiga.md | 11 ++++++++++-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Makefile.mos b/Makefile.mos
index dabd3d47..02171eb8 100644
--- a/Makefile.mos
+++ b/Makefile.mos
@@ -38,10 +38,10 @@ LiteXL: $(LiteXL_OBJ)
 	@echo "Compiling $<"
 	@$(compiler) -c $< -o $*.o $(CFLAGS) $(INCPATH) $(DFLAGS)
 
-src/dirmonitor.o: src/dirmonitor.c src/platform/amigaos4.h
+src/dirmonitor.o: src/dirmonitor.c src/platform/morphos.h
 
 src/main.o: src/main.c src/api/api.h src/rencache.h \
-	src/renderer.h src/platform/amigaos4.h src/dirmonitor.h
+	src/renderer.h src/platform/morphos.h src/dirmonitor.h
 
 src/rencache.o: src/rencache.c
 
diff --git a/Makefile.os4 b/Makefile.os4
index 32eef1b4..51031b68 100644
--- a/Makefile.os4
+++ b/Makefile.os4
@@ -14,14 +14,20 @@ outfile := lite
 compiler := gcc
 cxxcompiler := g++
 
-INCPATH := -Isrc -Ilib/dmon -I/sdk/local/newlib/include/SDL2 -I/sdk/local/common/include/freetype2
+INCPATH := -Isrc -Ilib/dmon -I/sdk/local/newlib/include/SDL2 \
+	-I/sdk/local/common/include/lua52 -I/sdk/local/common/include/freetype2
+	
 DFLAGS := -D__USE_INLINE__ -DLITE_XL_DATA_USE_EXEDIR
 # -DLITE_USE_SDL_RENDERER
 # -Wextra -Wall
-CFLAGS :=  -Werror -Wwrite-strings -O3 -g -std=gnu11 -fno-strict-aliasing
+
+CFLAGS :=  -Werror -Wwrite-strings -O2 -g -gstabs -std=gnu11 -fno-strict-aliasing
 # "-gstabs -finstrument-functions -fno-inline -DPROFILING"
-LFLAGS := -mcrt=newlib -static-libgcc -static-libstdc++ -lauto -lpcre2 -lSDL2 -llua -lagg -lfreetype -lm -lunix -lpthread -athread=native
-# " -lprofyle"
+
+LFLAGS := -mcrt=newlib -static-libgcc -static-libstdc++ -lauto \
+	-lpcre2 -lSDL2 -llua52 -lagg -lfreetype -lz -lm \
+	-lpthread -athread=native -gstabs
+# -lprofyle
 
 
 
@@ -35,7 +41,7 @@ clean:
 
 LiteXL: $(LiteXL_OBJ)
 	@echo "Linking LiteXL"
-	@$(cxxcompiler) -o $(outfile) $(LiteXL_OBJ) $(LFLAGS)	
+	@$(compiler) -o $(outfile) $(LiteXL_OBJ) $(LFLAGS)	
 
 
 .c.o:
diff --git a/README_Amiga.md b/README_Amiga.md
index 78bdff08..87aa2f87 100644
--- a/README_Amiga.md
+++ b/README_Amiga.md
@@ -197,11 +197,20 @@ https://git.walkero.gr/walkero/lite-xl/issues
 
 ## [2.0.3r3] - future
 ### Fixed
-- Fixed non existing path crashes on OS4
+- Fixed non existing path crashes on OS4 and MorphOS
 - Fixed editor refresh whenever init.lua is changed, no matter the working 
   folder
 - Fixed an issue when the user added a directory in the project that
   already existed
+- Fixed locale issue on start for MorphOS. Now it should start just fine
+  no matter what locale the user has on his system.
+- Fixed "Find" on MorphOS that was not working (shortcut CTRL+F)
+- If the user selects to change the project folder and inserts Sys: or any
+  partition name, the included folders will be listed as suggestions
+  
+### Changed
+- Removed linking with unix on OS4 build
+- Makefiles updated
 
 ## [2.0.3r2] - 2022-06-18
 ### Added