mirror of
https://github.com/godotengine/godot-platform-haiku.git
synced 2026-01-06 14:10:06 +03:00
Compare commits
3 Commits
2.1.5-stab
...
2.0.4.1-st
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
753debf9e1 | ||
|
|
b035447dd1 | ||
|
|
d79bfba7ec |
@@ -38,6 +38,6 @@ int ContextGL_Haiku::get_window_width() {
|
|||||||
|
|
||||||
int ContextGL_Haiku::get_window_height() {
|
int ContextGL_Haiku::get_window_height() {
|
||||||
return window->Bounds().IntegerHeight();
|
return window->Bounds().IntegerHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -18,8 +18,8 @@ public:
|
|||||||
~ContextGL_Haiku();
|
~ContextGL_Haiku();
|
||||||
|
|
||||||
virtual Error initialize();
|
virtual Error initialize();
|
||||||
virtual void release_current();
|
virtual void release_current();
|
||||||
virtual void make_current();
|
virtual void make_current();
|
||||||
virtual void swap_buffers();
|
virtual void swap_buffers();
|
||||||
virtual int get_window_width();
|
virtual int get_window_width();
|
||||||
virtual int get_window_height();
|
virtual int get_window_height();
|
||||||
|
|||||||
@@ -23,7 +23,8 @@ def get_opts():
|
|||||||
|
|
||||||
def get_flags():
|
def get_flags():
|
||||||
return [
|
return [
|
||||||
('builtin_zlib', 'no')
|
('builtin_zlib', 'no'),
|
||||||
|
#('glew', 'yes'), # TODO: investigate the GLEW situation on Haiku
|
||||||
]
|
]
|
||||||
|
|
||||||
def configure(env):
|
def configure(env):
|
||||||
@@ -52,9 +53,9 @@ def configure(env):
|
|||||||
|
|
||||||
#env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
|
#env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
|
||||||
env.Append(CPPFLAGS = ['-DPTHREAD_NO_RENAME']) # TODO: enable when we have pthread_setname_np
|
env.Append(CPPFLAGS = ['-DPTHREAD_NO_RENAME']) # TODO: enable when we have pthread_setname_np
|
||||||
env.Append(CPPFLAGS = ['-DGLEW_ENABLED', '-DOPENGL_ENABLED', '-DMEDIA_KIT_ENABLED'])
|
env.Append(CPPFLAGS = ['-DOPENGL_ENABLED', '-DMEDIA_KIT_ENABLED'])
|
||||||
env.Append(CPPFLAGS = ['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL'])
|
env.Append(CPPFLAGS = ['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL'])
|
||||||
env.Append(LIBS = ['be', 'game', 'media', 'network', 'bnetapi', 'z', 'GL', 'GLEW'])
|
env.Append(LIBS = ['be', 'game', 'media', 'network', 'bnetapi', 'z', 'GL'])
|
||||||
|
|
||||||
import methods
|
import methods
|
||||||
env.Append(BUILDERS = {'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl')})
|
env.Append(BUILDERS = {'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl')})
|
||||||
|
|||||||
@@ -3,17 +3,17 @@
|
|||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
int main(int argc, char* argv[]) {
|
||||||
OS_Haiku os;
|
OS_Haiku os;
|
||||||
|
|
||||||
Error error = Main::setup(argv[0], argc-1, &argv[1]);
|
Error error = Main::setup(argv[0], argc-1, &argv[1]);
|
||||||
if (error != OK) {
|
if (error != OK) {
|
||||||
return 255;
|
return 255;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Main::start()) {
|
if (Main::start()) {
|
||||||
os.run();
|
os.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
Main::cleanup();
|
Main::cleanup();
|
||||||
|
|
||||||
return os.get_exit_code();
|
return os.get_exit_code();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ static _HaikuTranslatePair _hb_to_keycode[] = {
|
|||||||
{ KEY_INSERT, B_INSERT },
|
{ KEY_INSERT, B_INSERT },
|
||||||
{ KEY_DELETE, B_DELETE },
|
{ KEY_DELETE, B_DELETE },
|
||||||
// { KEY_HELP, ??? },
|
// { KEY_HELP, ??? },
|
||||||
|
|
||||||
{ KEY_0, (0x30) },
|
{ KEY_0, (0x30) },
|
||||||
{ KEY_1, (0x31) },
|
{ KEY_1, (0x31) },
|
||||||
{ KEY_2, (0x32) },
|
{ KEY_2, (0x32) },
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ void OS_Haiku::finalize() {
|
|||||||
memdelete(spatial_sound_2d_server);
|
memdelete(spatial_sound_2d_server);
|
||||||
|
|
||||||
memdelete(sample_manager);
|
memdelete(sample_manager);
|
||||||
|
|
||||||
audio_server->finish();
|
audio_server->finish();
|
||||||
memdelete(audio_server);
|
memdelete(audio_server);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user