[tests][teaspot opengl] fix build

phatblat · Oct 19, 2017 · d470df5 · d470df5
1 parent e1cfb21
commit d470df5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git 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
@@ -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/