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/morphos.h
+src/dirmonitor.o: src/dirmonitor.c src/platform/amigaos4.h
 
 src/main.o: src/main.c src/api/api.h src/rencache.h \
-	src/renderer.h src/platform/morphos.h src/dirmonitor.h
+	src/renderer.h src/platform/amigaos4.h src/dirmonitor.h
 
 src/rencache.o: src/rencache.c
 

Makefile.os4

@@ -14,20 +14,14 @@ outfile := lite
 compiler := gcc
 cxxcompiler := g++
 
-INCPATH := -Isrc -Ilib/dmon -I/sdk/local/newlib/include/SDL2 \
+INCPATH := -Isrc -Ilib/dmon -I/sdk/local/newlib/include/SDL2 -I/sdk/local/common/include/freetype2
-	-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
-LFLAGS := -mcrt=newlib -static-libgcc -static-libstdc++ -lauto \
+# " -lprofyle"
-	-lpcre2 -lSDL2 -llua52 -lagg -lfreetype -lz -lm \
-	-lpthread -athread=native -gstabs
-# -lprofyle
 
 
 
@@ -41,7 +35,7 @@ clean:
 
 LiteXL: $(LiteXL_OBJ)
 	@echo "Linking LiteXL"
-	@$(compiler) -o $(outfile) $(LiteXL_OBJ) $(LFLAGS)	
+	@$(cxxcompiler) -o $(outfile) $(LiteXL_OBJ) $(LFLAGS)	
 
 
 .c.o:

README_Amiga.md

@@ -197,20 +197,11 @@ https://git.walkero.gr/walkero/lite-xl/issues
 
 ## [2.0.3r3] - future
 ### Fixed
-- Fixed non existing path crashes on OS4 and MorphOS
+- Fixed non existing path crashes on OS4
 - 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

data/core/commands/findreplace.lua

@@ -55,7 +55,7 @@ end
 local function find(label, search_fn)
   last_view, last_sel = core.active_view,
     { core.active_view.doc:get_selection() }
-  local text = last_view.doc:get_text(table.unpack(last_sel))
+  local text = last_view.doc:get_text(unpack(last_sel))
   found_expression = false
 
   core.command_view:set_text(text, true)

data/core/common.lua

@@ -1,5 +1,7 @@
 local common = {}
 
+local mos = PLATFORM == "MORPHOS"
+
 function common.is_utf8_cont(s, offset)
   local byte = s:byte(offset or 1)
   return byte >= 0x80 and byte < 0xc0
@@ -57,7 +59,14 @@ function common.color(str)
     r = (f() or 0)
     g = (f() or 0)
     b = (f() or 0)
+    if mos then
+      a = (f() or "1.0"):gsub("%.", ",") * 0xff -- This is necessary for Lua 5.2 on MOS
+                                                -- having issues with float numbers having 
+                                                -- a dot instead of comma
+    else
       a = (f() or 1) * 0xff
+    end
+                                              
   else
     error(string.format("bad color string '%s'", str))
   end
@@ -132,7 +141,7 @@ end
 
 
 function common.path_suggest(text)
-  local path, name = text:match("^(.-)([^:/\\]*)$")
+  local path, name = text:match("^(.-)([^/\\]*)$")
   local files = system.list_dir(path == "" and "." or path) or {}
   local res = {}
   for _, file in ipairs(files) do
@@ -152,7 +161,7 @@ end
 
 
 function common.dir_path_suggest(text)
-  local path, name = text:match("^(.-)([^:/\\]*)$")
+  local path, name = text:match("^(.-)([^/\\]*)$")
   local files = system.list_dir(path == "" and "." or path) or {}
   local res = {}
   for _, file in ipairs(files) do
@@ -167,7 +176,7 @@ end
 
 
 function common.dir_list_suggest(text, dir_list)
-  local path, name = text:match("^(.-)([^:/\\]*)$")
+  local path, name = text:match("^(.-)([^/\\]*)$")
   local res = {}
   for _, dir_path in ipairs(dir_list) do
     if dir_path:lower():find(text:lower(), nil, true) == 1 then
@@ -236,7 +245,7 @@ end
 
 -- can return nil if there is no directory part in the path
 function common.dirname(path)
-  return path:match("(.+)[:\\/][^\\/]+$")
+  return path:match("(.+)[\\/][^\\/]+$")
 end
 
 
@@ -263,9 +272,6 @@ end
 
 
 function common.home_expand(text)
-  if text == nil then
-    return HOME
-  end
   return HOME and text:gsub("^~", HOME) or text
 end