Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-06 14:15:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 817e7b1fdb into fec4428ebf

Browse source
This commit is contained in:
¥IGA 2025-03-17 17:52:29 +02:00 • committed by GitHub
commit 27b0e1a094
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/Qt_Build.yml vendored
View file

@ -20,7 +20,7 @@ jobs:
run: git submodule update --init --recursive run: git submodule update --init --recursive
- name: Setup Qt - name: Setup Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v4
with: with:
arch: win64_msvc2019_64 arch: win64_msvc2019_64
version: 6.2.0 version: 6.2.0
@ -42,7 +42,7 @@ jobs:
run: | run: |
mkdir upload mkdir upload
move build/Release/Alber.exe upload move build/Release/Alber.exe upload
windeployqt --dir upload upload/Alber.exe windeployqt --no-compiler-runtime --no-system-d3d-compiler --dir upload upload/Alber.exe
- name: Upload executable - name: Upload executable
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
@ -74,8 +74,8 @@ jobs:
run: | run: |
brew install dylibbundler imagemagick brew install dylibbundler imagemagick
- name: Install Qt - name: Setup Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v4
with: with:
aqtversion: '==3.1.*' aqtversion: '==3.1.*'
version: '6.8.1' version: '6.8.1'

1
CMakeLists.txt
View file

@ -158,6 +158,7 @@ include_directories(third_party/mio/single_include)
add_compile_definitions(NOMINMAX) # Make windows.h not define min/max macros because third-party deps don't like it add_compile_definitions(NOMINMAX) # Make windows.h not define min/max macros because third-party deps don't like it
add_compile_definitions(WIN32_LEAN_AND_MEAN) # Make windows.h not include literally everything add_compile_definitions(WIN32_LEAN_AND_MEAN) # Make windows.h not include literally everything
add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
add_compile_definitions(SDL_MAIN_HANDLED) add_compile_definitions(SDL_MAIN_HANDLED)
if(ENABLE_WAYLAND) if(ENABLE_WAYLAND)