Merge branch 'hs-bindgen-fixes' into dev

.gitignore

@@ -1,3 +1,4 @@
 lib
+include
 result*
 dist-newstyle

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1767609335,
+        "lastModified": 1769996383,
-        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
+        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
+        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
         "type": "github"
       },
       "original": {
@@ -25,11 +25,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1769198512,
+        "lastModified": 1770911191,
-        "narHash": "sha256-ZsQm3CwvicJBv4CMJJzRkTcYYcrghqzVabL9IehNz9k=",
+        "narHash": "sha256-fePV3+4uHg1tQH83rUO/7gQOGexHdaxyVkO2X3HkOA0=",
         "owner": "well-typed",
         "repo": "hs-bindgen",
-        "rev": "f99ed4ddfc7808b3eb28bbf089612b6a52983685",
+        "rev": "087884c110948e7bd67bec0ae8004e5396f63241",
         "type": "github"
       },
       "original": {
@@ -41,27 +41,27 @@
     "libclang-bindings-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1768982090,
+        "lastModified": 1770274896,
-        "narHash": "sha256-EgM9ZJvbM0+SQ8f9P27Rnx4dY8Q1fWtGVXsRl5f0Vfk=",
+        "narHash": "sha256-JnxJBo2L4URFD8JbpjnPG/ej/xKFe7y5ZpjnvIztwAM=",
         "owner": "well-typed",
         "repo": "libclang",
-        "rev": "27f20c2e320f779314175ee3e82072fec61b8391",
+        "rev": "155642a4a4a9f0414a058a8f08f39aa6c7bb57ed",
         "type": "github"
       },
       "original": {
         "owner": "well-typed",
         "repo": "libclang",
-        "rev": "27f20c2e320f779314175ee3e82072fec61b8391",
+        "rev": "155642a4a4a9f0414a058a8f08f39aa6c7bb57ed",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767364772,
+        "lastModified": 1770169770,
-        "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
+        "narHash": "sha256-awR8qIwJxJJiOmcEGgP2KUqYmHG4v/z8XpL9z8FnT1A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
+        "rev": "aa290c9891fa4ebe88f8889e59633d20cc06a5f2",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1765674936,
+        "lastModified": 1769909678,
-        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
+        "rev": "72716169fe93074c333e8d0173151350670b824c",
         "type": "github"
       },
       "original": {
@@ -88,11 +88,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1765772535,
+        "lastModified": 1770843696,
-        "narHash": "sha256-aq+dQoaPONOSjtFIBnAXseDm9TUhIbe215TPmkfMYww=",
+        "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "09b8fda8959d761445f12b55f380d90375a1d6bb",
+        "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16",
         "type": "github"
       },
       "original": {

flake.nix

@@ -26,7 +26,9 @@
       libXi,
       xrandr,
       # shell deps
+      clang,
       hs-bindgen-cli,
+      tree,
     }:
       mkDerivation {
         pname = "hs-rgfw";
@@ -44,9 +46,9 @@
           libXi
           xrandr
         ];
-        preBuild = ''
+        preConfigure = ''
           set -x
-          export PATH=${hs-bindgen-cli}/bin:$PATH
+          export PATH=${clang}/bin:${hs-bindgen-cli}/bin:${tree}/bin:$PATH
           ./generate.sh
           set +x
         '';

generate.sh

@@ -1,11 +1,49 @@
-echo "#"
+echo "# copying header..."
-echo "# generating library RGFW.Generated in folder lib"
+
-echo "#"
+mkdir -p lib/include
+cp rgfw/RGFW.h lib/include/RGFW.h
+
+echo "# creating flags for hs-bindgen-cli..."
+
+export CFLAGS=$(pkg-config --cflags x11 xcursor xrandr xi gl xrender xext xfixes)
+HBC_ARGS=""
+
+for token in $CFLAGS; do
+  case "$token" in
+    -I* ) HBC_ARGS="$HBC_ARGS $token" ;;
+    -D* ) HBC_ARGS="$HBC_ARGS --define-macro ${token#-D}" ;;
+    *   ) HBC_ARGS="$HBC_ARGS --clang-option $token" ;;
+  esac
+done
+
+echo "# creating c file from header..."
+
+# other macro definitions should be defined with ghc-options: -copt-D in *.cabal
+cat > lib/RGFW.c <<EOF
+#define RGFW_IMPLEMENTATION
+#include "RGFW.h"
+EOF
+
+echo "# generating library RGFW.Generated..."
+
+#  --unsafe _unsafe \
+#  --pointer _pointer \
+set -x
 hs-bindgen-cli preprocess \
-  -Irgfw \
+  -Ilib/include \
+  --unique-id andromeda.hs-rgfw \
   --create-output-dirs \
   --overwrite-files \
+  --single-file \
+  --safe _safe \
   --hs-output-dir lib \
   --module RGFW.Generated \
-  --clang-option=-DRGFW_OPENGL \
+  --define-macro=RGFW_OPENGL \
+  --define-macro=RGFW_EXPORT \
+  $HBC_ARGS \
   RGFW.h
+set +x
+
+echo "# generated filetree:"
+
+tree lib

hs-rgfw.cabal

@@ -12,16 +12,28 @@ common warnings
 
 library
   import: warnings
+  -- hs-bindgen-cli uses --single-file flag, so no other modules
   exposed-modules: RGFW.Generated
   build-depends:
     , base
     , primitive
     , c-expr-runtime
     , hs-bindgen-runtime
-  include-dirs: rgfw
+  pkgconfig-depends:
+    , gl
+    , x11
+    , xcursor
+    , xrandr
+    , xi
+  include-dirs: lib/include
   hs-source-dirs: lib
   default-language: Haskell2010
   default-extensions: FlexibleInstances
+  -- options for RGFW passed here
+  ghc-options:
+    -optc-DRGFW_OPENGL
+    -optc-DRGFW_EXPORT
+  c-sources: lib/RGFW.c
 
 executable hs-rgfw
   import: warnings
@@ -37,6 +49,6 @@ executable hs-rgfw
     , xcursor
     , xrandr
     , xi
-  include-dirs: rgfw
+  include-dirs: lib/include
   hs-source-dirs: src
   default-language: Haskell2010

src/Main.hs

@@ -1,6 +1,5 @@
 module Main where
 
-import qualified RGFW.Generated as RGFW
-
 main :: IO ()
-main = putStrLn "Hello World"
+main = do
+  putStrLn "Hello World"