LISY 5.28-91

vpinball · Oct 9, 2023 · 3c951a2 · 3c951a2
2 parents ae4800f + 2e9701e
commit 3c951a2
Show file tree

Hide file tree

Showing 252 changed files with 14,441 additions and 4,989 deletions.
diff --git a/.github/workflows/libpinmame.yml b/.github/workflows/libpinmame.yml
@@ -70,6 +70,9 @@ jobs:
           - os: macos-latest
             platform: ios-arm64
             libpinmame: libpinmame.${{ needs.version.outputs.version }}.a
+          - os: macos-latest
+            platform: tvos-arm64
+            libpinmame: libpinmame.${{ needs.version.outputs.version }}.a
           - os: ubuntu-latest
             platform: linux-x64
             libpinmame: libpinmame.so.${{ needs.version.outputs.version }}
@@ -87,7 +90,7 @@ jobs:
 #          fi
       - run: |
           if [[ "${{ matrix.os }}" == "windows-latest" ]]; then
-            curl -L https://github.com/upx/upx/releases/download/v4.0.1/upx-4.0.1-win64.zip -o upx.zip
+            curl -L https://github.com/upx/upx/releases/download/v4.1.0/upx-4.1.0-win64.zip -o upx.zip
             7z e upx.zip -oupx
             rm upx.zip
           fi
@@ -113,10 +116,16 @@ jobs:
           if [[ "${{ matrix.platform }}" == "ios-arm64" ]]; then
             cp build/Release/zlib-prefix/src/zlib-build/libz.a tmp
           fi
+          if [[ "${{ matrix.platform }}" == "tvos-arm64" ]]; then
+            cp build/Release/zlib-prefix/src/zlib-build/libz.a tmp
+          fi
           if [[ "${{ matrix.pinmame-test }}" ]]; then
             cp build/Release/${{ matrix.pinmame-test }} tmp
           fi
+          cp release/gamelist.txt tmp
           cp release/license.txt tmp
+          cp release/pinmame.txt tmp
+          cp release/whatsnew.txt tmp
       - uses: actions/upload-artifact@v3
         with:
           name: libpinmame-${{ needs.version.outputs.tag }}-${{ matrix.platform }}

diff --git a/.github/workflows/pinmame.yml b/.github/workflows/pinmame.yml
@@ -57,7 +57,7 @@ jobs:
 #          7z x upx.zip -oupx
 #          rm upx.zip
       - run: |
-          curl -L https://github.com/upx/upx/releases/download/v4.0.1/upx-4.0.1-win64.zip -o upx.zip
+          curl -L https://github.com/upx/upx/releases/download/v4.1.0/upx-4.1.0-win64.zip -o upx.zip
           7z e upx.zip -oupx
           rm upx.zip
       - name: Build PinMAME${{ matrix.artifact-suffix }}-${{ matrix.platform }}
@@ -69,7 +69,9 @@ jobs:
       - run: |
           mkdir tmp
           cp build/Release/PinMAME.exe tmp
+          cp release/gamelist.txt tmp
           cp release/license.txt tmp
+          cp release/pinmame.txt tmp
           cp release/whatsnew.txt tmp
       - uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/pinmame32.yml b/.github/workflows/pinmame32.yml
@@ -57,7 +57,7 @@ jobs:
 #          7z x upx.zip -oupx
 #          rm upx.zip
       - run: |
-          curl -L https://github.com/upx/upx/releases/download/v4.0.1/upx-4.0.1-win64.zip -o upx.zip
+          curl -L https://github.com/upx/upx/releases/download/v4.1.0/upx-4.1.0-win64.zip -o upx.zip
           7z e upx.zip -oupx
           rm upx.zip
       - name: Build PinMAME32${{ matrix.artifact-suffix }}-${{ matrix.platform }}
@@ -69,7 +69,9 @@ jobs:
       - run: |
           mkdir tmp
           cp build/Release/PinMAME32.exe tmp
+          cp release/gamelist.txt tmp
           cp release/license.txt tmp
+          cp release/pinmame.txt tmp
           cp release/whatsnew.txt tmp
       - uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/ppuc.yml b/.github/workflows/ppuc.yml
@@ -96,7 +96,7 @@ jobs:
 #          rm upx.zip
       - if: matrix.os == 'windows-latest'
         run: |
-          curl -L https://github.com/upx/upx/releases/download/v4.0.1/upx-4.0.1-win64.zip -o upx.zip
+          curl -L https://github.com/upx/upx/releases/download/v4.1.0/upx-4.1.0-win64.zip -o upx.zip
           7z e upx.zip -oupx
           rm upx.zip
       - if: matrix.type == 'pc'

diff --git a/.github/workflows/vpinmame.yml b/.github/workflows/vpinmame.yml
@@ -69,7 +69,7 @@ jobs:
 #          7z x upx.zip -oupx
 #          rm upx.zip
 #      - run: |
-#          curl -L https://github.com/upx/upx/releases/download/v4.0.1/upx-4.0.1-win64.zip -o upx.zip
+#          curl -L https://github.com/upx/upx/releases/download/v4.1.0/upx-4.1.0-win64.zip -o upx.zip
 #          7z e upx.zip -oupx
 #          rm upx.zip
       - name: Build VPinMAME${{ matrix.artifact-suffix }}-${{ matrix.platform }}
@@ -86,8 +86,12 @@ jobs:
           cp build/vpinmame/Release/${{ matrix.vpinmame }} tmp
           cp build/instvpm/Release/${{ matrix.setup }} tmp
           cp ext/bass/${{ matrix.bass }} tmp
-          cp release/VPMAlias.txt tmp
+          cp release/gamelist.txt tmp
           cp release/license.txt tmp
+          cp release/pinmame.txt tmp
+          cp "release/visual pinmame.txt" tmp
+          cp release/VPMAlias.txt tmp
+          cp release/whatsnew.txt tmp
           cp release/whatsnewVPM.txt tmp
       - uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/xpinmame.yml b/.github/workflows/xpinmame.yml
@@ -59,7 +59,10 @@ jobs:
       - run: |
           mkdir tmp
           cp build/Release/${{ matrix.exe }} tmp
+          cp release/gamelist.txt tmp
           cp release/license.txt tmp
+          cp release/pinmame.txt tmp
+          cp release/whatsnew.txt tmp
       - uses: actions/upload-artifact@v3
         with:
           name: xpinmame-${{ needs.version.outputs.tag }}-${{ matrix.platform }}

diff --git a/LibPinMAME_VC2015.vcxproj b/LibPinMAME_VC2015.vcxproj
@@ -183,6 +183,7 @@
       <AdditionalIncludeDirectories>src;src\wpc;src\windows;src\vc;src\cpu\m68000\generated_by_m68kmake;ext\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VPINMAME_ALTSOUND;VPINMAME_PINSOUND;DISABLE_DX7;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_MBCS;LSB_FIRST;CLIB_DECL=__cdecl;DECL_SPEC=__cdecl;inline=__inline;__inline__=__inline;INLINE=__inline;DIRECTINPUT_VERSION=0x0700;DIRECTDRAW_VERSION=0x0300;NONAMELESSUNION;_WINDOWS;MAMEVER=7300;PINMAME;LIBPINMAME;PINMAME_NO_UNUSED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
+      <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
@@ -237,6 +238,7 @@
       <AdditionalIncludeDirectories>src;src\wpc;src\windows;src\vc;src\cpu\m68000\generated_by_m68kmake;ext\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>VPINMAME_ALTSOUND;VPINMAME_PINSOUND;DISABLE_DX7;__LP64__;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_MBCS;LSB_FIRST;CLIB_DECL=__cdecl;DECL_SPEC=__cdecl;inline=__inline;__inline__=__inline;INLINE=__inline;DIRECTINPUT_VERSION=0x0700;DIRECTDRAW_VERSION=0x0300;NONAMELESSUNION;_WINDOWS;MAMEVER=7300;PINMAME;LIBPINMAME;PINMAME_NO_UNUSED;_XKEYCHECK_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
+      <ExceptionHandling>Sync</ExceptionHandling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
@@ -511,6 +513,11 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="ext\vgm\vgmwrite.c" />
+    <ClCompile Include="ext\ymfm\ymfm_adpcm.cpp" />
+    <ClCompile Include="ext\ymfm\ymfm_opl.cpp" />
+    <ClCompile Include="ext\ymfm\ymfm_opm.cpp" />
+    <ClCompile Include="ext\ymfm\ymfm_pcm.cpp" />
     <ClCompile Include="ext\zlib\adler32.c" />
     <ClCompile Include="ext\zlib\compress.c" />
     <ClCompile Include="ext\zlib\crc32.c" />
@@ -1068,6 +1075,16 @@
     <ClCompile Include="src\wpc\zacgames.c" />
     <ClCompile Include="src\wpc\zacproto.c" />
     <ClCompile Include="src\wpc\zacsnd.c" />
+    <ClCompile Include="src\wpc\altsound\altsound_csv_parser.cpp" />
+    <ClCompile Include="src\wpc\altsound\altsound_data.cpp" />
+    <ClCompile Include="src\wpc\altsound\altsound_file_parser.cpp" />
+    <ClCompile Include="src\wpc\altsound\altsound_ini_processor.cpp" />
+    <ClCompile Include="src\wpc\altsound\altsound_logger.cpp" />
+    <ClCompile Include="src\wpc\altsound\altsound_processor.cpp" />
+    <ClCompile Include="src\wpc\altsound\altsound_processor_base.cpp" />
+    <ClCompile Include="src\wpc\altsound\gsound_csv_parser.cpp" />
+    <ClCompile Include="src\wpc\altsound\gsound_processor.cpp" />
+    <ClCompile Include="src\wpc\altsound\snd_alt.cpp" />
     <ClCompile Include="src\wpc\sims\s11\full\dd.c" />
     <ClCompile Include="src\wpc\sims\s11\full\milln.c" />
     <ClCompile Include="src\wpc\sims\s11\prelim\eatpm.c" />
@@ -1127,6 +1144,8 @@
     <ClCompile Include="ext\vgm\vgmwrite.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="ext\vgm\vgmwrite.h" />
+    <ClInclude Include="ext\ymfm\ymfm_opm.h" />
     <ClInclude Include="ext\zlib\crc32.h" />
     <ClInclude Include="ext\zlib\deflate.h" />
     <ClInclude Include="ext\zlib\gzguts.h" />
@@ -1339,6 +1358,17 @@
     <ClInclude Include="src\wpc\wpcsam.h" />
     <ClInclude Include="src\wpc\zac.h" />
     <ClInclude Include="src\wpc\zacsnd.h" />
+    <ClInclude Include="src\wpc\altsound\altsound_csv_parser.hpp" />
+    <ClInclude Include="src\wpc\altsound\altsound_data.hpp" />
+    <ClInclude Include="src\wpc\altsound\altsound_file_parser.hpp" />
+    <ClInclude Include="src\wpc\altsound\altsound_ini_processor.hpp" />
+    <ClInclude Include="src\wpc\altsound\altsound_logger.hpp" />
+    <ClInclude Include="src\wpc\altsound\altsound_processor.hpp" />
+    <ClInclude Include="src\wpc\altsound\altsound_processor_base.hpp" />
+    <ClInclude Include="src\wpc\altsound\gsound_csv_parser.hpp" />
+    <ClInclude Include="src\wpc\altsound\gsound_processor.hpp" />
+    <ClInclude Include="src\wpc\altsound\inipp.h" />
+    <ClInclude Include="src\wpc\altsound\snd_alt.h" />
     <ClInclude Include="src\vc\dirent.h" />
     <ClInclude Include="src\vc\unistd.h" />
     <ClInclude Include="ext\vgm\vgmwrite.h" />

diff --git a/LibPinMAME_VC2015.vcxproj.filters b/LibPinMAME_VC2015.vcxproj.filters
@@ -133,6 +133,12 @@
     <Filter Include="Source Files\libpinmame">
       <UniqueIdentifier>{99ac9afe-7342-49eb-a7c0-2d3cac1de18c}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\external\ymfm">
+      <UniqueIdentifier>{0734d31b-617b-4e38-900c-491ec5ee0b3b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\PinMAME\altsound">
+      <UniqueIdentifier>{63599608-1299-463d-b1e3-917d2e1f5f6c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\artwork.c">
@@ -1176,6 +1182,9 @@
     <ClCompile Include="ext\vgm\vgmwrite.c">
       <Filter>Source Files\external\vgm</Filter>
     </ClCompile>
+    <ClCompile Include="ext\ymfm\ymfm_opm.cpp">
+      <Filter>Source Files\external\ymfm</Filter>
+    </ClCompile>
     <ClCompile Include="ext\zlib\adler32.c">
       <Filter>Source Files\external\zlib</Filter>
     </ClCompile>
@@ -1221,6 +1230,48 @@
     <ClCompile Include="ext\zlib\zutil.c">
       <Filter>Source Files\external\zlib</Filter>
     </ClCompile>
+    <ClCompile Include="ext\ymfm\ymfm_opl.cpp">
+      <Filter>Source Files\external\ymfm</Filter>
+    </ClCompile>
+    <ClCompile Include="ext\ymfm\ymfm_adpcm.cpp">
+      <Filter>Source Files\external\ymfm</Filter>
+    </ClCompile>
+    <ClCompile Include="ext\ymfm\ymfm_pcm.cpp">
+      <Filter>Source Files\external\ymfm</Filter>
+    </ClCompile>
+    <ClCompile Include="src\wpc\altsound\altsound_csv_parser.cpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClCompile>
+    <ClCompile Include="src\wpc\altsound\altsound_data.cpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClCompile>
+    <ClCompile Include="src\wpc\altsound\altsound_file_parser.cpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClCompile>
+    <ClCompile Include="src\wpc\altsound\altsound_ini_processor.cpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClCompile>
+    <ClCompile Include="src\wpc\altsound\altsound_logger.cpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClCompile>
+    <ClCompile Include="src\wpc\altsound\altsound_processor.cpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClCompile>
+    <ClCompile Include="src\wpc\altsound\altsound_processor_base.cpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClCompile>
+    <ClCompile Include="src\wpc\altsound\gsound_csv_parser.cpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClCompile>
+    <ClCompile Include="src\wpc\altsound\gsound_processor.cpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClCompile>
+    <ClCompile Include="src\wpc\altsound\snd_alt.cpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClCompile>
+    <ClCompile Include="ext\vgm\vgmwrite.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\artwork.h">
@@ -1820,6 +1871,9 @@
     <ClInclude Include="src\sound\ymf262.h">
       <Filter>Source Files\MAME\Sound</Filter>
     </ClInclude>
+    <ClInclude Include="ext\ymfm\ymfm_opm.h">
+      <Filter>Source Files\external\ymfm</Filter>
+    </ClInclude>
     <ClInclude Include="src\libpinmame\video.h">
       <Filter>Source Files\libpinmame</Filter>
     </ClInclude>
@@ -1868,6 +1922,42 @@
     <ClInclude Include="ext\zlib\zutil.h">
       <Filter>Source Files\external\zlib</Filter>
     </ClInclude>
+    <ClInclude Include="ext\vgm\vgmwrite.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\wpc\altsound\altsound_csv_parser.hpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClInclude>
+    <ClInclude Include="src\wpc\altsound\altsound_data.hpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClInclude>
+    <ClInclude Include="src\wpc\altsound\altsound_file_parser.hpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClInclude>
+    <ClInclude Include="src\wpc\altsound\altsound_ini_processor.hpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClInclude>
+    <ClInclude Include="src\wpc\altsound\altsound_logger.hpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClInclude>
+    <ClInclude Include="src\wpc\altsound\altsound_processor.hpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClInclude>
+    <ClInclude Include="src\wpc\altsound\altsound_processor_base.hpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClInclude>
+    <ClInclude Include="src\wpc\altsound\gsound_csv_parser.hpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClInclude>
+    <ClInclude Include="src\wpc\altsound\gsound_processor.hpp">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClInclude>
+    <ClInclude Include="src\wpc\altsound\inipp.h">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClInclude>
+    <ClInclude Include="src\wpc\altsound\snd_alt.h">
+      <Filter>Source Files\PinMAME\altsound</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="src\sound\vtxsmpls.inc">

diff --git a/PinMAME32_VC2012.vcxproj b/PinMAME32_VC2012.vcxproj
@@ -528,6 +528,10 @@ copy "$(TargetDir)$(TargetName).pdb" "$(ProjectDir)"
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="ext\vgm\vgmwrite.c" />
+    <ClCompile Include="ext\ymfm\ymfm_adpcm.cpp" />
+    <ClCompile Include="ext\ymfm\ymfm_opl.cpp" />
+    <ClCompile Include="ext\ymfm\ymfm_opm.cpp" />
+    <ClCompile Include="ext\ymfm\ymfm_pcm.cpp" />
     <ClCompile Include="ext\zlib\adler32.c" />
     <ClCompile Include="ext\zlib\compress.c" />
     <ClCompile Include="ext\zlib\crc32.c" />
@@ -1399,6 +1403,16 @@ copy "$(TargetDir)$(TargetName).pdb" "$(ProjectDir)"
     <ClCompile Include="src\wpc\zacgames.c" />
     <ClCompile Include="src\wpc\zacproto.c" />
     <ClCompile Include="src\wpc\zacsnd.c" />
+    <ClCompile Include="src\wpc\altsound\altsound_csv_parser.cpp" />
+    <ClCompile Include="src\wpc\altsound\altsound_data.cpp" />
+    <ClCompile Include="src\wpc\altsound\altsound_file_parser.cpp" />
+    <ClCompile Include="src\wpc\altsound\altsound_ini_processor.cpp" />
+    <ClCompile Include="src\wpc\altsound\altsound_logger.cpp" />
+    <ClCompile Include="src\wpc\altsound\altsound_processor.cpp" />
+    <ClCompile Include="src\wpc\altsound\altsound_processor_base.cpp" />
+    <ClCompile Include="src\wpc\altsound\gsound_csv_parser.cpp" />
+    <ClCompile Include="src\wpc\altsound\gsound_processor.cpp" />
+    <ClCompile Include="src\wpc\altsound\snd_alt.cpp" />
     <ClCompile Include="src\wpc\sims\s11\full\dd.c" />
     <ClCompile Include="src\wpc\sims\s11\full\milln.c" />
     <ClCompile Include="src\wpc\sims\s11\prelim\eatpm.c" />
@@ -1479,6 +1493,7 @@ copy "$(TargetDir)$(TargetName).pdb" "$(ProjectDir)"
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ext\vgm\vgmwrite.h" />
+    <ClInclude Include="ext\ymfm\ymfm_opm.h" />
     <ClInclude Include="ext\zlib\crc32.h" />
     <ClInclude Include="ext\zlib\deflate.h" />
     <ClInclude Include="ext\zlib\gzguts.h" />
@@ -1705,6 +1720,17 @@ copy "$(TargetDir)$(TargetName).pdb" "$(ProjectDir)"
     <ClInclude Include="src\wpc\wpcsam.h" />
     <ClInclude Include="src\wpc\zac.h" />
     <ClInclude Include="src\wpc\zacsnd.h" />
+    <ClInclude Include="src\wpc\altsound\altsound_csv_parser.hpp" />
+    <ClInclude Include="src\wpc\altsound\altsound_data.hpp" />
+    <ClInclude Include="src\wpc\altsound\altsound_file_parser.hpp" />
+    <ClInclude Include="src\wpc\altsound\altsound_ini_processor.hpp" />
+    <ClInclude Include="src\wpc\altsound\altsound_logger.hpp" />
+    <ClInclude Include="src\wpc\altsound\altsound_processor.hpp" />
+    <ClInclude Include="src\wpc\altsound\altsound_processor_base.hpp" />
+    <ClInclude Include="src\wpc\altsound\gsound_csv_parser.hpp" />
+    <ClInclude Include="src\wpc\altsound\gsound_processor.hpp" />
+    <ClInclude Include="src\wpc\altsound\inipp.h" />
+    <ClInclude Include="src\wpc\altsound\snd_alt.h" />
     <ClInclude Include="src\vc\dirent.h" />
     <ClInclude Include="src\vc\unistd.h" />
     <ClInclude Include="src\ui\audit32.h" />