Apply interop filtering

Also actualize .def files
This commit is contained in:
Svyatoslav Scherbina
2017-04-25 15:44:22 +03:00
committed by SvyatoslavScherbina
parent c5495e744e
commit 8a0b494c2e
12 changed files with 19 additions and 33 deletions
+2
View File
@@ -1,6 +1,8 @@
headers = llvm-c/Core.h llvm-c/ExecutionEngine.h llvm-c/Target.h llvm-c/Analysis.h llvm-c/BitWriter.h \ headers = llvm-c/Core.h llvm-c/ExecutionEngine.h llvm-c/Target.h llvm-c/Analysis.h llvm-c/BitWriter.h \
llvm-c/BitReader.h llvm-c/Linker.h DebugInfoC.h llvm-c/BitReader.h llvm-c/Linker.h DebugInfoC.h
headerFilter = llvm-c/* DebugInfoC.h
compilerOpts = -std=c99 -fPIC \ compilerOpts = -std=c99 -fPIC \
-Wall -W -Wno-unused-parameter -Wwrite-strings -Wmissing-field-initializers \ -Wall -W -Wno-unused-parameter -Wwrite-strings -Wmissing-field-initializers \
-pedantic -Wno-long-long -Wcovered-switch-default -Wdelete-non-virtual-dtor \ -pedantic -Wno-long-long -Wcovered-switch-default -Wdelete-non-virtual-dtor \
+3 -6
View File
@@ -1633,21 +1633,18 @@ kotlinNativeInterop {
cstdio { cstdio {
defFile 'interop/basics/cstdio.def' defFile 'interop/basics/cstdio.def'
flavor 'native' flavor 'native'
compilerOpts '-D_POSIX_SOURCE' // Exclude Darwin extensions causing link errors.
} }
sockets { sockets {
defFile 'interop/basics/sockets.def' defFile '../../samples/socket/sockets.def'
flavor 'native' flavor 'native'
} }
if (isMac()) { if (isMac()) {
opengl { opengl {
flavor 'native' defFile '../../samples/opengl/opengl.def'
compilerOpts '-framework', 'OpenGL', '-framework', 'GLUT'
linkerOpts '-framework', 'OpenGL', '-framework', 'GLUT' linkerOpts '-framework', 'OpenGL', '-framework', 'GLUT'
pkg 'opengl' flavor 'native'
headers 'GLUT/glut.h'
} }
} }
} }
@@ -1,2 +1 @@
headers = stdio.h headers = stdio.h
excludedFunctions = _IO_flockfile _IO_funlockfile _IO_ftrylockfile _IO_cleanup_region_start _IO_cleanup_region_end
@@ -1,5 +0,0 @@
headers = sys/socket.h netdb.h stdio.h string.h unistd.h stdlib.h arpa/inet.h
excludedFunctions = _IO_flockfile _IO_funlockfile _IO_ftrylockfile _IO_cleanup_region_start _IO_cleanup_region_end \
mkstemp_dprotected_np
compilerOpts = -D_POSIX_SOURCE
+1
View File
@@ -1 +1,2 @@
headers = MessageChannel.h headers = MessageChannel.h
headerFilter = MessageChannel.h
+1 -2
View File
@@ -1,3 +1,2 @@
headers = stdio.h stdlib.h string.h headers = stdio.h stdlib.h string.h
compilerOpts = -D_POSIX_SOURCE excludeDependentModules.osx = true
excludedFunctions =
+2 -2
View File
@@ -1,3 +1,3 @@
headers = git2.h headers = git2.h time.h
linkerOpts = -lgit2 linkerOpts = -lgit2
excludedFunctions = headerFilter = git2/** time.h
+1
View File
@@ -1 +1,2 @@
headers = gtk/gtk.h headers = gtk/gtk.h
headerFilter = gtk/* gobject/* gio/*
+1 -1
View File
@@ -1,2 +1,2 @@
headers = curl/curl.h headers = curl/curl.h
excludedFunctions = zopen pfctlinput headerFilter = curl/*
+2 -3
View File
@@ -1,6 +1,5 @@
headers = headers.osx = OpenGL/gl.h OpenGL/glu.h GLUT/glut.h
headers.osx = GLUT/glut.h
headers.linux = GL/glut.h headers.linux = GL/glut.h
compilerOpts =
compilerOpts.osx = -framework OpenGL -framework GLUT compilerOpts.osx = -framework OpenGL -framework GLUT
compilerOpts.linux = -I/usr/include compilerOpts.linux = -I/usr/include
excludeDependentModules.osx = true
+2 -5
View File
@@ -1,5 +1,2 @@
headers = sys/socket.h netdb.h stdio.h string.h unistd.h stdlib.h arpa/inet.h headers = sys/socket.h netdb.h stdio.h string.h unistd.h stdlib.h netinet/in.h
excludedFunctions = _IO_flockfile _IO_funlockfile _IO_ftrylockfile _IO_cleanup_region_start _IO_cleanup_region_end \ excludeDependentModules.osx = true
mkstemp_dprotected_np
compilerOpts = -D_POSIX_SOURCE
+3 -7
View File
@@ -1,12 +1,8 @@
headers = SDL.h stdio.h string.h unistd.h stdlib.h time.h headers = SDL.h stdlib.h time.h
excludedFunctions = _IO_flockfile _IO_funlockfile _IO_ftrylockfile \
_IO_cleanup_region_start _IO_cleanup_region_end \
_mm_stream_si32 _mm_stream_si64 \
_cvtsh_ss __frexp __modf __nan __remquo __frexpf __modff __nanf __remquof \
__inf __inff \
SDL_PointInRect SDL_RectEmpty SDL_RectEquals
entryPoint = SDL_main entryPoint = SDL_main
headerFilter = SDL* stdlib.h time.h
compilerOpts = -D_POSIX_SOURCE compilerOpts = -D_POSIX_SOURCE
compilerOpts.osx = compilerOpts.osx =
compilerOpts.linux = -D_REENTRANT compilerOpts.linux = -D_REENTRANT