Reimplement system to simplify build and not depend on icu

ossia · May 27, 2024 · d592621 · d592621
1 parent 8f1fcc0
commit d592621
Show file tree

Hide file tree

Showing 2 changed files with 374 additions and 54 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,63 +12,44 @@ project(score_addon_contextfree LANGUAGES CXX)
 
 add_library(contextfree STATIC
    3rdparty/context-free/src-common/abstractPngCanvas.cpp
-   3rdparty/context-free/src-common/aggCanvas.cpp
-   3rdparty/context-free/src-common/ast.cpp
-   3rdparty/context-free/src-common/astexpression.cpp
-   3rdparty/context-free/src-common/astreplacement.cpp
-   3rdparty/context-free/src-common/bounds.cpp
-   3rdparty/context-free/src-common/builder.cpp
-   3rdparty/context-free/src-common/cfdg.cpp
-   3rdparty/context-free/src-common/cfdgimpl.cpp
-  # 3rdparty/context-free/src-common/CFscintilla.cpp
-   3rdparty/context-free/src-common/CmdInfo.cpp
-   3rdparty/context-free/src-common/commandLineSystem.cpp
-   3rdparty/context-free/src-common/ffCanvas.cpp
-   3rdparty/context-free/src-common/ffCanvasDummy.cpp
-   3rdparty/context-free/src-common/HSBColor.cpp
-   3rdparty/context-free/src-common/makeCFfilename.cpp
-   3rdparty/context-free/src-common/pathIterator.cpp
-   3rdparty/context-free/src-common/prettyint.cpp
-   3rdparty/context-free/src-common/primShape.cpp
-   3rdparty/context-free/src-common/Rand64.cpp
-   3rdparty/context-free/src-common/rendererAST.cpp
-   3rdparty/context-free/src-common/renderimpl.cpp
-   3rdparty/context-free/src-common/shape.cpp
-   3rdparty/context-free/src-common/shapeSTL.cpp
-   3rdparty/context-free/src-common/stacktype.cpp
-   3rdparty/context-free/src-common/SVGCanvas.cpp
-   3rdparty/context-free/src-common/tempfile.cpp
- # 3rdparty/context-free/src-common/test.cpp
- # 3rdparty/context-free/src-common/test-main.cpp
- # 3rdparty/context-free/src-common/test-test.cpp
-   3rdparty/context-free/src-common/tiledCanvas.cpp
-   3rdparty/context-free/src-common/upload.cpp
-   3rdparty/context-free/src-common/variation.cpp
+    3rdparty/context-free/src-common/aggCanvas.cpp
+    3rdparty/context-free/src-common/ast.cpp
+    3rdparty/context-free/src-common/astexpression.cpp
+    3rdparty/context-free/src-common/astreplacement.cpp
+    3rdparty/context-free/src-common/bounds.cpp
+    3rdparty/context-free/src-common/builder.cpp
+    3rdparty/context-free/src-common/cfdg.cpp
+    3rdparty/context-free/src-common/cfdgimpl.cpp
+    3rdparty/context-free/src-common/CmdInfo.cpp
+    3rdparty/context-free/src-common/HSBColor.cpp
+    3rdparty/context-free/src-common/makeCFfilename.cpp
+    3rdparty/context-free/src-common/pathIterator.cpp
+    3rdparty/context-free/src-common/prettyint.cpp
+    3rdparty/context-free/src-common/primShape.cpp
+    3rdparty/context-free/src-common/Rand64.cpp
+    3rdparty/context-free/src-common/rendererAST.cpp
+    3rdparty/context-free/src-common/renderimpl.cpp
+    3rdparty/context-free/src-common/shape.cpp
+    3rdparty/context-free/src-common/shapeSTL.cpp
+    3rdparty/context-free/src-common/stacktype.cpp
+    3rdparty/context-free/src-common/tempfile.cpp
+    3rdparty/context-free/src-common/tiledCanvas.cpp
+    3rdparty/context-free/src-common/variation.cpp
 
-   3rdparty/context-free/src-agg/src/agg_bezier_arc.cpp
-   3rdparty/context-free/src-agg/src/agg_color_rgba.cpp
-   3rdparty/context-free/src-agg/src/agg_curves.cpp
-   3rdparty/context-free/src-agg/src/agg_trans_affine.cpp
-   3rdparty/context-free/src-agg/src/agg_vcgen_contour.cpp
-   3rdparty/context-free/src-agg/src/agg_vcgen_stroke.cpp
+    3rdparty/context-free/src-agg/src/agg_bezier_arc.cpp
+    3rdparty/context-free/src-agg/src/agg_color_rgba.cpp
+    3rdparty/context-free/src-agg/src/agg_curves.cpp
+    3rdparty/context-free/src-agg/src/agg_trans_affine.cpp
+    3rdparty/context-free/src-agg/src/agg_vcgen_contour.cpp
+    3rdparty/context-free/src-agg/src/agg_vcgen_stroke.cpp
 
-   3rdparty/context-free/src-win/derived/cfdg.tab.cpp
-   3rdparty/context-free/src-win/derived/lex.yy.cpp
+    3rdparty/context-free/src-win/derived/cfdg.tab.cpp
+    3rdparty/context-free/src-win/derived/lex.yy.cpp
 )
 
 if(MSVC)
-endif()
-if(APPLE)
-  target_compile_options(contextfree PRIVATE -fno-char8_t)
-endif()
-if(UNIX AND NOT APPLE)
-  target_sources(contextfree PRIVATE
-    3rdparty/context-free/src-unix/posixSystem.cpp
-    3rdparty/context-free/src-unix/posixTimer.cpp
-    3rdparty/context-free/src-unix/posixVersion.cpp
-  )
+else()
   target_compile_options(contextfree PRIVATE -fno-char8_t)
-  target_link_libraries(contextfree PRIVATE icui18n icuuc icudata)
 endif()
 
 target_include_directories(contextfree