update linux

.github/workflows/build.yaml

@@ -30,3 +30,37 @@ jobs:
           name: chiaki-borealis
           path: |
             ChiakiBorealis
+  linux-x64:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: alpine.sh --root {0}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: jirutka/setup-alpine@v1
+        with:
+          packages: >
+            build-base
+            git
+            cmake
+            ninja
+            protoc
+            py3-protobuf
+            py3-setuptools
+            opus-dev
+            ffmpeg-dev
+            sdl2-dev
+            gcc 
+            g++ 
+            openssl-dev 
+            glfw-dev 
+            glm-dev
+      - name: alpine-build-chiaki
+        run: |
+          ./scripts/github-alpine-build.sh
+      - name: Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: chiaki-borealis
+          path: |
+            ChiakiBorealis

gui2/CMakeLists.txt

@@ -96,12 +96,18 @@ set_target_properties(chiaki-borealis PROPERTIES
 
 target_include_directories(chiaki-borealis PRIVATE include example)
 
-message(STATUS "is win32 ???????? 11${WIN32}11")
+if (WIN32)
+	set(ADDON "iconv")
+else()
+	set(ADDON "${SWRESAMPLE}")
+endif()
+
+message(STATUS "is win32: ${WIN32}")
 
 target_link_libraries(chiaki-borealis
 	chiaki-lib
 	borealis
-	iconv
+	${ADDON}
 	SDL2::SDL2
 	SDL2::SDL2main
 	FFMPEG::avcodec

gui2/src/discoverymanager.cpp

@@ -4,9 +4,12 @@
 #include <switch.h>
 #endif
 
-// #include <arpa/inet.h>
-// #include <netdb.h>
-// #include <netinet/in.h>
+#ifdef _WIN32
+#else
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 

gui2/src/main.cpp

@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: LicenseRef-AGPL-3.0-only-OpenSSL
-#include <windows.h>
 // chiaki modules
 #include <chiaki/discovery.h>
 #include <chiaki/log.h>
@@ -11,6 +10,10 @@
 #include "io.h"
 #include "settings.h"
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 #ifdef __SWITCH__
 #include <switch.h>
 #else
@@ -144,6 +147,8 @@ int main(int argc, char *argv[])
 	return start();
 }
 
+#ifdef _WIN32
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
 	return start();
 }
+#endif

scripts/github-alpine-build.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -xe
+
+apk add git cmake ninja protoc py3-protobuf py3-setuptools opus-dev ffmpeg-dev sdl2-dev gcc g++ openssl-dev glfw-dev glm-dev
+
+rm -rf build
+
+cmake -Bbuild -GNinja -DCHIAKI_ENABLE_GUI=OFF -DCHIAKI_ENABLE_CLI=OFF -DCHIAKI_ENABLE_GUI2=ON -DCHIAKI_ENABLE_PI_DECODER=OFF -DCHIAKI_GUI_ENABLE_SDL_GAMECONTROLLER=ON
+
+ninja -C build
+
+mkdir ChiakiBorealis && cp build/gui2/chiaki ChiakiBorealis
+
+# copy resources
+mkdir ChiakiBorealis/gui2
+cp -vr gui2/res ChiakiBorealis/gui2
+cp -vr scripts/chiaki.conf ChiakiBorealis/
+
+ls -alh ChiakiBorealis