implement most requested changes

Author: dgruss

.github/workflows/main.yml

@@ -37,7 +37,6 @@ jobs:
             git
             make
             pkgconf
-            mingw-w64-x86_64-pkgconf
             mingw-w64-x86_64-gcc
             mingw-w64-x86_64-tools
       - name: Install Dependencies
@@ -58,11 +57,8 @@ jobs:
         run: |
           export PATH="/usr/bin:/mingw64/bin:/c/FPC/3.2.2/bin:/c/FPC/3.2.2/bin/i386-win32:$PATH"
           export MAKE="/usr/bin/make"
-          export PKG_CONFIG="/mingw64/bin/pkg-config"
-          export PKG_CONFIG_PATH="/mingw64/lib/pkgconfig:/mingw64/share/pkgconfig"
           export FPCCFG="/c/FPC/3.2.2/bin/i386-win32/fpc.cfg"
           export FPCDIR="/c/FPC/3.2.2"
-          export PPC="ppcrossx64"
           export FPCMAKE="/c/FPC/3.2.2/bin/i386-win32/fpcmake"
           ./autogen.sh
           ./configure

COMPILING.md

@@ -43,13 +43,11 @@ Optional libraries:
 
 #### Windows using MSYS2
 - Install [MSYS2](https://www.msys2.org)
-- Install [FPC](https://www.freepascal.org). Use the Win32 cross-to-Win64 installer so you get `ppcrossx64` and the Win64 RTL units.
-- `pacman -S autoconf-wrapper automake-wrapper gcc git make mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_image mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-lua mingw-w64-x86_64-pkgconf pkgconf`
+- Install [FPC](https://www.freepascal.org). Use the Win32 cross-to-Win64 installer so you get the Win64 RTL units.
+- `pacman -S autoconf-wrapper automake-wrapper git make mingw-w64-x86_64-gcc mingw-w64-x86_64-tools`
 - Add some information to `.bash_profile`:
   * Path to the cross compiler: `PATH="${PATH}:/c/FPC/3.2.2/bin/i386-win32"`
   * FPC config and base: `FPCCFG="/c/FPC/3.2.2/bin/i386-win32/fpc.cfg"` and `FPCDIR="/c/FPC/3.2.2"`
-  * mingw64 pkg-config path: `PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/mingw64/lib/pkgconfig:/mingw64/share/pkgconfig"`
-  * (Optional) pin the compiler: `PPC="ppcrossx64"`
 
 ### Compile and run
 - `git clone https://github.com/UltraStar-Deluxe/USDX`

dists/bamboo/bamboo-build-win-laz.bat

@@ -1,3 +1,3 @@
 USDXResCompiler.exe UltraStar.rc
 
-C:\lazarus\fpc\2.0.4\bin\i386-win32\ppcx64.exe  -S2cgi -OG1 -gl -vewnhi -l -Filib\JEDI-SDLv1.0\SDL\Pas\ -Fuc:\lazarus\components\jpeg\lib\i386-win32\ -Fuc:\lazarus\components\images\lib\i386-win32\ -Fuc:\lazarus\lcl\units\i386-win32\ -Fuc:\lazarus\lcl\units\i386-win32\win32\ -Fuc:\lazarus\packager\units\i386-win32\ -Fu. -oUltraStar.exe -dLCL -dLCLwin32 UltraStar.lpr
+C:\lazarus\fpc\2.0.4\bin\i386-win32\ppc386.exe  -S2cgi -OG1 -gl -vewnhi -l -Filib\JEDI-SDLv1.0\SDL\Pas\ -Fuc:\lazarus\components\jpeg\lib\i386-win32\ -Fuc:\lazarus\components\images\lib\i386-win32\ -Fuc:\lazarus\lcl\units\i386-win32\ -Fuc:\lazarus\lcl\units\i386-win32\win32\ -Fuc:\lazarus\packager\units\i386-win32\ -Fu. -oUltraStar.exe -dLCL -dLCLwin32 UltraStar.lpr