diff -r 90bd2c331703 -r b6824a53d4b1 qmlfrontend/main.cpp --- a/qmlfrontend/main.cpp Fri Dec 07 13:35:08 2018 +0100 +++ b/qmlfrontend/main.cpp Fri Dec 07 13:56:45 2018 +0100 @@ -8,17 +8,7 @@ #include "hwengine.h" #include "preview_acceptor.h" -namespace Engine { -hedgewars_engine_protocol_version_t* hedgewars_engine_protocol_version; -start_engine_t* start_engine; -generate_preview_t* generate_preview; -cleanup_t* cleanup; -send_ipc_t* send_ipc; -read_ipc_t* read_ipc; -setup_current_gl_context_t* setup_current_gl_context; -render_frame_t* render_frame; -advance_simulation_t* advance_simulation; -}; // namespace Engine +namespace Engine {}; // namespace Engine static QObject* previewacceptor_singletontype_provider( QQmlEngine* engine, QJSEngine* scriptEngine) { @@ -28,50 +18,10 @@ return acceptor; } -void loadEngineLibrary() { -#ifdef Q_OS_WIN - QLibrary hwlib("./libhedgewars_engine.dll"); -#else - QLibrary hwlib("./libhedgewars_engine.so"); -#endif - - if (!hwlib.load()) - qWarning() << "Engine library not found" << hwlib.errorString(); - - Engine::hedgewars_engine_protocol_version = - reinterpret_cast( - hwlib.resolve("hedgewars_engine_protocol_version")); - Engine::start_engine = - reinterpret_cast(hwlib.resolve("start_engine")); - Engine::generate_preview = reinterpret_cast( - hwlib.resolve("generate_preview")); - Engine::cleanup = - reinterpret_cast(hwlib.resolve("cleanup")); - - Engine::send_ipc = - reinterpret_cast(hwlib.resolve("send_ipc")); - Engine::read_ipc = - reinterpret_cast(hwlib.resolve("read_ipc")); - - Engine::setup_current_gl_context = - reinterpret_cast( - hwlib.resolve("setup_current_gl_context")); - Engine::render_frame = - reinterpret_cast(hwlib.resolve("render_frame")); - Engine::advance_simulation = reinterpret_cast( - hwlib.resolve("advance_simulation")); - - if (Engine::hedgewars_engine_protocol_version) - qDebug() << "Loaded engine library with protocol version" - << Engine::hedgewars_engine_protocol_version(); -} - int main(int argc, char* argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); - loadEngineLibrary(); - QQmlApplicationEngine engine; qmlRegisterSingletonType(