nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compiler: import counter for better stats
[nit.git]
/
src
/
ffi
/
ffi.nit
diff --git
a/src/ffi/ffi.nit
b/src/ffi/ffi.nit
index
a2dda26
..
93acf66
100644
(file)
--- a/
src/ffi/ffi.nit
+++ b/
src/ffi/ffi.nit
@@
-32,6
+32,7
@@
import c
import cpp
import java
import extra_java_files
import cpp
import java
import extra_java_files
+import objc
redef class MModule
# Does this module uses the FFI?
redef class MModule
# Does this module uses the FFI?
@@
-56,12
+57,14
@@
redef class MModule
# include dependancies FFI
for mod in header_dependencies do
# include dependancies FFI
for mod in header_dependencies do
- if mod.uses_ffi then ffi_ccu.header_custom.add("#include \"{mod.name}._ffi.h\"\n")
+ if mod.uses_ffi then ffi_ccu.header_custom.add("#include \"{mod.c_name}._ffi.h\"\n")
end
end
+ var cflags = self.cflags[""].join(" ")
+
ffi_ccu.write_as_impl(self, compdir)
for filename in ffi_ccu.files do
ffi_ccu.write_as_impl(self, compdir)
for filename in ffi_ccu.files do
- var f = new ExternCFile(filename, c_compiler_options)
+ var f = new ExternCFile(filename, cflags)
f.pkgconfigs.add_all pkgconfigs
ffi_files.add(f)
end
f.pkgconfigs.add_all pkgconfigs
ffi_files.add(f)
end
@@
-94,7
+97,7
@@
redef class AModule
language.compile_module_block(block, ffi_ccu, mmodule)
end
language.compile_module_block(block, ffi_ccu, mmodule)
end
- ffi_ccu.header_c_base.add( "#include \"{mmodule.name}._nitni.h\"\n" )
+ ffi_ccu.header_c_base.add( "#include \"{mmodule.c_name}._nitni.h\"\n" )
ffi_ccu.body_decl.add("#ifdef ANDROID\n")
ffi_ccu.body_decl.add(" #include <android/log.h>\n")
ffi_ccu.body_decl.add("#ifdef ANDROID\n")
ffi_ccu.body_decl.add(" #include <android/log.h>\n")