Merge pull request #226 from Cpasjuste/dev

pemu: 6.6

.github/workflows/switch-dev.yml

@@ -24,33 +24,19 @@ jobs:
           sudo apt -yq update
           sudo apt -yq install git build-essential cmake zip
 
-      - name: Update pacman packages
-        run: |
-          dkp-pacman -Syyu --noconfirm
-
-      # TODO: remove when merged
-      - name: Install libarchive
-        run: |
-          dkp-pacman -S --noconfirm dkp-toolchain-vars
-          mkdir libarchive && cd libarchive
-          wget https://github.com/Cpasjuste/pacman-packages/raw/switch-libarchive/switch/libarchive/PKGBUILD
-          wget https://github.com/Cpasjuste/pacman-packages/raw/switch-libarchive/switch/libarchive/libarchive-3.3.2.patch
-          chown -R nobody ../libarchive
-          sudo -E -u nobody dkp-makepkg
-          dkp-pacman -U --noconfirm *.pkg.tar.xz
-
       # TODO: remove when merged
       - name: Update SDL2
         run: |
           git clone --depth 1 --branch switch-sdl2-2.0.14-dev https://github.com/devkitPro/SDL.git
           cd SDL && mkdir build && cd build
-          cmake -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake \
-            -DCMAKE_INSTALL_PREFIX=/opt/devkitpro/portlibs/switch ..
+          cmake \
+            -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake \
+            -DCMAKE_INSTALL_PREFIX=/opt/devkitpro/portlibs/switch \
+            -DCMAKE_BUILD_TYPE=Debug ..
           make -j $(getconf _NPROCESSORS_ONLN) install
 
       - name: Build pfbneo
         run: |
-          cd $GITHUB_WORKSPACE
           mkdir cmake-build-pfbneo && cd cmake-build-pfbneo
           source /etc/profile.d/devkit-env.sh
           cmake -G "Unix Makefiles" -DPLATFORM_SWITCH=ON -DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Debug ..
@@ -59,23 +45,20 @@ jobs:
 
       - name: Build pgen
         run: |
-          cd $GITHUB_WORKSPACE
           mkdir cmake-build-pgen && cd cmake-build-pgen
           source /etc/profile.d/devkit-env.sh
           cmake -G "Unix Makefiles" -DPLATFORM_SWITCH=ON -DOPTION_EMU=pgen -DCMAKE_BUILD_TYPE=Debug ..
           make -j $(getconf _NPROCESSORS_ONLN) pgen.nro
 
       - name: Build pnes
         run: |
-          cd $GITHUB_WORKSPACE
           mkdir cmake-build-pnes && cd cmake-build-pnes
           source /etc/profile.d/devkit-env.sh
           cmake -G "Unix Makefiles" -DPLATFORM_SWITCH=ON -DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Debug ..
           make -j $(getconf _NPROCESSORS_ONLN) pnes.nro
 
       - name: Build psnes
         run: |
-          cd $GITHUB_WORKSPACE
           mkdir cmake-build-psnes && cd cmake-build-psnes
           source /etc/profile.d/devkit-env.sh
           cmake -G "Unix Makefiles" -DPLATFORM_SWITCH=ON -DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Debug ..

.github/workflows/switch-release.yml

@@ -24,27 +24,15 @@ jobs:
           sudo apt -yq update
           sudo apt -yq install git build-essential cmake zip
 
-      - name: Update pacman packages
-        run: |
-          dkp-pacman -Syyu --noconfirm
-
       # TODO: remove when merged
-      - name: Install libarchive
-        run: |
-          dkp-pacman -S --noconfirm dkp-toolchain-vars
-          mkdir libarchive && cd libarchive
-          wget https://github.com/Cpasjuste/pacman-packages/raw/switch-libarchive/switch/libarchive/PKGBUILD
-          wget https://github.com/Cpasjuste/pacman-packages/raw/switch-libarchive/switch/libarchive/libarchive-3.3.2.patch
-          chown -R nobody ../libarchive
-          sudo -E -u nobody dkp-makepkg
-          dkp-pacman -U --noconfirm *.pkg.tar.xz
-
       - name: Update SDL2
         run: |
           git clone --depth 1 --branch switch-sdl2-2.0.14-dev https://github.com/devkitPro/SDL.git
           cd SDL && mkdir build && cd build
-          cmake -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake \
-            -DCMAKE_INSTALL_PREFIX=/opt/devkitpro/portlibs/switch ..
+          cmake \
+            -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake \
+            -DCMAKE_INSTALL_PREFIX=/opt/devkitpro/portlibs/switch \
+            -DCMAKE_BUILD_TYPE=Release ..
           make -j $(getconf _NPROCESSORS_ONLN) install
 
       - name: Build pfbneo

CMakeLists.txt

@@ -13,6 +13,7 @@ set(OPTION_BUILTIN_LIBCONFIG OFF CACHE BOOL "Build libconfig from sources")
 set(OPTION_BUILTIN_MINIZIP OFF CACHE BOOL "Build minizip from sources")
 set(OPTION_MPV_PLAYER ON CACHE BOOL "Add support for video snaps (mpv)")
 set(OPTION_UPDATE_CONFIG OFF CACHE BOOL "Force config file updating")
+set(OPTION_FTP_SERVER OFF CACHE BOOL "Embedded ftp server")
 ####################
 # BUILD OPTIONS
 ####################