build studio statically

zerotacg · Aug 5, 2024 · 1a9887a · 1a9887a
1 parent 08fa027
commit 1a9887a
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 10 deletions.
diff --git a/.github/workflows/build-studio.yml b/.github/workflows/build-studio.yml
@@ -13,17 +13,70 @@ on:
       - '!.github/workflows/build-studio.yml'
 
 jobs:
-  build:
+  strings:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
       - name: Set reusable strings
         id: strings
         shell: bash
         run: |
           echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
 
+  build:
+    needs:
+      - strings
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Dependencies
+        run: |
+          sudo apt update
+          sudo apt install --yes software-properties-common
+          sudo apt update
+          sudo apt install --yes \
+          cmake build-essential ninja-build ccache \
+            bison autoconf automake \
+            libpng-dev \
+            libjpeg-dev \
+            libgif-dev libfreetype6-dev \
+            freeglut3-dev \
+            liblua5.2-dev libluabind-dev libcpptest-dev \
+            libogg-dev libvorbis-dev libopenal-dev \
+            libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libpostproc-dev \
+            libmysqlclient-dev \
+            libxml2-dev \
+            libcurl4-openssl-dev libssl-dev \
+            libsquish-dev \
+            liblzma-dev \
+            libgsf-1-dev \
+            qtbase5-dev qttools5-dev qttools5-dev-tools libqtpropertybrowser-dev
+
+      - name: Configure CMake
+        run: >
+          cmake -B ${{ needs.strings.outputs.build-output-dir }}
+          -G "Ninja"
+          -DWITH_QT5=ON
+          -DWITH_STUDIO=ON
+          -DWITH_RYZOM=OFF
+          -DWITH_NEL_TOOLS=OFF
+          -DWITH_NEL_SAMPLES=OFF
+          -DWITH_NEL_TESTS=OFF
+          -S ${{ github.workspace }}
+
+      - name: Build
+        run: cmake --build ${{ needs.strings.outputs.build-output-dir }} --target studio
+
+  build-static:
+    needs:
+      - strings
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
       - name: Dependencies
         run: |
           sudo apt update
@@ -49,15 +102,16 @@ jobs:
 
       - name: Configure CMake
         run: >
-          cmake -B ${{ steps.strings.outputs.build-output-dir }}
+          cmake -B ${{ needs.strings.outputs.build-output-dir }}
           -G "Ninja"
           -DWITH_QT5=ON
           -DWITH_STUDIO=ON
+          -DWITH_STATIC=ON
           -DWITH_RYZOM=OFF
           -DWITH_NEL_TOOLS=OFF
           -DWITH_NEL_SAMPLES=OFF
           -DWITH_NEL_TESTS=OFF
           -S ${{ github.workspace }}
 
       - name: Build
-        run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --target studio
+        run: cmake --build ${{ needs.strings.outputs.build-output-dir }} --target studio
diff --git a/studio/CMakeLists.txt b/studio/CMakeLists.txt
@@ -29,10 +29,6 @@ ELSE()
   ADD_DEFINITIONS(-DHAVE_OVQT_CONFIG_H)
 ENDIF()
 
-IF(UNIX AND WITH_STATIC)
-	MESSAGE(FATAL_ERROR "Studio does not work with static NeL builds on Unix atm.")
-ENDIF()
-
 ADD_SUBDIRECTORY(src)
 
 INSTALL(DIRECTORY data/

diff --git a/studio/src/plugins/CMakeLists.txt b/studio/src/plugins/CMakeLists.txt
@@ -12,7 +12,8 @@ IF(WITH_GUI)
   ADD_SUBDIRECTORY(gui_editor)
 ENDIF()
 
-ADD_SUBDIRECTORY(translation_manager)
+# QFtp isn't available anymore only as a standalone module
+#ADD_SUBDIRECTORY(translation_manager)
 ADD_SUBDIRECTORY(tile_editor)
 ADD_SUBDIRECTORY(bnp_manager)
 # Note: Temporarily disabled until development continues.

diff --git a/studio/src/plugins/gui_editor/link_list.cpp b/studio/src/plugins/gui_editor/link_list.cpp
@@ -76,7 +76,7 @@ namespace GUIEditor
 			item->setData( 3, Qt::UserRole, itr->first );
 			linkTree->addTopLevelItem( item );
 		}
-		linkTree->sortByColumn( 0 );
+		linkTree->sortByColumn( 0, Qt::AscendingOrder );
 	}
 
 	void LinkList::onAddButtonClicked()