From 32e369d0bb71ea18860c93b40731cceb55bd05e3 Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Thu, 21 Dec 2023 01:00:03 +0000 Subject: [PATCH 1/4] Update windows.yml --- .github/workflows/windows.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a4f717f..0955371 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -13,6 +13,19 @@ jobs: - name: Checkout Source Tree uses: actions/checkout@v3 + - name: Setup TDM-GCC + run: | + choco install 7zip --version 22.1 -y + Invoke-WebRequest -Uri 'https://github.com/jmeubank/tdm-gcc/releases/download/v10.3.0-tdm64-2/tdm64-gcc-10.3.0-2.exe' -OutFile 'C:\Windows\temp\TDM-GCC-64.exe' + New-Item -ItemType Directory -Path 'C:\TDM-GCC-64' | Out-Null + Start-Process '7z' -ArgumentList 'e C:\Windows\temp\TDM-GCC-64.exe -oC:\TDM-GCC-64 -y' -Wait + Start-Process '7z' -ArgumentList 'e C:\TDM-GCC-64\*.tar.xz -oC:\TDM-GCC-64 -y' -Wait + Start-Process '7z' -ArgumentList 'x C:\TDM-GCC-64\*.tar -oC:\TDM-GCC-64 -y' -Wait + Remove-Item 'C:\TDM-GCC-64\*' -Include *.tar.xz, *.tar -Force + $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH + [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine) + Remove-Item -Path 'C:\Windows\temp\TDM-GCC-64.exe' -Force + - name: Setup folder directories run: | mkdir build From 28f0f891fa34616af526fe32ded58f886b70a8ef Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Thu, 21 Dec 2023 01:04:04 +0000 Subject: [PATCH 2/4] Update windows.yml --- .github/workflows/windows.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0955371..5a8e6a4 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -17,14 +17,12 @@ jobs: run: | choco install 7zip --version 22.1 -y Invoke-WebRequest -Uri 'https://github.com/jmeubank/tdm-gcc/releases/download/v10.3.0-tdm64-2/tdm64-gcc-10.3.0-2.exe' -OutFile 'C:\Windows\temp\TDM-GCC-64.exe' - New-Item -ItemType Directory -Path 'C:\TDM-GCC-64' | Out-Null + New-Item -ItemType Directory -Path 'C:\TDM-GCC-64' Start-Process '7z' -ArgumentList 'e C:\Windows\temp\TDM-GCC-64.exe -oC:\TDM-GCC-64 -y' -Wait Start-Process '7z' -ArgumentList 'e C:\TDM-GCC-64\*.tar.xz -oC:\TDM-GCC-64 -y' -Wait Start-Process '7z' -ArgumentList 'x C:\TDM-GCC-64\*.tar -oC:\TDM-GCC-64 -y' -Wait - Remove-Item 'C:\TDM-GCC-64\*' -Include *.tar.xz, *.tar -Force $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine) - Remove-Item -Path 'C:\Windows\temp\TDM-GCC-64.exe' -Force - name: Setup folder directories run: | From afaf98c80e515e79463886820e41035249f8b5c7 Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Thu, 21 Dec 2023 01:08:10 +0000 Subject: [PATCH 3/4] Update windows.yml --- .github/workflows/windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5a8e6a4..9d85aa4 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -23,12 +23,14 @@ jobs: Start-Process '7z' -ArgumentList 'x C:\TDM-GCC-64\*.tar -oC:\TDM-GCC-64 -y' -Wait $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine) + tree /f C:\TDM-GCC-64 - name: Setup folder directories run: | mkdir build mkdir build\x86 mkdir build\x64 + tree /f D:\a\ - name: Build xpmgr (x86) run: g++ -m32 -o build\x86\xpmgr_x86 xpmgr.cpp -lole32 -luuid -loleaut32 From 5ded5afd7e443e826257bb74461ddda4f9a2b0c4 Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Thu, 21 Dec 2023 01:11:16 +0000 Subject: [PATCH 4/4] Update windows.yml --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9d85aa4..5bbaa95 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -33,10 +33,10 @@ jobs: tree /f D:\a\ - name: Build xpmgr (x86) - run: g++ -m32 -o build\x86\xpmgr_x86 xpmgr.cpp -lole32 -luuid -loleaut32 + run: C:\TDM-GCC-64\bin\g++.exe -m32 -o build\x86\xpmgr_x86 xpmgr.cpp -lole32 -luuid -loleaut32 - name: Build xpmgr (x64) - run: g++ -o build\x64\xpmgr_x64 xpmgr.cpp -lole32 -luuid -loleaut32 + run: C:\TDM-GCC-64\bin\g++.exe -o build\x64\xpmgr_x64 xpmgr.cpp -lole32 -luuid -loleaut32 - name: Upload build artifact (x86) uses: actions/upload-artifact@v3.1.2