mini_analyser: fix build maybe?

emericg · Jun 4, 2024 · 6a7042c · 6a7042c
1 parent 0bdfbaf
commit 6a7042c
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 46 deletions.
diff --git a/.github/workflows/builds_minianalyser.yml b/.github/workflows/builds_minianalyser.yml
@@ -27,8 +27,8 @@ jobs:
     name: "Linux CI build"
     runs-on: ubuntu-20.04
     steps:
-      # Checkout the repository
-      - name: Checkout repository and submodules
+      # Checkout the repository (and submodules)
+      - name: Checkout repository (and submodules)
         uses: actions/checkout@v4
         with:
           submodules: recursive
@@ -77,8 +77,8 @@ jobs:
              ./linuxdeploy-x86_64.AppImage --appdir appdir --plugin qt --output appimage
              mv ${{env.APP_NAME}}-x86_64.AppImage ../${{env.APP_NAME}}-${{env.APP_VERSION}}-linux64.AppImage
 
-      # Upload AppImage
-      - name: Upload AppImage
+      # Upload application
+      - name: Upload application
         uses: actions/upload-artifact@v4
         with:
           name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-linux64.AppImage
@@ -89,8 +89,8 @@ jobs:
     name: "macOS CI build"
     runs-on: macos-12
     steps:
-      # Checkout the repository
-      - name: Checkout repository and submodules
+      # Checkout the repository (and submodules)
+      - name: Checkout repository (and submodules)
         uses: actions/checkout@v4
         with:
           submodules: recursive
@@ -129,8 +129,8 @@ jobs:
              make install
              zip -r -X ../${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS.zip bin/${{env.APP_NAME}}.app
 
-      # Upload app zip
-      - name: Upload app zip
+      # Upload application
+      - name: Upload application
         uses: actions/upload-artifact@v4
         with:
           name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS.zip
@@ -141,8 +141,8 @@ jobs:
     name: "Windows CI build"
     runs-on: windows-2022
     steps:
-      # Checkout the repository
-      - name: Checkout repository and submodules
+      # Checkout the repository (and submodules)
+      - name: Checkout repository (and submodules)
         uses: actions/checkout@v4
         with:
           submodules: recursive
@@ -152,7 +152,6 @@ jobs:
         uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: x64
-          spectre: true
 
       # Install Qt
       - name: Install Qt
@@ -196,8 +195,8 @@ jobs:
              mv mini_analyser/bin mini_analyser/${{env.APP_NAME}}-${{env.APP_VERSION}}-win64
              7z a ../${{env.APP_NAME}}-${{env.APP_VERSION}}-win64.zip ${{env.APP_NAME}}-${{env.APP_VERSION}}-win64
 
-      # Upload app zip
-      - name: Upload app zip
+      # Upload application
+      - name: Upload application
         uses: actions/upload-artifact@v4
         with:
           name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-win64.zip

diff --git a/mini_analyser/mini_analyser.pro b/mini_analyser/mini_analyser.pro
@@ -17,7 +17,7 @@ equals(QT_MAJOR_VERSION, 6) {
     QT      += core svg gui widgets svgwidgets printsupport
 }
 
-# Project files ################################################################
+# Project files ----------------------------------------------------------------
 
 SOURCES     += src/main.cpp \
                src/cli.cpp \
@@ -59,43 +59,43 @@ FORMS       += ui/mainwindow.ui \
 RESOURCES   += resources/resources.qrc
 
 # third party libraries
-HEADERS     += $${PWD}/src/thirdparty/portable_endian.h
+HEADERS += src/thirdparty/portable_endian.h
 include(src/thirdparty/pugixml/pugixml.pri)
 include(src/thirdparty/QHexView/QHexView.pri)
 include(src/thirdparty/qhexedit2/qhexedit2.pri)
 include(src/thirdparty/qcustomplot/qcustomplot.pri)
 
-# Dependencies #################################################################
+# Dependencies -----------------------------------------------------------------
 
 # minivideo library
-INCLUDEPATH     += ../minivideo/src/ ../../minivideo/src/
-QMAKE_LIBDIR    += ../minivideo/build/ ../../minivideo/build/
-QMAKE_RPATHDIR  += ../minivideo/build/ ../../minivideo/build/
-LIBS            += -lminivideo                          # dynamic linking
-#LIBS           += ../minivideo/build/libminivideo.a    # static linking
+INCLUDEPATH     += $${PWD}/../minivideo/src/
+QMAKE_LIBDIR    += $${PWD}/../minivideo/bin/$${QT_ARCH}/
+QMAKE_RPATHDIR  += $${PWD}/../minivideo/bin/$${QT_ARCH}/
+LIBS            += -lminivideo                                                  # dynamic linking
+#LIBS           += $${PWD}/../minivideo/bin/$${QT_ARCH}/libminivideo.a          # static linking
 
-# Build settings ###############################################################
+# Build artifacts --------------------------------------------------------------
 
-unix {
-    # Enables AddressSanitizer
-    #QMAKE_CXXFLAGS += -fsanitize=address,undefined,pointer-compare,pointer-subtract -fno-omit-frame-pointer
-    #QMAKE_LFLAGS += -fsanitize=address,undefined,pointer-compare,pointer-subtract
-}
+OBJECTS_DIR  = build/$${QT_ARCH}
+MOC_DIR      = build/$${QT_ARCH}
+RCC_DIR      = build/$${QT_ARCH}
+UI_DIR       = build/$${QT_ARCH}
+
+DESTDIR      = bin/
+
+# Build settings ---------------------------------------------------------------
 
 win32 { DEFINES += _USE_MATH_DEFINES }
 
 DEFINES += QT_DEPRECATED_WARNINGS
 
 CONFIG(release, debug|release) : DEFINES += NDEBUG QT_NO_DEBUG QT_NO_DEBUG_OUTPUT
 
-# Build artifacts ##############################################################
-
-OBJECTS_DIR  = build/$${QT_ARCH}
-MOC_DIR      = build/$${QT_ARCH}
-RCC_DIR      = build/$${QT_ARCH}
-UI_DIR       = build/$${QT_ARCH}
-
-DESTDIR      = bin/$${QT_ARCH}
+unix {
+    # Enables AddressSanitizer
+    #QMAKE_CXXFLAGS += -fsanitize=address,undefined,pointer-compare,pointer-subtract -fno-omit-frame-pointer
+    #QMAKE_LFLAGS += -fsanitize=address,undefined,pointer-compare,pointer-subtract
+}
 
 # OS specifics -----------------------------------------------------------------
 
@@ -129,10 +129,10 @@ unix {
         }
 
         # Using RPATH
-        QMAKE_RPATHDIR += $${PWD}/../minivideo/build
+        QMAKE_RPATHDIR += $${PWD}/../minivideo/bin/$${QT_ARCH}/
 
         # Using https://nixos.org/patchelf.html
-        #QMAKE_POST_LINK = (patchelf --set-rpath $${PWD}/../minivideo/build/ $${PWD}/bin/mini_analyser)
+        #QMAKE_POST_LINK = (patchelf --set-rpath $${PWD}/../minivideo/bin/$${QT_ARCH}/ $${PWD}/bin/mini_analyser)
     }
 
     macx {
@@ -166,7 +166,7 @@ unix {
 
         # Force RPATH to look into the 'Frameworks' dir (doesn't really seems to work...)
         #QMAKE_RPATHDIR += @executable_path/../Frameworks
-        #QMAKE_RPATHDIR += $${PWD}/../minivideo/build
+        #QMAKE_RPATHDIR += $${PWD}/../minivideo/bin/$${QT_ARCH}/
 
         # Rewrite minivideo rpath
         #QMAKE_POST_LINK = (install_name_tool -add_rpath @executable_path/../Frameworks/. "bin/mini_analyser.app/Contents/MacOS/mini_analyser")

diff --git a/minivideo/minivideo.pro b/minivideo/minivideo.pro
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# MiniVideo "library" build system / qmake edition
+# MiniVideo library build system / qmake edition
 # This file allows you to build shared & static library of MiniVideo
 #-------------------------------------------------------------------------------
 
@@ -9,9 +9,16 @@ TEMPLATE     = lib
 CONFIG      += c++11 shared_and_static
 CONFIG      -= qt
 
-# build artifacts
+# minivideo files --------------------------------------------------------------
+
+SOURCES = $$files(src/*.cpp, true)
+HEADERS = $$files(src/*.h, true)
+
+# build artifacts --------------------------------------------------------------
+
 OBJECTS_DIR  = build/$${QT_ARCH}/
-DESTDIR      = build/
+
+DESTDIR      = bin/$${QT_ARCH}/
 
 # build settings ---------------------------------------------------------------
 
@@ -78,11 +85,6 @@ win32 {
     QMAKE_LFLAGS += -lm -Wl,-no-undefined -Wl,--enable-runtime-pseudo-reloc
 }
 
-# minivideo files --------------------------------------------------------------
-
-SOURCES = $$files(src/*.cpp, true)
-HEADERS = $$files(src/*.h, true)
-
 # minivideo installation -------------------------------------------------------
 
 unix {