Mercurial Mercurial > hedgewars-draft / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make pas2c engine work with hwengine-future transitional_engine
authorunC0Rr
Thu, 29 Aug 2024 15:28:20 +0200
branchtransitional_engine
changeset 16054 274a5afc2aec
parent 16053 3402b2185698
child 16055 ce4b50823a95
Make pas2c engine work with hwengine-future
project_files/hwc/CMakeLists.txt file | annotate | diff | comparison | revisions
tools/pas2c/PascalParser.hs file | annotate | diff | comparison | revisions 
--- a/project_files/hwc/CMakeLists.txt	Thu Aug 29 12:56:16 2024 +0200
+++ b/project_files/hwc/CMakeLists.txt	Thu Aug 29 15:28:20 2024 +0200
@@ -6,8 +6,6 @@
 find_package(SDL2_image 2 REQUIRED)
 find_package(SDL2_ttf 2 REQUIRED)
 
-corrosion_import_crate(MANIFEST_PATH "${CMAKE_SOURCE_DIR}/rust/lib-hwengine-future/Cargo.toml")
-
 #compile our rtl implementation
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/rtl)
 include_directories(${PHYSFS_INCLUDE_DIR})
--- a/tools/pas2c/PascalParser.hs	Thu Aug 29 12:56:16 2024 +0200
+++ b/tools/pas2c/PascalParser.hs	Thu Aug 29 15:28:20 2024 +0200
@@ -346,6 +346,7 @@
             , try $ string "overload;"
             , try $ string "export;"
             , try $ string "varargs;"
+            , try $ string "external;"
             , try (string' "external") >> comments >> iD >> comments >>
                 optional (string' "name" >> comments >> stringLiteral pas) >> string' ";" >> return "external;"
             ]
hedgewars-draft