.

bavc · May 4, 2024 · 7868c21 · 7868c21
1 parent 9944a2c
commit 7868c21
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/.github/workflows/qctools.yml b/.github/workflows/qctools.yml
@@ -149,17 +149,12 @@ jobs:
         version: ${{ matrix.qt_version }}
         modules: ${{ matrix.qt_modules }}
 
-    - name: Set Qt5 environment path
-      run: |
-        echo "$Qt5_DIR"/bin >> $GITHUB_PATH
-        echo $GITHUB_PATH
-
     - name: Build qwt
       run: |
         git clone --branch qwt-6.2 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
         cd ../qwt
         qmake -r
-        make -j4
+        make CC=$CC CXX=$CXX -j4
 
     - name: Build FFmpeg
       run: |
@@ -175,7 +170,7 @@ jobs:
                     --disable-ffplay \
                     --disable-ffprobe \
                     --disable-debug
-        make -j12
+        make CC=$CC CXX=$CXX -j12
 
     - name: Build QCTools
       env:
@@ -228,16 +223,12 @@ jobs:
         version: ${{ matrix.qt_version }}
         modules: ${{ matrix.qt_modules }}
 
-    - name: Set Qt6 environment path
-      run: |
-        echo "$Qt6_DIR"/bin >> $GITHUB_PATH
-
     - name: Build qwt
       run: |
         git clone --branch qwt-6.2 --depth 1 https://git.code.sf.net/p/qwt/git ../qwt
         cd ../qwt
         qmake -r
-        make -j4
+        make CC=$CC CXX=$CXX -j4
 
     - name: Build FFmpeg
       run: |
@@ -253,7 +244,7 @@ jobs:
                     --disable-ffplay \
                     --disable-ffprobe \
                     --disable-debug
-        make -j12
+        make CC=$CC CXX=$CXX -j12
 
     - name: Build QCTools
       env:
@@ -263,7 +254,7 @@ jobs:
         mkdir build
         cd build
         qmake .. 
-        make -j4
+        make CC=$CC CXX=$CXX -j4
 
   build-linux: