From 7cd84fe3adaa42ab30bb5b791c1071e97165c08f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E6=B5=AA=E7=86=8A=E7=8C=AB=E5=84=BF?=
 <shenda@ustc.edu>
Date: Fri, 14 Oct 2022 20:05:01 +0800
Subject: [PATCH 1/3] wip

---
 src/System/config.h.xmake |  2 +-
 xmake.lua                 | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/System/config.h.xmake b/src/System/config.h.xmake
index 55f1e7717..e84b5f86f 100644
--- a/src/System/config.h.xmake
+++ b/src/System/config.h.xmake
@@ -4,7 +4,7 @@
 #define DEBUG_ASSERT 1
 
 /* Enable experimental style rewriting code */
-#define EXPERIMENTAL 1
+${define EXPERIMENTAL}
 
 /* gs path relative to TEXMACS_PATH */
 #define GS_EXE "${GS_EXE}"
diff --git a/xmake.lua b/xmake.lua
index d8c027692..9407e8d38 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -17,6 +17,7 @@ includes("check_csnippets.lua")
 add_rules("mode.debug", "mode.release")
 
 set_project("TEXMACS")
+
 add_requires("libpng")
 add_requires("libiconv")
 add_requires("zlib")
@@ -161,6 +162,9 @@ target("mogan")
     add_includedirs("src/Typeset/Concat")
     add_includedirs("src/Typeset/Page")
     add_includedirs("TeXmacs/include")
+    if is_plat("macosx") then
+        add_includedirs("src/Plugins/MacOS")
+    end
 
     add_files("src/Data/**.cpp")
     add_files("src/Edit/**.cpp")
@@ -196,4 +200,14 @@ target("mogan")
     else
         add_files("src/Plugins/Unix/**.cpp")
     end
+    if is_plat("macosx") then
+        add_files("src/Plugins/MacOS/HIDRemote.m")
+        add_files("src/Plugins/MacOS/mac_images.mm")
+        add_files("src/Plugins/MacOS/mac_spellservice.mm")
+        add_files("src/Plugins/MacOS/mac_utilities.mm")
+        add_files("src/Plugins/MacOS/mac_app.mm")
+    end
     add_files("src/Plugins/Qt/**.cpp")
+
+    add_mxflags("-fno-objc-arc")
+    add_cxxflags("-include src/System/config.h")
-- 
Gitee


From ecd7cd009ad669bc1278fbc60ea74405bfd99184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E6=B5=AA=E7=86=8A=E7=8C=AB=E5=84=BF?=
 <shenda@ustc.edu>
Date: Fri, 14 Oct 2022 20:57:49 +0800
Subject: [PATCH 2/3] wip

---
 xmake.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xmake.lua b/xmake.lua
index 9407e8d38..78abaf00a 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -184,6 +184,7 @@ target("mogan")
     add_files("src/Plugins/Database/**.cpp")
     add_files("src/Plugins/Freetype/**.cpp")
     add_files("src/Plugins/Jeaiii/**.cpp")
+    add_files("src/Plugins/Pdf/**.c")
     add_files("src/Plugins/Pdf/**.cpp")
     add_files("src/Plugins/Ghostscript/**.cpp")
     add_files("src/Plugins/Imlib2/**.cpp")
-- 
Gitee


From 859c6c3bdf7ee431ddcabf105320ef321f06a5ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E6=B5=AA=E7=86=8A=E7=8C=AB=E5=84=BF?=
 <shenda@ustc.edu>
Date: Fri, 14 Oct 2022 22:07:39 +0800
Subject: [PATCH 3/3] Support macOS

---
 src/System/Link/socket_server.cpp |  5 +++++
 src/System/config.h.xmake         |  2 ++
 xmake.lua                         | 12 +++++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/System/Link/socket_server.cpp b/src/System/Link/socket_server.cpp
index 4dcbc639f..32cf393ce 100644
--- a/src/System/Link/socket_server.cpp
+++ b/src/System/Link/socket_server.cpp
@@ -58,6 +58,11 @@ make_socket_server (int port) {
   return tm_new<socket_server_rep> (port);
 }
 
+int
+number_of_servers () {
+  return N (socket_server_set);
+}
+
 void
 close_all_servers () {
 iterator<pointer> it= iterate (socket_server_set);
diff --git a/src/System/config.h.xmake b/src/System/config.h.xmake
index e84b5f86f..d64b4d624 100644
--- a/src/System/config.h.xmake
+++ b/src/System/config.h.xmake
@@ -3,6 +3,8 @@
 /* check assertions in code */
 #define DEBUG_ASSERT 1
 
+${define QTTEXMACS}
+
 /* Enable experimental style rewriting code */
 ${define EXPERIMENTAL}
 
diff --git a/xmake.lua b/xmake.lua
index 78abaf00a..c1cd57d26 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -37,10 +37,14 @@ target("mogan")
     set_policy("check.auto_ignore_flags", false)
     add_rules("qt.shared")
     add_frameworks("QtGui","QtWidgets","QtCore","QtPrintSupport","QtSvg")
-    add_packages("freetype")
-    add_packages("libcurl")
-    add_packages("libjpeg")
+    set_configvar("QTTEXMACS", 1)
+
     add_packages("libpng")
+    add_packages("libiconv")
+    add_packages("zlib")
+    add_packages("libjpeg")
+    add_packages("libcurl")
+    add_packages("freetype")
 
     ---------------------------------------------------------------------------
     -- generate config files. see also:
@@ -142,6 +146,7 @@ target("mogan")
     add_includedirs("src/Plugins/Pdf")
     add_includedirs("src/Plugins/Pdf/PDFWriter")
     add_includedirs("src/Plugins/Pdf/LibAesgm")
+    add_includedirs("src/Plugins/Qt")
     add_includedirs("src/Scheme")
     add_includedirs("src/Scheme/S7")
     add_includedirs("src/Scheme/Scheme")
@@ -209,6 +214,7 @@ target("mogan")
         add_files("src/Plugins/MacOS/mac_app.mm")
     end
     add_files("src/Plugins/Qt/**.cpp")
+    add_files("src/Plugins/Qt/**.hpp")
 
     add_mxflags("-fno-objc-arc")
     add_cxxflags("-include src/System/config.h")
-- 
Gitee