Skip to content

Commit cb81c5e

Browse files
committed
xrEngine: fix linux compile
CMake: remove unnesessary libraries from build
1 parent 457fe56 commit cb81c5e

File tree

6 files changed

+12
-5
lines changed

6 files changed

+12
-5
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ find_package(OGG REQUIRED)
3030
find_package(SDL2 REQUIRED)
3131
find_package(LZO REQUIRED)
3232
find_package(JPEG REQUIRED)
33+
#this is a temporary solution until find_package will not be fixed
34+
set(TBB_LIBRARIES tbb tbbmalloc_proxy tbbmalloc)
3335
endif()
3436

3537
include_directories(${LUA_INCLUDE_DIR})

Externals/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
add_subdirectory(LuaJIT)
22
add_subdirectory(luabind)
3-
add_subdirectory(lzo)
3+
#add_subdirectory(lzo)
44
add_subdirectory(cximage)
5-
add_subdirectory(NVTT)
5+
#add_subdirectory(NVTT)
66
add_subdirectory(OPCODE)
77
add_subdirectory(ode)
88
#add_subdirectory(pugixml)

src/xrEngine/Device_Initialize.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ void CRenderDevice::initialize_weather_editor()
2222

2323
m_editor_finalize = (finalize_function_ptr)m_editor_module->GetProcAddress("finalize");
2424
VERIFY(m_editor_finalize);
25-
25+
#if !defined(LINUX)
2626
m_engine = new engine_impl();
2727
m_editor_initialize(m_editor, m_engine);
28+
#endif
2829
VERIFY(m_editor);
2930

3031
m_sdlWnd = SDL_CreateWindowFrom(m_editor->view_handle());

src/xrEngine/device.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,9 @@ class ENGINE_API CRenderDevice : public CRenderDeviceBase
292292

293293
public:
294294
void xr_stdcall on_idle();
295+
#if !defined(LINUX)
295296
bool xr_stdcall on_message(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT& result);
297+
#endif
296298

297299
private:
298300
void message_loop();

src/xrEngine/engine_impl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ engine_impl::~engine_impl()
2525
capture_input(false);
2626
xr_delete(m_input_receiver);
2727
}
28-
28+
#if !defined(LINUX)
2929
bool engine_impl::on_message(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT& result)
3030
{
3131
return (Device.on_message(hWnd, uMsg, wParam, lParam, result));
3232
}
33-
33+
#endif
3434
void engine_impl::on_idle()
3535
{
3636
SDL_PumpEvents();

src/xrEngine/engine_impl.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ class engine_impl : public XRay::Editor::engine_base
1818
virtual ~engine_impl();
1919

2020
private:
21+
#if !defined(LINUX)
2122
virtual bool on_message(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT& result);
23+
#endif
2224
virtual void on_idle();
2325
virtual void on_resize();
2426
virtual void pause(bool const& value);

0 commit comments

Comments
 (0)