From d470df57c068be7dbcc68c2da051ef9564dbb17a Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Thu, 19 Oct 2017 09:56:52 +0300 Subject: [PATCH] [tests][teaspot opengl] fix build --- backend.native/tests/build.gradle | 9 +-------- backend.native/tests/interop/basics/opengl_teapot.kt | 4 +++- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index 0a0a3f8606c..5cb5c542009 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -2097,12 +2097,6 @@ kotlinNativeInterop { } if (isMac()) { - opengl { - defFile '../../samples/opengl/src/main/c_interop/opengl.def' - linkerOpts '-framework', 'OpenGL', '-framework', 'GLUT' - flavor 'native' - } - objcSmoke { defFile 'interop/objc/objcSmoke.def' headers "$projectDir/interop/objc/smoke.h" @@ -2190,11 +2184,10 @@ task interop_echo_server(type: RunInteropKonanTest) { } if (isMac()) { - task interop_opengl_teapot(type: RunInteropKonanTest) { + task interop_opengl_teapot(type: RunKonanTest) { disabled = (project.testTarget == 'wasm32') // No interop for wasm yet. run = false source = "interop/basics/opengl_teapot.kt" - interop = 'opengl' } task interop_objc_smoke(type: RunInteropKonanTest) { diff --git a/backend.native/tests/interop/basics/opengl_teapot.kt b/backend.native/tests/interop/basics/opengl_teapot.kt index 316db51e190..6ce2b02f494 100644 --- a/backend.native/tests/interop/basics/opengl_teapot.kt +++ b/backend.native/tests/interop/basics/opengl_teapot.kt @@ -1,5 +1,7 @@ import kotlinx.cinterop.* -import opengl.* +import platform.GLUT.* +import platform.OpenGL.* +import platform.OpenGLCommon.* // Ported from http://openglsamples.sourceforge.net/projects/index.php/blog/index/