Work on ObjFW support in block-sys

Support for ObjFW is still not enabled, see #117 for that.

Author: madsmtm

block-sys/build.rs

@@ -47,12 +47,19 @@ fn main() {
             // work (on newer GNUStep versions these headers are present)
             if env::var_os("CARGO_FEATURE_GNUSTEP_2_0").is_none() {
                 let compat_headers =
-                    Path::new(env!("CARGO_MANIFEST_DIR")).join("gnustep-compat-headers");
+                    Path::new(env!("CARGO_MANIFEST_DIR")).join("compat-headers/gnustep");
                 cc_args.push_str(" -I");
                 cc_args.push_str(compat_headers.to_str().unwrap());
             }
         }
-        (false, false, false, true) => unimplemented!(),
+        (false, false, false, true) => {
+            // Add compability headers to make `#include <Block.h>` work.
+            let compat_headers = Path::new(env!("CARGO_MANIFEST_DIR")).join("compat-headers/objfw");
+            cc_args.push_str(" -I");
+            cc_args.push_str(compat_headers.to_str().unwrap());
+            println!("cargo:rustc-link-lib=dylib=objfw");
+            unimplemented!("ObjFW is not yet supported")
+        }
         // Checked in if-let above
         (false, false, false, false) => unreachable!(),
         (_, _, _, _) => panic!("Invalid feature combination; only one runtime may be selected!"),

block-sys/gnustep-compat-headers/Block.h renamed to block-sys/compat-headers/gnustep/Block.h

@@ -0,0 +1 @@
+#include <ObjFW/block.h>

block-sys/gnustep-compat-headers/Block_private.h renamed to block-sys/compat-headers/gnustep/Block_private.h

@@ -301,7 +301,6 @@ pub struct Block_descriptor {
 ///
 /// Requires BLOCK_HAS_SIGNATURE
 #[repr(C)]
-#[cfg(not(feature = "objfw"))]
 pub struct Block_descriptor_basic {
     pub header: Block_descriptor_header,