Extensions - Add Linux support for the Mumble plugin

.github/workflows/release.yml

@@ -109,6 +109,30 @@ jobs:
           symbols
         retention-days: 1
 
+  compile-linux:
+    if: github.repository == 'IDI-Systems/acre2' && ! contains(github.event.head_commit.message, '[ci skip]')
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the source code
+      uses: actions/checkout@v2
+    - name: Install Packages
+      run: |
+        sudo apt update
+        sudo DEBIAN_FRONTEND=noninteractive apt install -y libfaudio-dev libtbb-dev
+    - name: Build Extensions
+      run: |
+        mkdir -p extensions/build
+        cd extensions/build
+        cmake -DUSE_64BIT_BUILD=ON ..
+        make -j
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: acre2-extensions-linux
+        path: |
+          plugin
+        retention-days: 1
+
   publish-test:
     needs: [build, compile]
     if: github.event_name == 'workflow_dispatch'
@@ -123,6 +147,7 @@ jobs:
         mv acre2-extensions-*/*.dll @acre2/
         mv acre2-extensions-*/extras/*.exe @acre2/extras/
         mkdir @acre2/plugin && cp -r acre2-extensions-*/plugin/* @acre2/plugin/ # mv can't merge directories
+        cp -r acre2-extensions-linux/mumble @acre2/plugin || true
         mkdir symbols && mv acre2-extensions-*/symbols/* .
         echo "::group::Archive build"
         zip -r acre2_${{ needs.build.outputs.VERSION }}${{ github.event.inputs.label }}.zip @acre2
@@ -171,6 +196,7 @@ jobs:
         mv acre2-extensions-*/*.dll @acre2/
         mv acre2-extensions-*/extras/*.exe @acre2/extras/
         mkdir @acre2/plugin && cp -r acre2-extensions-*/plugin/* @acre2/plugin/ # mv can't merge directories
+        cp -r acre2-extensions-linux/mumble @acre2/plugin || true
         mkdir symbols && mv acre2-extensions-*/symbols/* .
         echo "::group::Archive build"
         zip -r acre2_${{ needs.build.outputs.VERSION }}.zip @acre2
@@ -229,6 +255,7 @@ jobs:
         mv acre2-extensions-*/*.dll @acre2/
         mv acre2-extensions-*/extras/*.exe @acre2/extras/
         mkdir @acre2/plugin && cp -r acre2-extensions-*/plugin/* @acre2/plugin/ # mv can't merge directories
+        cp -r acre2-extensions-linux/mumble @acre2/plugin || true
         mkdir symbols && mv acre2-extensions-*/symbols/* .
         echo "::group::Archive build"
         zip -r acre2_${{ needs.build.outputs.VERSION }}.zip @acre2

addons/sys_core/initSettings.sqf

@@ -154,6 +154,18 @@
     {[_this] call FUNC(setRevealToAI)}
 ] call CBA_fnc_addSetting;
 
+if ("ACRE2Arma" callExtension "99" == "1") then {
+  // Wine Socket Port
+  [
+    QGVAR(wineSocketPort),
+    "EDITBOX",
+    ["Wine Socket Port", "(Linux only) What port should ACRE2 try to connect to Mumble on?"],
+    "ACRE2 Wine",
+    "19141",
+    false
+  ] call CBA_fnc_addSetting;
+};
+
 // Notification Settings - not yet implemented
 /*[
     QGVAR(incomingTransmissionNotification),

addons/sys_io/fnc_server.sqf

@@ -23,7 +23,11 @@ DFUNC(connectionFnc) = {
             LOG("ATEEEMPTING TO OPEN PIPE!");
             // acre_player sideChat "OPEN PIPE";
             GVAR(pongTime) = diag_tickTime;
-            GVAR(pipeCode) = "ACRE2Arma" callExtension "0ts"; // Connect String
+            extensionParameter = "0";
+            if (!isNil {EGVAR(sys_core,wineSocketPort)}) then {
+                extensionParameter = "0p" + EGVAR(sys_core,wineSocketPort);
+            };
+            GVAR(pipeCode) = "ACRE2Arma" callExtension extensionParameter; // Connect String
             // acre_player sideChat format["RESULT: %1", GVAR(pipeCode)];
             if (GVAR(pipeCode) != "1") then {
                 if (time > 15) then {

extensions/CMakeLists.txt

@@ -9,11 +9,13 @@ option(USE_STATIC_LINKING "USE_STATIC_LINKING" ON)
 
 set(CMAKE_BUILD_TYPE "RelWithDebInfo")
 
-find_package(DirectX)
-if(DirectX_FOUND)
-    message("Found DirectX")
-else()
-    message(FATAL_ERROR "DirectX NOT FOUND")
+if (WIN32)
+  find_package(DirectX)
+  if(DirectX_FOUND)
+      message("Found DirectX")
+  else()
+      message(FATAL_ERROR "DirectX NOT FOUND")
+  endif()
 endif()
 
 if(USE_STATIC_LINKING)
@@ -35,13 +37,21 @@ set(CMAKE_CL_64 ${USE_64BIT_BUILD})
 if(USE_64BIT_BUILD)
     message("INFO: Building 64-bit projects")
     set(ACRE_ARCH "x64")
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/build/win64/")
-    link_directories("${DirectX_ROOT_DIR}/lib/x64")
+    if(WIN32)
+        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/build/win64/")
+        link_directories("${DirectX_ROOT_DIR}/lib/x64")
+    else()
+        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/build/x86_64-linux-gnu/")
+    endif()
 else()
     message("INFO: Building 32-bit projects")
     set(ACRE_ARCH "x86")
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/build/win32/")
-    link_directories("${DirectX_ROOT_DIR}/lib/x86")
+    if(WIN32)
+        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/build/win32/")
+        link_directories("${DirectX_ROOT_DIR}/lib/x86")
+    else()
+        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/build/i686-linux-gnu/")
+    endif()
 endif()
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -65,12 +75,15 @@ include_directories(src/ACRE2Core)
 add_subdirectory(src/ACRE2Shared)
 add_subdirectory(src/ACRE2Core)
 
-add_subdirectory(src/ACRE2Arma)
-add_subdirectory(src/ACRE2Steam)
-
-add_subdirectory(src/ACRE2TS)
 add_subdirectory(src/ACRE2Mumble)
 
-#Extras
-add_subdirectory(src/Wav2B64)
-#add_subdirectory(src/ACRE2DistortionTestPlugin)
+if (WIN32)
+  add_subdirectory(src/ACRE2Arma)
+  add_subdirectory(src/ACRE2Steam)
+
+  add_subdirectory(src/ACRE2TS)
+
+  #Extras
+  add_subdirectory(src/Wav2B64)
+  #add_subdirectory(src/ACRE2DistortionTestPlugin)
+endif()