Merge pull request #372 from dfordivam/wasm-865-r-p-integ
Use jsaddle-wasm for wasm32 target
commite2b846037badee035d0c466173badd1c4c474d5a
authorElliot Cameron <3noch@users.noreply.github.com>
dateWed 29 Apr 2020, 12:47 (6 years ago)
parent5807b25ed45847
reflex-dom/reflex-dom.cabal+8−3
@@ -74,13 +74,18 @@ library
7474 jsaddle,
7575 jsaddle-wkwebview
7676 else
77− if flag(webkit2gtk)
77+ if arch(wasm32)
7878 build-depends:
79− jsaddle-webkit2gtk
79+ jsaddle,
80+ jsaddle-wasm
8081 else
81− if !os(android)
82+ if flag(webkit2gtk)
8283 build-depends:
8384 jsaddle-webkit2gtk
85+ else
86+ if !os(android)
87+ build-depends:
88+ jsaddle-webkit2gtk
8489
8590 exposed-modules:
8691 Reflex.Dom
reflex-dom/src/Reflex/Dom/Internal.hs+5
@@ -80,6 +80,11 @@ run jsm = do
8080 startMainWidget a startPage jsm
8181 }
8282 forever $ threadDelay 1000000000
83+#elif defined(wasm32_HOST_ARCH)
84+import qualified Language.Javascript.JSaddle.Wasm as Wasm (run)
85+import Language.Javascript.JSaddle (JSM)
86+run :: JSM () -> IO ()
87+run = Wasm.run 0
8388#else
8489import Language.Javascript.JSaddle.WebKitGTK (run)
8590#endif