diff --git a/examples/common/entry/entry_p.h b/examples/common/entry/entry_p.h index 502eed673..f44a42194 100644 --- a/examples/common/entry/entry_p.h +++ b/examples/common/entry/entry_p.h @@ -13,6 +13,10 @@ #include "entry.h" #include // memcpy +#ifndef ENTRY_CONFIG_USE_NOOP +# define ENTRY_CONFIG_USE_NOOP (BX_PLATFORM_QNX || BX_PLATFORM_XBOXONE) +#endif // ENTRY_CONFIG_USE_NOOP + #ifndef ENTRY_CONFIG_USE_SDL # define ENTRY_CONFIG_USE_SDL BX_PLATFORM_STEAMLINK #endif // ENTRY_CONFIG_USE_SDL @@ -22,6 +26,7 @@ #endif // ENTRY_CONFIG_USE_GLFW #if !defined(ENTRY_CONFIG_USE_NATIVE) \ + && !ENTRY_CONFIG_USE_NOOP \ && !ENTRY_CONFIG_USE_SDL \ && !ENTRY_CONFIG_USE_GLFW # define ENTRY_CONFIG_USE_NATIVE 1 diff --git a/examples/common/entry/entry_qnx.cpp b/examples/common/entry/entry_qnx.cpp deleted file mode 100644 index af91ca7db..000000000 --- a/examples/common/entry/entry_qnx.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright 2011-2016 Branimir Karadzic. All rights reserved. - * License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause - */ - -#include "entry_p.h" - -#if ENTRY_CONFIG_USE_NATIVE && BX_PLATFORM_QNX - -#include - -namespace entry -{ - const Event* poll() - { - return NULL; - } - - const Event* poll(WindowHandle _handle) - { - BX_UNUSED(_handle); - return NULL; - } - - void release(const Event* _event) - { - BX_UNUSED(_event); - } - - WindowHandle createWindow(int32_t _x, int32_t _y, uint32_t _width, uint32_t _height, uint32_t _flags, const char* _title) - { - BX_UNUSED(_x, _y, _width, _height, _flags, _title); - WindowHandle handle = { UINT16_MAX }; - return handle; - } - - void destroyWindow(WindowHandle _handle) - { - BX_UNUSED(_handle); - } - - void setWindowPos(WindowHandle _handle, int32_t _x, int32_t _y) - { - BX_UNUSED(_handle, _x, _y); - } - - void setWindowSize(WindowHandle _handle, uint32_t _width, uint32_t _height) - { - BX_UNUSED(_handle, _width, _height); - } - - void setWindowTitle(WindowHandle _handle, const char* _title) - { - BX_UNUSED(_handle, _title); - } - - void toggleWindowFrame(WindowHandle _handle) - { - BX_UNUSED(_handle); - } - - void toggleFullscreen(WindowHandle _handle) - { - BX_UNUSED(_handle); - } - - void setMouseLock(WindowHandle _handle, bool _lock) - { - BX_UNUSED(_handle, _lock); - } - -} // namespace entry - -int main(int _argc, char** _argv) -{ - entry::main(_argc, _argv); -} - -#endif // ENTRY_CONFIG_USE_NATIVE && BX_PLATFORM_QNX diff --git a/scripts/genie.lua b/scripts/genie.lua index 52554366d..22a7dd361 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -218,7 +218,7 @@ function exampleProject(_name) configuration {} end - configuration { "vs*" } + configuration { "vs*", "x32 or x64" } linkoptions { "/ignore:4199", -- LNK4199: /DELAYLOAD:*.dll ignored; no imports found from *.dll } @@ -226,7 +226,7 @@ function exampleProject(_name) "DelayImp", } - configuration { "vs201*" } + configuration { "vs201*", "x32 or x64" } linkoptions { -- this is needed only for testing with GLES2/3 on Windows with VS201x "/DELAYLOAD:\"libEGL.dll\"", "/DELAYLOAD:\"libGLESv2.dll\"", @@ -234,13 +234,24 @@ function exampleProject(_name) configuration { "mingw*" } targetextension ".exe" - - configuration { "vs20* or mingw*" } links { "gdi32", "psapi", } + configuration { "vs20*", "x32 or x64" } + links { + "gdi32", + "psapi", + } + + configuration { "durango" } + links { + "d3d11_x", + "combase", + "kernelx", + } + configuration { "winphone8* or winstore8*" } removelinks { "DelayImp", @@ -318,7 +329,7 @@ function exampleProject(_name) "SDL2", "pthread", } - + configuration { "rpi" } links { "X11",