Build less from root make

CMakeLists.txt

@@ -15,4 +15,6 @@ if(NOT LFL_SOURCE_DIR)
   get_filename_component(LFL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
   get_filename_component(LFL_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
   include(CMake/LFLCore.cmake)
+  add_subdirectory(${LFL_SOURCE_DIR}/core/web ${LFL_CORE_BINARY_DIR}/web)
+  add_subdirectory(${LFL_SOURCE_DIR}/core/app/tests ${LFL_CORE_BINARY_DIR}/app/tests)
 endif()

app/CMakeLists.txt

@@ -95,5 +95,3 @@ set(LFL_APP_LIB ${LFL_APP_LIB} PARENT_SCOPE)
 set(LFL_APP_ASSET_FILES ${LFL_SOURCE_DIR}/core/app/shaders/default.*
     ${LFL_SOURCE_DIR}/core/app/assets/MenuAtlas*
     ${LFL_SOURCE_DIR}/core/app/assets/MobileAtlas* PARENT_SCOPE)
-
-add_subdirectory(tests)

app/framework/CMakeLists.txt

@@ -111,8 +111,10 @@ endif()
 if(LFL_LINUX)
   lfl_add_target(app_linux_os STATIC_LIBRARY SOURCES linux_os.cpp
                  LINK_LIBRARIES -lutil -lz -lpng -lpthread -ldl -lbz2)
-  lfl_add_target(app_x11_framework STATIC_LIBRARY SOURCES x11_framework.cpp
-                 LINK_LIBRARIES -lXi -lXv -lXext -lX11 -lXxf86vm -lXrandr -lXcursor -lXt)
+  if(0)
+    lfl_add_target(app_x11_framework STATIC_LIBRARY SOURCES x11_framework.cpp
+                   LINK_LIBRARIES -lXi -lXv -lXext -lX11 -lXxf86vm -lXrandr -lXcursor -lXt)
+  endif()
 endif()
 
 if(LFL_WINDOWS)

app/framework/qt_framework.cpp

@@ -128,7 +128,7 @@ class QtWindow : public QWindow, public QtWindowInterface {
     if (qapp_init) app->StartNewWindow(this);
   }
 
-  bool event(QEvent *event) {
+  bool event(QEvent *event) override {
     if (event->type() != QEvent::UpdateRequest) return QWindow::event(event);
     if (!init && (init = 1)) MyWindowInit();
     auto app = QtWindowInterface::parent;
@@ -143,7 +143,7 @@ class QtWindow : public QWindow, public QtWindowInterface {
     return QWindow::event(event);
   }
 
-  void resizeEvent(QResizeEvent *ev) {
+  void resizeEvent(QResizeEvent *ev) override {
     QWindow::resizeEvent(ev);
     if (!init) return; 
     auto app = QtWindowInterface::parent;
@@ -153,8 +153,9 @@ class QtWindow : public QWindow, public QtWindowInterface {
     RequestRender();
   }
 
-  void keyPressEvent  (QKeyEvent *ev) { keyEvent(ev, true); }
-  void keyReleaseEvent(QKeyEvent *ev) { keyEvent(ev, false); }
+  void keyPressEvent  (QKeyEvent *ev) override { keyEvent(ev, true); }
+  void keyReleaseEvent(QKeyEvent *ev) override { keyEvent(ev, false); }
+
   void keyEvent       (QKeyEvent *ev, bool down) {
     if (!init) return;
     ev->accept();
@@ -163,8 +164,8 @@ class QtWindow : public QWindow, public QtWindowInterface {
     if (fired && frame_on_keyboard_input) RequestRender();
   }
 
-  void mouseReleaseEvent(QMouseEvent *ev) { QWindow::mouseReleaseEvent(ev); mouseClickEvent(ev, false); }
-  void mousePressEvent  (QMouseEvent *ev) { QWindow::mousePressEvent(ev);   mouseClickEvent(ev, true); }
+  void mouseReleaseEvent(QMouseEvent *ev) override { QWindow::mouseReleaseEvent(ev); mouseClickEvent(ev, false); }
+  void mousePressEvent  (QMouseEvent *ev) override { QWindow::mousePressEvent(ev);   mouseClickEvent(ev, true); }
 
   void mouseClickEvent(QMouseEvent *ev, bool down) {
     if (!init) return;
@@ -173,7 +174,7 @@ class QtWindow : public QWindow, public QtWindowInterface {
     if (fired && frame_on_mouse_input) RequestRender();
   }
 
-  void mouseMoveEvent(QMouseEvent *ev) {
+  void mouseMoveEvent(QMouseEvent *ev) override {
     QWindow::mouseMoveEvent(ev);
     if (!init) return;
     auto app = QtWindowInterface::parent;
@@ -202,7 +203,7 @@ class QtWindow : public QWindow, public QtWindowInterface {
   void SetResizeIncrements(float x, float y) override { window->windowHandle()->setSizeIncrement(QSize(x, y)); }
   void SetTransparency(float v) override { window->windowHandle()->setOpacity(1-v); }
   bool Reshape(int w, int h) override { window->resize(w, h); QtWindowInterface::parent->MakeCurrentWindow(this); return true; }
-  void Wakeup(int) { if (QtWindowInterface::parent->scheduler.wait_forever) RequestRender(); }
+  void Wakeup(int) override { if (QtWindowInterface::parent->scheduler.wait_forever) RequestRender(); }
   int Swap() override {
     glc->swapBuffers(opengl_window);
     gd->CheckForError(__FILE__, __LINE__);

app/gl/device/CMakeLists.txt

@@ -23,8 +23,11 @@ if(LFL_GLEW)
 endif()
 
 lfl_add_target(app_null_graphics STATIC_LIBRARY SOURCES null_graphics.cpp)
-lfl_add_target(app_opengl_graphics STATIC_LIBRARY SOURCES opengl_graphics.cpp
-               COMPILE_DEFINITIONS ${defs} INCLUDE_DIRECTORIES ${incs} LINK_LIBRARIES ${libs})
+
+if(LFL_OPENGL)
+  lfl_add_target(app_opengl_graphics STATIC_LIBRARY SOURCES opengl_graphics.cpp
+                 COMPILE_DEFINITIONS ${defs} INCLUDE_DIRECTORIES ${incs} LINK_LIBRARIES ${libs})
+endif()
 
 if(LFL_QT)
   lfl_enable_qt()

app/loader/CMakeLists.txt

@@ -8,7 +8,6 @@ lfl_add_target(app_null_gif STATIC_LIBRARY SOURCES null_gif.cpp)
 lfl_add_target(app_null_archive STATIC_LIBRARY SOURCES null_archive.cpp)
 lfl_add_target(app_null_proto STATIC_LIBRARY SOURCES null_proto.cpp)
 lfl_add_target(app_null_ogg STATIC_LIBRARY SOURCES null_ogg.cpp)
-lfl_add_target(app_stb_ogg STATIC_LIBRARY SOURCES stb_ogg.cpp)
 
 if(LFL_PROTOBUF)
   add_library(app_protobuf_proto protobuf_proto.cpp)
@@ -35,6 +34,10 @@ if(LFL_JPEG)
   lfl_add_target(app_libjpeg_jpeg STATIC_LIBRARY SOURCES libjpeg_jpeg.cpp LINK_LIBRARIES ${JPEG_LIB})
 endif()
 
+if(LFL_STB)
+  lfl_add_target(app_stb_ogg STATIC_LIBRARY SOURCES stb_ogg.cpp)
+endif()
+
 if(LFL_VORBIS)
   lfl_add_target(app_libvorbis_ogg STATIC_LIBRARY SOURCES libvorbis_ogg.cpp
                  INCLUDE_DIRECTORIES ${OGG_INCLUDE} ${VORBIS_INCLUDE}

app/net/CMakeLists.txt

@@ -1,9 +1,18 @@
 # $Id$
 
 lfl_add_target(app_null_ssl STATIC_LIBRARY SOURCES null_ssl.cpp)
-lfl_add_target(app_net_smtp STATIC_LIBRARY SOURCES smtp.cpp)
-lfl_add_target(app_net_ssh STATIC_LIBRARY SOURCES ssh.cpp)
-lfl_add_target(app_net_rfb STATIC_LIBRARY SOURCES rfb.cpp)
+
+if(LFL_NET_SMTP)
+  lfl_add_target(app_net_smtp STATIC_LIBRARY SOURCES smtp.cpp)
+endif()
+
+if(LFL_NET_SSH)
+  lfl_add_target(app_net_ssh STATIC_LIBRARY SOURCES ssh.cpp)
+endif()
+
+if(LFL_NET_RFB)
+  lfl_add_target(app_net_rfb STATIC_LIBRARY SOURCES rfb.cpp)
+endif()
 
 if(LFL_OPENSSL)
   lfl_add_target(app_openssl_ssl STATIC_LIBRARY SOURCES openssl_ssl.cpp

docker/ubuntu.artful/Dockerfile

@@ -1,11 +1,11 @@
 FROM ubuntu:artful
-LABEL maintainer="LucidFusionLabs@gmail.com"
+LABEL maintainer="support@lucidfusionlabs.com"
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-      yasm automake libtool libalut-dev libglu1-mesa-dev xorg-dev \
-      autotools-dev cmake cmake-data make g++ libjpeg-dev libbz2-dev libssl-dev \
-      libqt5opengl5 libqt5opengl5-dev && \
+      automake autotools-dev make cmake cmake-data g++ libtool yasm \
+      libalut-dev libglu1-mesa-dev xorg-dev libjpeg-dev libbz2-dev libssl-dev libqt5opengl5-dev \
+      lsb-release ccache && \
     apt-get clean
 
 ENV INSTALL_COMMND apt install -yqV *.deb

docker/ubuntu.bionic/Dockerfile

@@ -1,11 +1,11 @@
 FROM ubuntu:bionic
-LABEL maintainer="LucidFusionLabs@gmail.com"
+LABEL maintainer="support@lucidfusionlabs.com"
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-      yasm automake libtool libalut-dev libglu1-mesa-dev xorg-dev \
-      autotools-dev cmake cmake-data make g++ libjpeg-dev libbz2-dev libssl-dev \
-      libqt5opengl5 libqt5opengl5-dev && \
+      automake autotools-dev make cmake cmake-data g++ libtool yasm \
+      libalut-dev libglu1-mesa-dev xorg-dev libjpeg-dev libbz2-dev libssl-dev libqt5opengl5-dev \
+      lsb-release ccache && \
     apt-get clean
 
 ENV INSTALL_COMMND apt install -yqV *.deb

web/CMakeLists.txt

@@ -9,19 +9,3 @@ if(LFL_LIBCSS)
                  LINK_LIBRARIES ${LIBCSS_LIB})
   set(CMAKE_AUTOMOC)
 endif()
-
-if(LFL_MOBILE)
-  return()
-endif()
-
-lfl_project(crawler)
-PROTOBUF_GENERATE_CPP(PROTO_SRC PROTO_HDR crawler.proto)
-add_executable(crawler crawler.cpp ${PROTO_SRC})
-target_include_directories(crawler PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
-target_link_libraries(crawler PUBLIC ${LFL_APP_LIB} app_null_framework app_null_graphics
-                      app_null_audio app_null_camera app_opencv_matrix app_null_fft app_simple_loader
-                      app_simple_resampler app_iconv_convert app_stdregex_regex app_null_sregex
-                      app_null_png app_null_jpeg app_null_gif app_null_ogg app_libcss_css app_null_ttf
-                      ${LFL_APP_SSL} app_null_js app_null_tu app_null_crashreporting app_null_toolkit
-                      app_protobuf_proto ${LFL_APP_OS})
-lfl_post_build_start(crawler crawler crawler)

web/crawler/CMakeLists.txt

@@ -0,0 +1,14 @@
+# $Id$
+
+lfl_project(crawler)
+PROTOBUF_GENERATE_CPP(PROTO_SRC PROTO_HDR crawler.proto)
+add_executable(crawler crawler.cpp ${PROTO_SRC})
+target_include_directories(crawler PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(crawler PUBLIC ${LFL_APP_LIB} app_null_framework app_null_graphics
+                      app_null_audio app_null_camera app_opencv_matrix app_null_fft app_simple_loader
+                      app_simple_resampler app_iconv_convert app_stdregex_regex app_null_sregex
+                      app_null_png app_null_jpeg app_null_gif app_null_ogg app_libcss_css app_null_ttf
+                      ${LFL_APP_SSL} app_null_js app_null_tu app_null_crashreporting app_null_toolkit
+                      app_protobuf_proto ${LFL_APP_OS})
+lfl_post_build_start(crawler crawler crawler)
+