diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 47cb25d5bd64..9ef127492b2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,6 @@ jobs: # Build Dependencies "bison" "pkg-config" - "mingw-w64" "gcenx/wine/cx-llvm" # Utilities (DXVK) @@ -53,6 +52,23 @@ jobs: brew install "${REQUIRED_PACKAGES[@]}" + # As of mingw-w64 12, brew uses UCRT instead of MSVCRT + # Wine will fail to build with UCRT, so we must rollback. + + curl -L https://raw.githubusercontent.com/Homebrew/homebrew-core/31209a399a7b40bf2cd3abd7aee2715547ccd5bd/Formula/m/mingw-w64.rb > mingw-w64.rb && brew install mingw-w64.rb + rm mingw-w64.rb + + - name: Echo Libs [DEBUG] + run: | + echo "Brew Libs\n=========" + ls $(brew --prefix)/lib + + echo "FFmpeg Libs\n===========" + ls $(brew --prefix ffmpeg@6)/lib + + echo "GStreamer Libs\n==============" + ls $(brew --prefix gstreamer)/lib/gstreamer-1.0 + - name: Add bison & cx-llvm to $PATH run: | echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH @@ -200,6 +216,7 @@ jobs: - name: Copy External Libraries run: | LIBS=( + "libbluray.2" "libfreetype" "libfreetype.6" "libgio-2.0.0" @@ -240,6 +257,7 @@ jobs: "libSDL2-2.0.0" "libtasn1.6" "libunistring.5" + "libvpx.8" "libXau.6" "libXdmcp.6" "libX11.6" @@ -252,6 +270,9 @@ jobs: "libavformat.60" "libavcodec.60" "libavutil.58" + "libpostproc.57" + "libswresample.4" + "libswscale.7" ) GSTREAMER_LIBS=( diff --git a/GPTK/redist/Read Me.rtf b/GPTK/redist/Read Me.rtf index 11447691dd69..0815a9d9e40c 100644 --- a/GPTK/redist/Read Me.rtf +++ b/GPTK/redist/Read Me.rtf @@ -1,6 +1,7 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2758 -\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;\f2\fnil\fcharset0 Menlo-Regular; -\f3\fnil\fcharset0 LucidaGrande;\f4\fswiss\fcharset0 Helvetica-Oblique;} +{\rtf1\ansi\ansicpg1252\cocoartf2761 +\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;\f2\fmodern\fcharset0 CourierNewPS-BoldMT; +\f3\fnil\fcharset0 Menlo-Regular;\f4\fnil\fcharset0 LucidaGrande;\f5\fswiss\fcharset0 Helvetica-Oblique; +} {\colortbl;\red255\green255\blue255;} {\*\expandedcolortbl;;} {\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1} @@ -15,12 +16,17 @@ {\list\listtemplateid10\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid901\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid10} {\list\listtemplateid11\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1001\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid11} {\list\listtemplateid12\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1101\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid12} -{\list\listtemplateid13\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1201\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid13}} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}{\listoverride\listid8\listoverridecount0\ls8}{\listoverride\listid9\listoverridecount0\ls9}{\listoverride\listid10\listoverridecount0\ls10}{\listoverride\listid11\listoverridecount0\ls11}{\listoverride\listid12\listoverridecount0\ls12}{\listoverride\listid13\listoverridecount0\ls13}} +{\list\listtemplateid13\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1201\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid13} +{\list\listtemplateid14\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1301\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid14} +{\list\listtemplateid15\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1401\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid15} +{\list\listtemplateid16\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1501\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid16} +{\list\listtemplateid17\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1601\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid17} +{\list\listtemplateid18\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1701\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid18}} +{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}{\listoverride\listid8\listoverridecount0\ls8}{\listoverride\listid9\listoverridecount0\ls9}{\listoverride\listid10\listoverridecount0\ls10}{\listoverride\listid11\listoverridecount0\ls11}{\listoverride\listid12\listoverridecount0\ls12}{\listoverride\listid13\listoverridecount0\ls13}{\listoverride\listid14\listoverridecount0\ls14}{\listoverride\listid15\listoverridecount0\ls15}{\listoverride\listid16\listoverridecount0\ls16}{\listoverride\listid17\listoverridecount0\ls17}{\listoverride\listid18\listoverridecount0\ls18}} \margl1440\margr1440\vieww28400\viewh15820\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 -\f0\b\fs36 \cf0 Game Porting Toolkit 1.1 README\ +\f0\b\fs36 \cf0 Evaluation environment for Windows games 2.0 README\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 \f1\b0\fs24 \cf0 \ @@ -29,133 +35,203 @@ \f0\b\fs28 \cf0 Overview \f1\b0\fs24 \ \ -The Game Porting Toolkit helps game developers create an environment for evaluating their existing Windows games right on Apple Silicon Macs running macOS 14. Using the included binaries and installation and configuration instructions, you can run your game to get a sense of how it can feel and play right away, even before you begin your porting journey.\ +The evaluation environment for Windows games is now a subset of the expanded Game Porting Toolkit. The evaluation environment helps game developers try out their existing Windows games right on Apple Silicon Macs running macOS 14 or higher. Using community projects that bundle the evaluation environment, or building your own environment using the included binaries and installation and configuration instructions, you can run your game to get a sense of how it can feel and play right away, even before you begin your porting journey.\ \ \f0\b\fs28 Requirements \f1\b0\fs24 \ \ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural\partightenfactor0 -\ls1\ilvl0\cf0 {\listtext \uc0\u8226 }The Game Porting Toolkit currently only runs on Apple Silicon Macs running macOS 14 Sonoma.\ +\ls1\ilvl0\cf0 {\listtext \uc0\u8226 }The evaluation environment for Windows games only runs on Apple Silicon Macs running macOS 14 Sonoma or higher.\ {\listtext \uc0\u8226 }Translated games require more resources, so developer-focused Macs with 16GB of RAM or more are recommended.\ -{\listtext \uc0\u8226 }The provided macOS graphics bridge libraries must be configured with a custom version of the Wine translation environment in order to create your game evaluation environment.\ +{\listtext \uc0\u8226 }The provided macOS graphics bridge libraries must be configured with a custom version of the Wine translation environment in order to create your evaluation environment.\ {\listtext \uc0\u8226 }Instructions and scripts for building and configuring the custom version of Wine are included here.\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\tx9060\pardirnatural\partightenfactor0 \cf0 \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 -\f0\b\fs28 \cf0 Installation and Setup\ +\f0\b\fs28 Installation and Setup\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 \f1\b0\fs24 \cf0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 +\f0\b \cf0 Option 1: Use a pre-built evaluation environment\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 + +\f1\b0 \cf0 \ +While simple to use once configured and installed, the evaluation environment for Windows games can take time to configure and use correctly depending on your proficiency and comfort with command-line tools and your experience using translation tools like WINE. The following free and commercial products incorporate the supplemental evaluation layers from this distribution within a pre-built WINE environment.\ +\ +\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural\partightenfactor0 +\ls2\ilvl0\cf0 {\listtext \uc0\u8226 }Dean Greer\'92s (aka GCenX) +\f0\b homebrew-wine +\f1\b0 ({\field{\*\fldinst{HYPERLINK "https://github.com/Gcenx/homebrew-wine"}}{\fldrslt https://github.com/Gcenx/homebrew-wine}}) and +\f0\b game-porting-toolkit +\f1\b0 ({\field{\*\fldinst{HYPERLINK "https://github.com/Gcenx/game-porting-toolkit/releases"}}{\fldrslt https://github.com/Gcenx/game-porting-toolkit}}) casks - use +\f2\b brew install --cask --no-quarantine gcenx/wine/ +\f1\b0 to easily install either of the more complete environments and the graphical translation layer.\ +{\listtext \uc0\u8226 }Isaac Marovitz\'92s +\f0\b Whisky +\f1\b0 ({\field{\*\fldinst{HYPERLINK "https://getwhisky.app/"}}{\fldrslt https://getwhisky.app}} and {\field{\*\fldinst{HYPERLINK "https://github.com/Whisky-App/Whisky"}}{\fldrslt https://github.com/Whisky-App/Whisky}}) - Whisky is a community supported easy-to-user graphical interface that creates an evaluation environment and installs and configures the graphical translation layer.\ +{\listtext \uc0\u8226 }CodeWeaver\'92s +\f0\b CrossOver +\f1\b0 . ({\field{\*\fldinst{HYPERLINK "https://www.codeweavers.com/crossover"}}{\fldrslt https://www.codeweavers.com/crossover}}) CodeWeavers offers a 14-day free trial of CrossOver, which includes integration of the graphical translation layer.\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 + +\f0\b \cf0 \ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 + +\f1\b0 \cf0 Note: early in the macOS 15 beta period these pre-built tools may still be carrying the 1.1 version of D3DMetal. You can temporarily update these tools to use the 2.0 version as follows.\ +\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb240\pardirnatural\partightenfactor0 +\ls3\ilvl0\cf0 {\listtext \uc0\u8226 } +\f0\b homebrew-wine +\f1\b0 and +\f0\b game-porting-toolkit +\f1\b0 casks - you can replace the copies of the D3DMetal.framework and libd3dshared.dylib found at /Applications/Game\\ Porting\\ Toolkit.app/Contents/Resources/wine/lib/external/ with the libraries from this distribution:\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li1438\fi-3\sb120\pardirnatural\partightenfactor0 + +\f3 \cf0 cd /Applications/Game\\ Porting\\ Toolkit.app/Contents/Resources/wine/lib/external\ +mv D3DMetal.framework D3DMetal.framework-old; mv libd3dshared.dylib libd3dshared.dylib-old\ +ditto /Volumes/Evaluation\\ environment\\ for\\ Windows\\ games\\ 2.0/redist/lib/external/ . +\f1 \ +\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb240\pardirnatural\partightenfactor0 +\ls4\ilvl0\cf0 {\listtext \uc0\u8226 } +\f0\b Whisky +\f1\b0 : replace Whisky\'92s copies of the D3DMetal.framework and libd3dshared.dylib found at ~/Library/Application Support/com.isaacmarovitz.Whisky/Libraries/Wine/lib/external/ with the libraries from this distribution:\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li1438\fi-3\sb120\pardirnatural\partightenfactor0 + +\f3 \cf0 cd ~/Library/Application\\ Support/com.isaacmarovitz.Whisky/Libraries/Wine/lib/external\ +mv D3DMetal.framework D3DMetal.framework-old; mv libd3dshared.dylib libd3dshared.dylib-old\ +ditto /Volumes/Evaluation\\ environment\\ for\\ Windows\\ games\\ 2.0/redist/lib/external/ . +\f1 \ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 +\cf0 \ +\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb240\pardirnatural\partightenfactor0 +\ls5\ilvl0\cf0 {\listtext \uc0\u8226 } +\f0\b CrossOver +\f1\b0 : replace CrossOver\'92s copies of the D3DMetal.framework and libd3dshared.dylib found at ~/Library/Application Support/com.isaacmarovitz.Whisky/Libraries/Wine/lib/external/ with the libraries from this distribution:\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li1438\fi-3\sb120\pardirnatural\partightenfactor0 + +\f3 \cf0 cd /Applications/CrossOver.app/Contents/SharedSupport/CrossOver/lib64/apple_gptk/external\ +mv D3DMetal.framework D3DMetal.framework-old; mv libd3dshared.dylib libd3dshared.dylib-old\ +ditto /Volumes/Evaluation\\ environment\\ for\\ Windows\\ games\\ 2.0/redist/lib/external/ . +\f1 \ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 +\cf0 \ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 + +\f0\b \cf0 \ +Option 2: Build your own evaluation environment from scratch +\f1\b0 \ +\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\pardirnatural\partightenfactor0 +\ls6\ilvl0\cf0 \ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 + \f0\b \cf0 1. Setup your development and Homebrew environment \f1\b0 \ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb240\pardirnatural\partightenfactor0 -\ls2\ilvl0\cf0 {\listtext \uc0\u8226 }Ensure the latest Command Line Tools for Xcode 15, or Xcode 15 itself are installed. Visit https://developer.apple.com/downloads to download these tools.\ +\ls7\ilvl0\cf0 {\listtext \uc0\u8226 }Ensure that you are usihg Command Line Tools for Xcode 15.1. Visit https://developer.apple.com/downloads to download this older version of the tools. Note: there is a header file layout change preventing the use of newer versions of the macOS SDK which we are well aware of.\ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb240\pardirnatural\partightenfactor0 -\ls3\ilvl0\cf0 {\listtext \uc0\u8226 }Open Terminal.\ +\ls8\ilvl0\cf0 {\listtext \uc0\u8226 }Open Terminal.\ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb240\pardirnatural\partightenfactor0 -\ls4\ilvl0\cf0 {\listtext \uc0\u8226 }The Game Porting Toolkit runs under Rosetta 2. Ensure that Rosetta 2 is installed.\ +\ls9\ilvl0\cf0 {\listtext \uc0\u8226 }The evaluation environment for Windows games runs under Rosetta 2. Ensure that Rosetta 2 is installed.\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li1438\fi-3\sb120\pardirnatural\partightenfactor0 -\f2 \cf0 softwareupdate --install-rosetta +\f3 \cf0 softwareupdate --install-rosetta \f1 \ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb240\pardirnatural\partightenfactor0 -\ls5\ilvl0\cf0 {\listtext \uc0\u8226 }Enter an x86_64 shell to continue the following steps in a Rosetta environment. All subsequent commands should be run within this shell.\ +\ls10\ilvl0\cf0 {\listtext \uc0\u8226 }Enter an x86_64 shell to continue the following steps in a Rosetta environment. All subsequent commands should be run within this shell.\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li1438\fi-3\sb120\pardirnatural\partightenfactor0 -\f2 \cf0 arch -x86_64 zsh +\f3 \cf0 arch -x86_64 zsh \f1 \ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb240\pardirnatural\partightenfactor0 -\ls6\ilvl0\cf0 {\listtext \uc0\u8226 }Install the x86_64 version of Homebrew if you don't already have it. -\f2 \ +\ls11\ilvl0\cf0 {\listtext \uc0\u8226 }Install the x86_64 version of Homebrew if you don't already have it. +\f3 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li1438\fi-3\sb120\pardirnatural\partightenfactor0 \cf0 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" \f1 \ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb120\pardirnatural\partightenfactor0 -\ls7\ilvl0\cf0 {\listtext \uc0\u8226 }Make sure the brew command is on your path:\ +\ls12\ilvl0\cf0 {\listtext \uc0\u8226 }Make sure the brew command is on your path:\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li1438\fi-3\sb120\pardirnatural\partightenfactor0 -\f2 \cf0 which brew +\f3 \cf0 which brew \f1 \ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb120\pardirnatural\partightenfactor0 \cf0 If this command does not print -\f2 /usr/local/bin/brew +\f3 /usr/local/bin/brew \f1 , you must either modify your -\f2 PATH +\f3 PATH \f1 to put -\f2 /usr/local/bin +\f3 /usr/local/bin \f1 first, or fully specify the path to -\f2 brew +\f3 brew \f1 in the subsequent commands.\ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb240\pardirnatural\partightenfactor0 -\ls8\ilvl0\cf0 {\listtext \uc0\u8226 }Tap the Apple Homebrew tap, which can be found at -\f2 https://github.com/apple +\ls13\ilvl0\cf0 {\listtext \uc0\u8226 }Tap the Apple Homebrew tap, which can be found at +\f3 https://github.com/apple \f1 :\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li1438\fi-3\sb120\pardirnatural\partightenfactor0 -\f2 \cf0 brew tap apple/apple http://github.com/apple/homebrew-apple +\f3 \cf0 brew tap apple/apple http://github.com/apple/homebrew-apple \f1 \ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb240\pardirnatural\partightenfactor0 -\ls9\ilvl0\cf0 {\listtext \uc0\u8226 }Install the -\f2 game-porting-toolkit +\ls14\ilvl0\cf0 {\listtext \uc0\u8226 }Install the +\f3 game-porting-toolkit \f1 formula. This formula downloads and compiles several large software projects. How long this takes will depend on the speed of your computer.\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li1438\fi-3\sb120\pardirnatural\partightenfactor0 -\f2 \cf0 brew -v install apple/apple/game-porting-toolkit\ +\f3 \cf0 brew -v install apple/apple/game-porting-toolkit\ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb240\pardirnatural\partightenfactor0 -\ls10\ilvl0 +\ls15\ilvl0 \f1 \cf0 {\listtext \uc0\u8226 }If during installation you see an error such as \'93 -\f2 Error: game-porting-toolkit: unknown or unsupported macOS version: :dunno +\f3 Error: game-porting-toolkit: unknown or unsupported macOS version: :dunno \f1 \'94, your version of Homebrew doesn\'92t have macOS Sonoma support. Update to the latest version of Homebrew and try again.\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li1438\fi-3\sb120\pardirnatural\partightenfactor0 -\f2 \cf0 brew update\uc0\u8232 brew -v install apple/apple/game-porting-toolkit\ +\f3 \cf0 brew update\uc0\u8232 brew -v install apple/apple/game-porting-toolkit\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 \f1 \cf0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 -\f0\b \cf0 2. Create a new Wine prefix for your Game Porting Toolkit environment\ +\f0\b \cf0 2. Create a new Wine prefix for your evaluation environment for Windows games:\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 \f1\b0 \cf0 \ A Wine prefix contains a virtual C: drive. You will install the toolkit and your game into this virtual C: drive.\ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb240\pardirnatural\partightenfactor0 -\ls11\ilvl0\cf0 {\listtext \uc0\u8226 }Run the following command to create a new Wine prefix named +\ls16\ilvl0\cf0 {\listtext \uc0\u8226 }Run the following command to create a new Wine prefix named \f0\b my-game-prefix \f1\b0 in your home directory.\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li961\fi1\sb120\pardirnatural\partightenfactor0 -\f2 \cf0 WINEPREFIX=~/my-game-prefix `brew --prefix game-porting-toolkit`/bin/wine64 winecfg +\f3 \cf0 WINEPREFIX=~/my-game-prefix `brew --prefix game-porting-toolkit`/bin/wine64 winecfg \f1 \ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb240\pardirnatural\partightenfactor0 \cf0 A \'93Wine configuration\'94 window should appear on your screen.\ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb240\pardirnatural\partightenfactor0 -\ls12\ilvl0\cf0 {\listtext \uc0\u8226 }Change the version of Windows to Windows 10.\ +\ls17\ilvl0\cf0 {\listtext \uc0\u8226 }Change the version of Windows to Windows 10.\ {\listtext \uc0\u8226 }Choose Apply and then OK to exit winecfg.\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 \cf0 \ If the \'93Wine configuration\'94 window does not appear, and no new icon appears in the Dock, verify that you have correctly installed the x86_64 version of Homebrew as well as the -\f2 game-porting-toolkit +\f3 game-porting-toolkit \f1 formula.\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 -\f0\b \cf0 3. Install the redistributables from the toolkit into the Wine prefix\ +\f0\b \cf0 3. Install the redistributables from the evaluation environment into the Wine prefix\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 \f1\b0 \cf0 \ -The graphics bridge libraries need to be placed inside your Wine prefix in order to finalize your game evaluation environment. These instructions assume you have mounted the Game Porting Toolkit at -\f2 /Volumes/Game Porting Toolkit-1.1 +The graphics bridge libraries need to be placed inside your Wine prefix in order to finalize your evaluation environment. These instructions assume you have mounted the evaluation environment package at +\f3 /Volumes/Evaluation Environment For Windows Games-2.0 \f1 .\ \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\sb240\pardirnatural\partightenfactor0 -\ls13\ilvl0\cf0 {\listtext \uc0\u8226 }Copy the Game Porting Toolkit library directory into Wine\'92s library directory.\ +\ls18\ilvl0\cf0 {\listtext \uc0\u8226 }Copy the Game Porting Toolkit library directory into Wine\'92s library directory.\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li1438\fi-3\sb120\pardirnatural\partightenfactor0 -\f2 \cf0 ditto /Volumes/Game\\ Porting\\ Toolkit-1.1/redist/lib/ `brew --prefix game-porting-toolkit`/lib/\ +\f3 \cf0 ditto /Volumes/Evaluation\\ Environment\\ For\\ Windows\\ Games-2.0/redist/lib/ `brew --prefix game-porting-toolkit`/lib/\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 \f1 \cf0 \ @@ -166,11 +242,11 @@ The graphics bridge libraries need to be placed inside your Wine prefix in order \f1\b0\fs24 \cf0 \ Open your Wine prefix\'92s virtual C: drive in Finder (open -\f2 ~/my-game-prefix/drive_c -\f1 ) and copy your game into an appropriate subdirectory.\ +\f3 ~/my-game-prefix/drive_c +\f1 ) and copy your game into an appropriate subdirectory of your choosing.\ \ The provided -\f2 bin/gameportingtoolkit* +\f3 bin/ee4wg* \f1 scripts can be copied onto your path to facilitate different forms of logging and launching. You can run these scripts from any shell; you don\'92t need to switch to the Rosetta environment first.\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 @@ -181,11 +257,11 @@ The provided \f1\b0 \cf0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li961\fi1\pardirnatural\partightenfactor0 -\f2 \cf0 gameportingtoolkit ~/my-game-prefix 'C:\\Program Files\\MyGame\\MyGame.exe'\ +\f3 \cf0 gameportingtoolkit ~/my-game-prefix 'C:\\Program Files\\MyGame\\MyGame.exe'\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 \f1 \cf0 \ -This launches the given Windows game binary with a visible extended Metal Performance HUD and filters logging to output from the Game Porting Toolkit.\ +This launches the given Windows game binary with a visible extended Metal Performance HUD and filters logging to just show output from the D3DMetal graphics layer.\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 @@ -195,7 +271,7 @@ This launches the given Windows game binary with a visible extended Metal Perfor \f1\b0 \cf0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li961\fi1\pardirnatural\partightenfactor0 -\f2 \cf0 gameportingtoolkit-no-hud ~/my-game-prefix 'C:\\Program Files\\MyGame\\MyGame.exe' \ +\f3 \cf0 gameportingtoolkig-no-hud ~/my-game-prefix 'C:\\Program Files\\MyGame\\MyGame.exe' \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 \f1 \cf0 \ @@ -209,7 +285,7 @@ Launches your game without the extended Metal Performance HUD visible.\ \f1\b0 \cf0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li961\fi1\pardirnatural\partightenfactor0 -\f2 \cf0 gameportingtoolkit-no-esync ~/my-game-prefix 'C:\\Program Files\\MyGame\\MyGame.exe' \ +\f3 \cf0 gameportingtoolkit-no-esync ~/my-game-prefix 'C:\\Program Files\\MyGame\\MyGame.exe' \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 \f1 \cf0 \ @@ -221,14 +297,14 @@ Finally, the no-esync versions of the script disable Wine's ESYNC option, a comm \f1\b0\fs24 \ \ Logging output will appear in the Terminal window in which you launch your game as well as the system log, which can be viewed with the Console app found in Applications -\f3 \uc0\u9656 -\f1 Utilities. Log messages from the Game Porting Toolkit are prefixed with +\f4 \uc0\u9656 +\f1 Utilities. Log messages from the evolution environment for Windows games are prefixed with \f0\b D3DM \f1\b0 . By default the -\f2 gameportingtoolkit* +\f3 ee4wg* \f1 scripts will filter to just the \f0\b D3DM -\f1\b0 -prefixed messages. If you are experiencing an issue and want to send logging information through https://feedbackassistant.apple.com, please send the full logs without filtering to +\f1\b0 -prefixed messages. If you are experiencing an issue and want to send logging information through https://feedbackassistant.apple.com, please attach and send the full logs without filtering to \f0\b D3DM. \f1\b0 \ \ @@ -241,16 +317,14 @@ Logging output will appear in the Terminal window in which you launch your game \f0\b \cf0 My game won't run and crashes with an invalid instruction \f1\b0 \ \ -Invalid instruction crashes are often (but not always) caused when Rosetta 2 is unable to translate AVX/AVX2 instructions. You may be able to recompile a version of your game without AVX/AVX2 instructions in order to evaluate its potential on Apple Silicon with the Game Porting Toolkit when you hit this error. When porting your code natively to Apple Silicon, NEON instructions are a high-performance replacement for AVX/AVX2.\ -\ +Invalid instruction crashes are sometimes caused when Rosetta 2 is unable to translate instructions. You may be able to recompile a version of your game without certain instructions in order to evaluate its potential on Apple Silicon with the Game Porting Toolkit when you hit this error. When porting your code natively to Apple Silicon there are a variety or NEON and ARM instructions which offer high-performance replacements for AVX/AVX2, BMI1/2, F16c and other less common instruction set extensions.\ \ \f0\b My game won't run because its anti-cheat or DRM software is incompatible with Wine translation.\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 \f1\b0 \cf0 \ -You may be able to rebuild a custom version of your game in your Windows development environment with anti-cheat or DRM disabled for your own evaluation purposes. When porting your code natively to Apple Silicon and macOS, contact your anti-cheat or DRM provider\'97most have native Apple Silicon solutions for your native build, or you may find that existing macOS solutions like Hardened Runtime and Application Sandbox prevent forms of cheating that concern you.\ -\ +You may be able to rebuild a custom version of your game in your Windows development environment with anti-cheat or DRM disabled for your own evaluation purposes. When porting your code natively to Apple Silicon and macOS, contact your anti-cheat or DRM provider\'97most have native Apple Silicon solutions for your native build, or you may find that existing macOS solutions like Hardened Runtime, Application Sandbox, and Application Attestation prevent forms of cheating or tampering that concern you.\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 @@ -259,21 +333,21 @@ You may be able to rebuild a custom version of your game in your Windows develop \ First, make sure you have selected an appropriate Windows version in winecfg. This affects the major and minor Windows versions that are reported to your game.\ \ -If your game checks for a specific build version, you can alter this value by changing the -\f2 CurrentBuild +If your game checks for a specific minimum or an exact build version, you can alter this value by changing the +\f3 CurrentBuild \f1 and -\f2 CurrentBuildNumber +\f3 CurrentBuildNumber \f1 values of the -\f2 HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT +\f3 HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT \f1 registry key. You must perform this step -\f4\i after +\f5\i after \f1\i0 selecting a Windows version in winecfg. Run the following commands, replacing -\f2 \'abBUILD_NUMBER\'bb +\f3 \'abBUILD_NUMBER\'bb \f1 with the specific build number your game checks for:\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li961\fi1\pardirnatural\partightenfactor0 -\f2 \cf0 WINEPREFIX=~/my-game-prefix `brew --prefix game-porting-toolkit`/bin/wine64 reg add 'HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion' /v CurrentBuild /t REG_SZ /d \'abBUILD_NUMBER\'bb /f\ +\f3 \cf0 WINEPREFIX=~/my-game-prefix `brew --prefix game-porting-toolkit`/bin/wine64 reg add 'HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion' /v CurrentBuild /t REG_SZ /d \'abBUILD_NUMBER\'bb /f\ WINEPREFIX=~/my-game-prefix `brew --prefix game-porting-toolkit`/bin/wine64 reg add 'HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion' /v CurrentBuildNumber /t REG_SZ /d \'abBUILD_NUMBER\'bb /f\ WINEPREFIX=~/my-game-prefix `brew --prefix game-porting-toolkit`/bin/wineserver -k \f1 \ @@ -287,11 +361,11 @@ The last command will shut down the virtual Windows environment to ensure that a \f0\b \cf0 My game won\'92t run because it requires Mono, .NET, or the MSVCRT runtime. \f1\b0 \ \ -The game porting toolkit\'92s evaluation environment does not pre-install these runtime support packages. If your game makes use of one of these packages, consider searching for and downloading appropriate installers (.exe or .msi) and installing them to your evaluation environment. Additional runtime installers can be run on your environment by just launching the installer and following its installation instructions:\ +The evaluation environment for Windows games does not pre-install these runtime support packages. If your game makes use of one of these packages, consider searching for and downloading appropriate installers (.exe or .msi) and installing them to your evaluation environment. Additional runtime installers can be run on your environment by just launching the installer and following its installation instructions:\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li961\fi1\pardirnatural\partightenfactor0 -\f2 \cf0 WINEPREFIX=~/my-game-prefix `brew --prefix game-porting-toolkit`/bin/wine64 \ +\f3 \cf0 WINEPREFIX=~/my-game-prefix `brew --prefix game-porting-toolkit`/bin/wine64 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 \f1 \cf0 \ @@ -301,7 +375,7 @@ And .MSI packages can be installed by launching the Windows \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li961\fi1\pardirnatural\partightenfactor0 -\f2 \cf0 WINEPREFIX=~/my-game-prefix `brew --prefix game-porting-toolkit`/bin/wine64 uninstaller\ +\f3 \cf0 WINEPREFIX=~/my-game-prefix `brew --prefix game-porting-toolkit`/bin/wine64 uninstaller\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 @@ -309,12 +383,12 @@ And .MSI packages can be installed by launching the Windows \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 -\f1\b0 \cf0 If the game stopped booting without being updated, you can try clearing the shader cache. \ +\f1\b0 \cf0 If the game stopped booting without being updated, you can try clearing the shader cache.\ Run the following commands:\ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li961\fi1\pardirnatural\partightenfactor0 -\f2 \cf0 cd $(getconf DARWIN_USER_CACHE_DIR)/d3dm\ +\f3 \cf0 cd $(getconf DARWIN_USER_CACHE_DIR)/d3dm\ cd \'abGAME_NAME\'bb\ rm -r shaders.cache \f1 \ diff --git a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/D3DMetal b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/D3DMetal index db1654559d8c..11320dd90677 100755 Binary files a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/D3DMetal and b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/D3DMetal differ diff --git a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/Info.plist b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/Info.plist index 16fb91cf163b..a1b4e66c7237 100644 Binary files a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/Info.plist and b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/Info.plist differ diff --git a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/default.metallib b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/default.metallib index efbde0440293..c000e81e2ee2 100644 Binary files a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/default.metallib and b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/default.metallib differ diff --git a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libdxccontainer.dylib b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libdxccontainer.dylib index 7f9e5a18b016..383e4ee56e97 100755 Binary files a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libdxccontainer.dylib and b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libdxccontainer.dylib differ diff --git a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libdxcompiler.dylib b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libdxcompiler.dylib index 4e3f568817c9..dcd4aa1cb3ee 100755 Binary files a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libdxcompiler.dylib and b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libdxcompiler.dylib differ diff --git a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libdxilconv.dylib b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libdxilconv.dylib index 7afd61bd8ce0..a40ca103adc1 100755 Binary files a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libdxilconv.dylib and b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libdxilconv.dylib differ diff --git a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libmetalirconverter.dylib b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libmetalirconverter.dylib index 479758243bec..205d608089ae 100755 Binary files a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libmetalirconverter.dylib and b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/libmetalirconverter.dylib differ diff --git a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/version.plist b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/version.plist index 961c86564c54..7da3a860ef47 100644 --- a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/version.plist +++ b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/version.plist @@ -5,12 +5,12 @@ BuildVersion 1 CFBundleShortVersionString - 1.1 + 2.0b1 CFBundleVersion - 1.1 + 2.0b1 ProjectName D3DRendererMetal SourceVersion - 18000000000000 + 25011000000000 diff --git a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/_CodeSignature/CodeResources b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/_CodeSignature/CodeResources index 79e904547960..e51647f51d50 100644 --- a/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/_CodeSignature/CodeResources +++ b/GPTK/redist/lib/external/D3DMetal.framework/Versions/A/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Resources/Info.plist - hzsBQ6cbbnHppYzNvPQAI2Cy7UA= + vHGLkInuoUsB8AH0OnqKGAShx9Y= Resources/LICENSE @@ -14,27 +14,27 @@ Resources/default.metallib - gYcOTKQJiteCQ5E7LXczKjN1nAQ= + LQZ8p5HlC6WNBzOhGZB0I59xJHI= Resources/libdxccontainer.dylib - Ptn6MFTuEJHo0v5yJ6NbI3etMaM= + sjzzc3d+CUWxeURQG95BtKO6dEE= Resources/libdxcompiler.dylib - ez6SzGY2XUP4QGQiRxEDPKbRj+w= + SosJ4ruO0UnCrmNGxE1DTPICox0= Resources/libdxilconv.dylib - BnF78QISXSqXReIJ5caE2kO/4II= + 1HaxatZtI8A0RGYMXWqeZry18mI= Resources/libmetalirconverter.dylib - EvaL7uQF5KMaSW4Bh1t/lUJew90= + dLIQcMwng33L6rSQaE80hAaIAQo= Resources/version.plist - bQczriH5Fz7qW+e6B4nZIqUEGgA= + y7JjtFeGtpaYPX0tFHQCu7bum0Y= files2 @@ -43,7 +43,7 @@ hash2 - dhtwN93oHSf/rvWOELWFll5vIBeOGGe+uWfJSjvF76U= + 7OP6tTTfUIS1dgf5xAIb+B0LqhFr9gKg0oVS9nf/9wc= Resources/LICENSE @@ -57,42 +57,42 @@ hash2 - Kp83/Ijjmwqow6gqVddHFHTxI3kNgoqGlDEHwcqi2Xg= + B95I9T2lA9AsJHu/pTkKeI4k+6OqbVThfK8nIaLDl04= Resources/libdxccontainer.dylib hash2 - a9OSHVyoExGmGSkxIqKTz43b454SMP+ad7vCVYOGUQU= + zm7gUzeEpj0QNjMTViwMmjA0EfTCy3lLfSuCuXVBBBg= Resources/libdxcompiler.dylib hash2 - fwQLfh+ega5+OTilGCHQIOBF6Qhpzzk9DHHNdz13tIc= + erzoN04l+P/qm6x+uVfL2HJYy3zbCGssSLQN27biL6g= Resources/libdxilconv.dylib hash2 - 4pCMRYibeSQTU9YrAVXPmDQp6MfdYQSYicwmFf3Ma9M= + 5FnyTvUK0kRYY7vT+F0eNy7YIg4H/aCCG9XL4DzCJpA= Resources/libmetalirconverter.dylib hash2 - r9EUAuP9u3ZcurAm7GIgrm+DhHKZWq0hz97FbM0Fri4= + 9OvZc+2PlPYaNiWRZ4kzxR1OnhvAjZXoiv+AWu/xfUY= Resources/version.plist hash2 - O2LMR9xWGSdtjOV/G5G4BADpzT95MUYLTZqHc20YjMk= + idHsvcSD9w+BzMvuhXYk32/rYL+mN3jfj+0bXOSuIQM= diff --git a/GPTK/redist/lib/external/libd3dshared.dylib b/GPTK/redist/lib/external/libd3dshared.dylib index 40f907c19e0d..4f799b1592c8 100755 Binary files a/GPTK/redist/lib/external/libd3dshared.dylib and b/GPTK/redist/lib/external/libd3dshared.dylib differ diff --git a/GPTK/redist/lib/wine/x86_64-windows/atidxx64.dll b/GPTK/redist/lib/wine/x86_64-windows/atidxx64.dll index dc916a5a12ec..d06039ab3735 100644 Binary files a/GPTK/redist/lib/wine/x86_64-windows/atidxx64.dll and b/GPTK/redist/lib/wine/x86_64-windows/atidxx64.dll differ diff --git a/GPTK/redist/lib/wine/x86_64-windows/d3d10.dll b/GPTK/redist/lib/wine/x86_64-windows/d3d10.dll index 5860db883fc3..11794929e152 100644 Binary files a/GPTK/redist/lib/wine/x86_64-windows/d3d10.dll and b/GPTK/redist/lib/wine/x86_64-windows/d3d10.dll differ diff --git a/GPTK/redist/lib/wine/x86_64-windows/d3d11.dll b/GPTK/redist/lib/wine/x86_64-windows/d3d11.dll index 0fa6a6aefa49..9ddc07b2aed8 100644 Binary files a/GPTK/redist/lib/wine/x86_64-windows/d3d11.dll and b/GPTK/redist/lib/wine/x86_64-windows/d3d11.dll differ diff --git a/GPTK/redist/lib/wine/x86_64-windows/d3d12.dll b/GPTK/redist/lib/wine/x86_64-windows/d3d12.dll index 0fa8f2ff594a..e57986a1ba91 100644 Binary files a/GPTK/redist/lib/wine/x86_64-windows/d3d12.dll and b/GPTK/redist/lib/wine/x86_64-windows/d3d12.dll differ diff --git a/GPTK/redist/lib/wine/x86_64-windows/dxgi.dll b/GPTK/redist/lib/wine/x86_64-windows/dxgi.dll index d6966b110070..e1fede3e0724 100644 Binary files a/GPTK/redist/lib/wine/x86_64-windows/dxgi.dll and b/GPTK/redist/lib/wine/x86_64-windows/dxgi.dll differ diff --git a/properties.plist b/properties.plist index f7b771ee5b3e..989d5673444c 100644 --- a/properties.plist +++ b/properties.plist @@ -9,9 +9,9 @@ major 2 minor - 2 + 3 patch - 0 + 1 preRelease