Skip to content

Commit

Permalink
Remove remaining Tizen code
Browse files Browse the repository at this point in the history
  • Loading branch information
RobDangerous committed Mar 26, 2024
1 parent 406c9e2 commit 7995c46
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Backends/Graphics3/OpenGL1/Sources/kinc/backend/OpenGL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ void Graphics3::init(int windowId, int depthBufferBits, int stencilBufferBits, b
glGenVertexArraysOES(1, &arrayId[windowId]);
#elif defined(KINC_MACOS)
glGenVertexArraysAPPLE(1, &arrayId[windowId]);
#elif !defined(KINC_ANDROID) && !defined(KINC_EMSCRIPTEN) && !defined(KINC_TIZEN) && !defined(KINC_RASPBERRY_PI)
#elif !defined(KINC_ANDROID) && !defined(KINC_EMSCRIPTEN) && !defined(KINC_RASPBERRY_PI)
glGenVertexArrays(1, &arrayId[windowId]);
#endif
glCheckErrors();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Kore {
int myCount;
int myStride;
uint bufferId;
// #if defined KINC_ANDROID || defined KINC_EMSCRIPTEN || defined KINC_TIZEN
// #if defined KINC_ANDROID || defined KINC_EMSCRIPTEN
Graphics4::VertexStructure structure;
// #endif
int instanceDataStepRate;
Expand Down
4 changes: 0 additions & 4 deletions Backends/Graphics3/OpenGL1/Sources/kinc/backend/ogl.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@
#include "GLES2/gl2.h"
#endif

#ifdef KINC_TIZEN
#include <gl2.h>
#endif

#include <Kore/Log.h>

#if defined(NDEBUG) || defined(KINC_OSX) || defined(KINC_IOS) || defined(KINC_ANDROID) || 1 // Calling glGetError too early means trouble
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@
#include "EGL/eglext.h"
#endif

#ifdef KINC_TIZEN
#include <gl2.h>
#endif

#ifdef KINC_WASM
#include <GL/gl.h>
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ typedef struct {
unsigned bufferId;
int sectionStart;
int sectionSize;
// #if defined KINC_ANDROID || defined KINC_EMSCRIPTEN || defined KINC_TIZEN
// #if defined KINC_ANDROID || defined KINC_EMSCRIPTEN
kinc_g4_vertex_structure_t structure;
// #endif
int instanceDataStepRate;
Expand Down
14 changes: 0 additions & 14 deletions Sources/kinc/io/filereader.h
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,6 @@ const char *macgetresourcepath(void);
#include <kinc/backend/MiniWindows.h>
#endif

#ifdef KINC_TIZEN
#include <FApp.h>
#endif

#ifdef KINC_RASPBERRY_PI
#define KINC_LINUX
#endif
Expand Down Expand Up @@ -387,16 +383,6 @@ bool kinc_internal_file_reader_open(kinc_file_reader_t *reader, const char *file
strcat(filepath, "/");
strcat(filepath, filename);
#endif
#ifdef KINC_TIZEN
for (int i = 0; i < Tizen::App::App::GetInstance()->GetAppDataPath().GetLength(); ++i) {
wchar_t c;
Tizen::App::App::GetInstance()->GetAppDataPath().GetCharAt(i, c);
filepath[i] = (char)c;
}
filepath[Tizen::App::App::GetInstance()->GetAppDataPath().GetLength()] = 0;
strcat(filepath, "/");
strcat(filepath, filename);
#endif

#ifdef KINC_WINDOWS
// Drive letter or network
Expand Down
2 changes: 1 addition & 1 deletion Sources/kinc/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ bool kinc_internal_frame(void) {
void kinc_start(void) {
running = true;

#if !defined(KINC_WASM) && !defined(KINC_EMSCRIPTEN) && !defined(KINC_TIZEN)
#if !defined(KINC_WASM) && !defined(KINC_EMSCRIPTEN)
// if (Graphics::hasWindow()) Graphics::swapBuffers();

#if defined(KINC_IOS) || defined(KINC_MACOS)
Expand Down
11 changes: 0 additions & 11 deletions kfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -508,17 +508,6 @@ else if (platform === Platform.Pi) {
project.addLib('asound');
project.addLib('X11');
}
else if (platform === Platform.Tizen) {
g4 = true;
addKincDefine('TIZEN');
addBackend('System/Tizen');
addBackend('System/POSIX');
addBackend('Graphics4/OpenGL');
project.addExclude('Backends/Graphics4/OpenGL/Sources/GL/**');
addKincDefine('OPENGL');
addKincDefine('OPENGL_ES');
addKincDefine('POSIX');
}
else {
plugin = true;
g4 = true;
Expand Down

0 comments on commit 7995c46

Please sign in to comment.