pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated folder names to WinUAE pattern

Browse source 
- Renamed all pandora-specific folder names to the common WinUAE pattern
- Updated the VS Solution to reflect these changes
- Updated Makefile to reflect these changes
This commit is contained in:
Dimitris Panokostas 2017-01-07 13:23:07 +01:00
parent 7f02428d89
commit 0931a7a6d6
96 changed files with 911 additions and 907 deletions
Download patch file Download diff file Expand all files Collapse all files

140
Amiberry/Amiberry-gles/Amiberry-gles.vcxproj
View file

@ -30,7 +30,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
<ClCompile> <ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard> <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>../../src;../../src/include;../../src/od-pandora;../../src/td-sdl;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/include;../../src/osdep;../../src/threaddep;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUG=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";HAVE_GLES;SHADER_SUPPORT;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>DEBUG=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";HAVE_GLES;SHADER_SUPPORT;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
</ClCompile> </ClCompile>
@ -44,7 +44,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
<ClCompile> <ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard> <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>../../src;../../src/include;../../src/od-pandora;../../src/td-sdl;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/include;../../src/osdep;../../src/threaddep;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";HAVE_GLES;SHADER_SUPPORT;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";HAVE_GLES;SHADER_SUPPORT;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
<OmitFramePointer>true</OmitFramePointer> <OmitFramePointer>true</OmitFramePointer>
@ -145,7 +145,7 @@
<ClCompile Include="..\..\src\jit\compstbl.cpp" /> <ClCompile Include="..\..\src\jit\compstbl.cpp" />
<ClCompile Include="..\..\src\keybuf.cpp" /> <ClCompile Include="..\..\src\keybuf.cpp" />
<ClCompile Include="..\..\src\main.cpp" /> <ClCompile Include="..\..\src\main.cpp" />
<ClCompile Include="..\..\src\md-pandora\support.cpp" /> <ClCompile Include="..\..\src\machdep\support.cpp" />
<ClCompile Include="..\..\src\memory.cpp" /> <ClCompile Include="..\..\src\memory.cpp" />
<ClCompile Include="..\..\src\native2amiga.cpp" /> <ClCompile Include="..\..\src\native2amiga.cpp" />
<ClCompile Include="..\..\src\newcpu.cpp" /> <ClCompile Include="..\..\src\newcpu.cpp" />
@ -154,58 +154,58 @@
<ClCompile Include="..\..\src\od-gles\gles_gfx.cpp" /> <ClCompile Include="..\..\src\od-gles\gles_gfx.cpp" />
<ClCompile Include="..\..\src\od-gles\gl_platform.cpp" /> <ClCompile Include="..\..\src\od-gles\gl_platform.cpp" />
<ClCompile Include="..\..\src\od-gles\shader_stuff.cpp" /> <ClCompile Include="..\..\src\od-gles\shader_stuff.cpp" />
<ClCompile Include="..\..\src\od-pandora\bsdsocket_host.cpp" /> <ClCompile Include="..\..\src\osdep\bsdsocket_host.cpp" />
<ClCompile Include="..\..\src\od-pandora\cda_play.cpp" /> <ClCompile Include="..\..\src\osdep\cda_play.cpp" />
<ClCompile Include="..\..\src\od-pandora\charset.cpp" /> <ClCompile Include="..\..\src\osdep\charset.cpp" />
<ClCompile Include="..\..\src\od-pandora\fsdb_host.cpp" /> <ClCompile Include="..\..\src\osdep\fsdb_host.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\CreateFilesysHardfile.cpp" /> <ClCompile Include="..\..\src\osdep\gui\CreateFilesysHardfile.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\EditFilesysHardfile.cpp" /> <ClCompile Include="..\..\src\osdep\gui\EditFilesysHardfile.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\EditFilesysVirtual.cpp" /> <ClCompile Include="..\..\src\osdep\gui\EditFilesysVirtual.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\InGameMessage.cpp" /> <ClCompile Include="..\..\src\osdep\gui\InGameMessage.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\main_window.cpp" /> <ClCompile Include="..\..\src\osdep\gui\main_window.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\Navigation.cpp" /> <ClCompile Include="..\..\src\osdep\gui\Navigation.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelChipset.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelChipset.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelConfig.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelConfig.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelCPU.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelCPU.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelDisplay.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelDisplay.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelFloppy.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelFloppy.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelHD.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelHD.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelInput.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelInput.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelMisc.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelMisc.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelPaths.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelPaths.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelRAM.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelRAM.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelROM.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelROM.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelSavestate.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelSavestate.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelSound.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelSound.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\sdltruetypefont.cpp" /> <ClCompile Include="..\..\src\osdep\gui\sdltruetypefont.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\SelectFile.cpp" /> <ClCompile Include="..\..\src\osdep\gui\SelectFile.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\SelectFolder.cpp" /> <ClCompile Include="..\..\src\osdep\gui\SelectFolder.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\SelectorEntry.cpp" /> <ClCompile Include="..\..\src\osdep\gui\SelectorEntry.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\ShowMessage.cpp" /> <ClCompile Include="..\..\src\osdep\gui\ShowMessage.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\UaeCheckBox.cpp" /> <ClCompile Include="..\..\src\osdep\gui\UaeCheckBox.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\UaeDropDown.cpp" /> <ClCompile Include="..\..\src\osdep\gui\UaeDropDown.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\UaeListBox.cpp" /> <ClCompile Include="..\..\src\osdep\gui\UaeListBox.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\UaeRadioButton.cpp" /> <ClCompile Include="..\..\src\osdep\gui\UaeRadioButton.cpp" />
<ClCompile Include="..\..\src\od-pandora\hardfile_pandora.cpp" /> <ClCompile Include="..\..\src\osdep\hardfile_pandora.cpp" />
<ClCompile Include="..\..\src\od-pandora\keyboard.cpp" /> <ClCompile Include="..\..\src\osdep\keyboard.cpp" />
<ClCompile Include="..\..\src\od-pandora\menu\menu_config.cpp" /> <ClCompile Include="..\..\src\osdep\menu\menu_config.cpp" />
<ClCompile Include="..\..\src\od-pandora\mp3decoder.cpp" /> <ClCompile Include="..\..\src\osdep\mp3decoder.cpp" />
<ClCompile Include="..\..\src\od-pandora\neon_helper.s" /> <ClCompile Include="..\..\src\osdep\neon_helper.s" />
<ClCompile Include="..\..\src\od-pandora\pandora.cpp" /> <ClCompile Include="..\..\src\osdep\pandora.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_filesys.cpp" /> <ClCompile Include="..\..\src\osdep\pandora_filesys.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_gfx.cpp" /> <ClCompile Include="..\..\src\osdep\pandora_gfx.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_gui.cpp" /> <ClCompile Include="..\..\src\osdep\pandora_gui.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_input.cpp" /> <ClCompile Include="..\..\src\osdep\pandora_input.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_mem.cpp" /> <ClCompile Include="..\..\src\osdep\pandora_mem.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_rp9.cpp" /> <ClCompile Include="..\..\src\osdep\pandora_rp9.cpp" />
<ClCompile Include="..\..\src\od-pandora\picasso96.cpp" /> <ClCompile Include="..\..\src\osdep\picasso96.cpp" />
<ClCompile Include="..\..\src\od-pandora\sigsegv_handler.cpp" /> <ClCompile Include="..\..\src\osdep\sigsegv_handler.cpp" />
<ClCompile Include="..\..\src\od-pandora\writelog.cpp" /> <ClCompile Include="..\..\src\osdep\writelog.cpp" />
<ClCompile Include="..\..\src\p96_blit.cpp" /> <ClCompile Include="..\..\src\p96_blit.cpp" />
<ClCompile Include="..\..\src\readcpu.cpp" /> <ClCompile Include="..\..\src\readcpu.cpp" />
<ClCompile Include="..\..\src\rommgr.cpp" /> <ClCompile Include="..\..\src\rommgr.cpp" />
<ClCompile Include="..\..\src\savestate.cpp" /> <ClCompile Include="..\..\src\savestate.cpp" />
<ClCompile Include="..\..\src\sd-sdl\sound_sdl_new.cpp" /> <ClCompile Include="..\..\src\sounddep\sound_sdl_new.cpp" />
<ClCompile Include="..\..\src\sinctable.cpp" /> <ClCompile Include="..\..\src\sinctable.cpp" />
<ClCompile Include="..\..\src\statusline.cpp" /> <ClCompile Include="..\..\src\statusline.cpp" />
<ClCompile Include="..\..\src\traps.cpp" /> <ClCompile Include="..\..\src\traps.cpp" />
@ -309,28 +309,28 @@
<ClInclude Include="..\..\src\jit\compemu_midfunc_arm.h" /> <ClInclude Include="..\..\src\jit\compemu_midfunc_arm.h" />
<ClInclude Include="..\..\src\jit\compemu_midfunc_arm2.h" /> <ClInclude Include="..\..\src\jit\compemu_midfunc_arm2.h" />
<ClInclude Include="..\..\src\jit\comptbl.h" /> <ClInclude Include="..\..\src\jit\comptbl.h" />
<ClInclude Include="..\..\src\md-pandora\m68k.h" /> <ClInclude Include="..\..\src\machdep\m68k.h" />
<ClInclude Include="..\..\src\md-pandora\maccess.h" /> <ClInclude Include="..\..\src\machdep\maccess.h" />
<ClInclude Include="..\..\src\md-pandora\md-fpp.h" /> <ClInclude Include="..\..\src\machdep\md-fpp.h" />
<ClInclude Include="..\..\src\md-pandora\rpt.h" /> <ClInclude Include="..\..\src\machdep\rpt.h" />
<ClInclude Include="..\..\src\od-gles\gl.h" /> <ClInclude Include="..\..\src\od-gles\gl.h" />
<ClInclude Include="..\..\src\od-gles\gl_platform.h" /> <ClInclude Include="..\..\src\od-gles\gl_platform.h" />
<ClInclude Include="..\..\src\od-gles\shader_stuff.h" /> <ClInclude Include="..\..\src\od-gles\shader_stuff.h" />
<ClInclude Include="..\..\src\od-pandora\cda_play.h" /> <ClInclude Include="..\..\src\osdep\cda_play.h" />
<ClInclude Include="..\..\src\od-pandora\config.h" /> <ClInclude Include="..\..\src\osdep\config.h" />
<ClInclude Include="..\..\src\od-pandora\gui\gui_handling.h" /> <ClInclude Include="..\..\src\osdep\gui\gui_handling.h" />
<ClInclude Include="..\..\src\od-pandora\gui\sdltruetypefont.hpp" /> <ClInclude Include="..\..\src\osdep\gui\sdltruetypefont.hpp" />
<ClInclude Include="..\..\src\od-pandora\gui\SelectorEntry.hpp" /> <ClInclude Include="..\..\src\osdep\gui\SelectorEntry.hpp" />
<ClInclude Include="..\..\src\od-pandora\gui\UaeCheckBox.hpp" /> <ClInclude Include="..\..\src\osdep\gui\UaeCheckBox.hpp" />
<ClInclude Include="..\..\src\od-pandora\gui\UaeDropDown.hpp" /> <ClInclude Include="..\..\src\osdep\gui\UaeDropDown.hpp" />
<ClInclude Include="..\..\src\od-pandora\gui\UaeListBox.hpp" /> <ClInclude Include="..\..\src\osdep\gui\UaeListBox.hpp" />
<ClInclude Include="..\..\src\od-pandora\gui\UaeRadioButton.hpp" /> <ClInclude Include="..\..\src\osdep\gui\UaeRadioButton.hpp" />
<ClInclude Include="..\..\src\od-pandora\mp3decoder.h" /> <ClInclude Include="..\..\src\osdep\mp3decoder.h" />
<ClInclude Include="..\..\src\od-pandora\pandora_rp9.h" /> <ClInclude Include="..\..\src\osdep\pandora_rp9.h" />
<ClInclude Include="..\..\src\od-pandora\sysconfig.h" /> <ClInclude Include="..\..\src\osdep\sysconfig.h" />
<ClInclude Include="..\..\src\od-pandora\target.h" /> <ClInclude Include="..\..\src\osdep\target.h" />
<ClInclude Include="..\..\src\sd-pandora\sound.h" /> <ClInclude Include="..\..\src\sounddep\sound.h" />
<ClInclude Include="..\..\src\td-sdl\thread.h" /> <ClInclude Include="..\..\src\threaddep\thread.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

332
Amiberry/Amiberry-gles/Amiberry-gles.vcxproj.filters
View file

@ -17,33 +17,12 @@
<UniqueIdentifier>{d4a7a442-40aa-47ca-962c-43f387907b11}</UniqueIdentifier> <UniqueIdentifier>{d4a7a442-40aa-47ca-962c-43f387907b11}</UniqueIdentifier>
<Extensions>*.vgdbsettings</Extensions> <Extensions>*.vgdbsettings</Extensions>
</Filter> </Filter>
<Filter Include="Source files\sd-sdl">
<UniqueIdentifier>{17a34860-a02d-420b-b3ab-0f1db47cacb3}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\od-gles"> <Filter Include="Source files\od-gles">
<UniqueIdentifier>{49446657-502d-4761-a17c-a7a3b8ba5151}</UniqueIdentifier> <UniqueIdentifier>{49446657-502d-4761-a17c-a7a3b8ba5151}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header files\od-gles"> <Filter Include="Header files\od-gles">
<UniqueIdentifier>{b3b89d16-6020-44a0-9a26-c95b9bf085ca}</UniqueIdentifier> <UniqueIdentifier>{b3b89d16-6020-44a0-9a26-c95b9bf085ca}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source files\od-pandora">
<UniqueIdentifier>{8ad93770-58f5-41c3-bcb2-5ce63a5d0f10}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\td-sdl">
<UniqueIdentifier>{936406c8-6881-47ea-af4b-dcfaab0c44c0}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\sd-pandora">
<UniqueIdentifier>{ac9827c0-2c36-4238-b3e3-4ef8e03a37d8}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\od-pandora">
<UniqueIdentifier>{79b9a1ab-9dbf-4862-8fad-b1f794787428}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\od-pandora\gui">
<UniqueIdentifier>{c37d5944-1218-485d-b017-466f3b499ca2}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\md-pandora">
<UniqueIdentifier>{9919a66e-283d-48c6-93f4-1d679849175c}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\jit"> <Filter Include="Header files\jit">
<UniqueIdentifier>{7087c72a-65f3-47b2-9503-fb3dd54cee68}</UniqueIdentifier> <UniqueIdentifier>{7087c72a-65f3-47b2-9503-fb3dd54cee68}</UniqueIdentifier>
</Filter> </Filter>
@ -74,15 +53,6 @@
<Filter Include="Header files\archivers\zip"> <Filter Include="Header files\archivers\zip">
<UniqueIdentifier>{42b853e5-f34f-4d40-8b88-e60974fb012c}</UniqueIdentifier> <UniqueIdentifier>{42b853e5-f34f-4d40-8b88-e60974fb012c}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source files\od-pandora\gui">
<UniqueIdentifier>{aa0398c7-efb1-475e-bba9-fe99057d4c89}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\od-pandora\menu">
<UniqueIdentifier>{d2a13290-1ea8-4356-9193-811d8c57dc27}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\md-pandora">
<UniqueIdentifier>{471328d7-3386-4188-b818-b34529bd114f}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\jit"> <Filter Include="Source files\jit">
<UniqueIdentifier>{4a2180c8-6990-49c5-b535-b075c7e0b005}</UniqueIdentifier> <UniqueIdentifier>{4a2180c8-6990-49c5-b535-b075c7e0b005}</UniqueIdentifier>
</Filter> </Filter>
@ -113,6 +83,36 @@
<Filter Include="Source files\archivers\7z\Archive\7z"> <Filter Include="Source files\archivers\7z\Archive\7z">
<UniqueIdentifier>{c980c564-8d4f-4bc1-8736-a4b08745765c}</UniqueIdentifier> <UniqueIdentifier>{c980c564-8d4f-4bc1-8736-a4b08745765c}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header files\machdep">
<UniqueIdentifier>{9919a66e-283d-48c6-93f4-1d679849175c}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\osdep">
<UniqueIdentifier>{79b9a1ab-9dbf-4862-8fad-b1f794787428}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\osdep\gui">
<UniqueIdentifier>{c37d5944-1218-485d-b017-466f3b499ca2}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\sounddep">
<UniqueIdentifier>{ac9827c0-2c36-4238-b3e3-4ef8e03a37d8}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\threaddep">
<UniqueIdentifier>{936406c8-6881-47ea-af4b-dcfaab0c44c0}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\machdep">
<UniqueIdentifier>{471328d7-3386-4188-b818-b34529bd114f}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\osdep">
<UniqueIdentifier>{8ad93770-58f5-41c3-bcb2-5ce63a5d0f10}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\osdep\gui">
<UniqueIdentifier>{aa0398c7-efb1-475e-bba9-fe99057d4c89}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\osdep\menu">
<UniqueIdentifier>{d2a13290-1ea8-4356-9193-811d8c57dc27}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\sounddep">
<UniqueIdentifier>{17a34860-a02d-420b-b3ab-0f1db47cacb3}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Amiberry-gles-Debug.vgdbsettings"> <None Include="Amiberry-gles-Debug.vgdbsettings">
@ -291,8 +291,8 @@
<ClCompile Include="..\..\src\zfile_archive.cpp"> <ClCompile Include="..\..\src\zfile_archive.cpp">
<Filter>Source files</Filter> <Filter>Source files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\sd-sdl\sound_sdl_new.cpp"> <ClCompile Include="..\..\src\sounddep\sound_sdl_new.cpp">
<Filter>Source files\sd-sdl</Filter> <Filter>Source files\sounddep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-gles\gl.cpp"> <ClCompile Include="..\..\src\od-gles\gl.cpp">
<Filter>Source files\od-gles</Filter> <Filter>Source files\od-gles</Filter>
@ -306,149 +306,149 @@
<ClCompile Include="..\..\src\od-gles\shader_stuff.cpp"> <ClCompile Include="..\..\src\od-gles\shader_stuff.cpp">
<Filter>Source files\od-gles</Filter> <Filter>Source files\od-gles</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\neon_helper.s"> <ClCompile Include="..\..\src\osdep\neon_helper.s">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\bsdsocket_host.cpp"> <ClCompile Include="..\..\src\osdep\bsdsocket_host.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\cda_play.cpp"> <ClCompile Include="..\..\src\osdep\cda_play.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\charset.cpp"> <ClCompile Include="..\..\src\osdep\charset.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\fsdb_host.cpp"> <ClCompile Include="..\..\src\osdep\fsdb_host.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\hardfile_pandora.cpp"> <ClCompile Include="..\..\src\osdep\hardfile_pandora.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\keyboard.cpp"> <ClCompile Include="..\..\src\osdep\keyboard.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\mp3decoder.cpp"> <ClCompile Include="..\..\src\osdep\mp3decoder.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\pandora.cpp"> <ClCompile Include="..\..\src\osdep\pandora.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\pandora_filesys.cpp"> <ClCompile Include="..\..\src\osdep\pandora_filesys.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\pandora_gfx.cpp"> <ClCompile Include="..\..\src\osdep\pandora_gfx.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\pandora_gui.cpp"> <ClCompile Include="..\..\src\osdep\pandora_gui.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\pandora_input.cpp"> <ClCompile Include="..\..\src\osdep\pandora_input.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\pandora_mem.cpp"> <ClCompile Include="..\..\src\osdep\pandora_mem.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\pandora_rp9.cpp"> <ClCompile Include="..\..\src\osdep\pandora_rp9.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\picasso96.cpp"> <ClCompile Include="..\..\src\osdep\picasso96.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\sigsegv_handler.cpp"> <ClCompile Include="..\..\src\osdep\sigsegv_handler.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\writelog.cpp"> <ClCompile Include="..\..\src\osdep\writelog.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\CreateFilesysHardfile.cpp"> <ClCompile Include="..\..\src\osdep\gui\CreateFilesysHardfile.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\EditFilesysHardfile.cpp"> <ClCompile Include="..\..\src\osdep\gui\EditFilesysHardfile.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\EditFilesysVirtual.cpp"> <ClCompile Include="..\..\src\osdep\gui\EditFilesysVirtual.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\InGameMessage.cpp"> <ClCompile Include="..\..\src\osdep\gui\InGameMessage.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\main_window.cpp"> <ClCompile Include="..\..\src\osdep\gui\main_window.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\Navigation.cpp"> <ClCompile Include="..\..\src\osdep\gui\Navigation.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelChipset.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelChipset.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelConfig.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelConfig.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelCPU.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelCPU.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelDisplay.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelDisplay.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelFloppy.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelFloppy.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelHD.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelHD.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelInput.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelInput.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelMisc.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelMisc.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelPaths.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelPaths.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelRAM.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelRAM.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelROM.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelROM.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelSavestate.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelSavestate.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelSound.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelSound.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\sdltruetypefont.cpp"> <ClCompile Include="..\..\src\osdep\gui\sdltruetypefont.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\SelectFile.cpp"> <ClCompile Include="..\..\src\osdep\gui\SelectFile.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\SelectFolder.cpp"> <ClCompile Include="..\..\src\osdep\gui\SelectFolder.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\SelectorEntry.cpp"> <ClCompile Include="..\..\src\osdep\gui\SelectorEntry.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\ShowMessage.cpp"> <ClCompile Include="..\..\src\osdep\gui\ShowMessage.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\UaeCheckBox.cpp"> <ClCompile Include="..\..\src\osdep\gui\UaeCheckBox.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\UaeDropDown.cpp"> <ClCompile Include="..\..\src\osdep\gui\UaeDropDown.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\UaeListBox.cpp"> <ClCompile Include="..\..\src\osdep\gui\UaeListBox.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\UaeRadioButton.cpp"> <ClCompile Include="..\..\src\osdep\gui\UaeRadioButton.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\menu\menu_config.cpp"> <ClCompile Include="..\..\src\osdep\menu\menu_config.cpp">
<Filter>Source files\od-pandora\menu</Filter> <Filter>Source files\osdep\menu</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\md-pandora\support.cpp"> <ClCompile Include="..\..\src\machdep\support.cpp">
<Filter>Source files\md-pandora</Filter> <Filter>Source files\machdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\jit\compemu.cpp"> <ClCompile Include="..\..\src\jit\compemu.cpp">
<Filter>Source files\jit</Filter> <Filter>Source files\jit</Filter>
@ -587,62 +587,62 @@
<ClInclude Include="..\..\src\od-gles\shader_stuff.h"> <ClInclude Include="..\..\src\od-gles\shader_stuff.h">
<Filter>Header files\od-gles</Filter> <Filter>Header files\od-gles</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\td-sdl\thread.h"> <ClInclude Include="..\..\src\threaddep\thread.h">
<Filter>Header files\td-sdl</Filter> <Filter>Header files\threaddep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\sd-pandora\sound.h"> <ClInclude Include="..\..\src\sounddep\sound.h">
<Filter>Header files\sd-pandora</Filter> <Filter>Header files\sounddep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\cda_play.h"> <ClInclude Include="..\..\src\osdep\cda_play.h">
<Filter>Header files\od-pandora</Filter> <Filter>Header files\osdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\config.h"> <ClInclude Include="..\..\src\osdep\config.h">
<Filter>Header files\od-pandora</Filter> <Filter>Header files\osdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\mp3decoder.h"> <ClInclude Include="..\..\src\osdep\mp3decoder.h">
<Filter>Header files\od-pandora</Filter> <Filter>Header files\osdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\pandora_rp9.h"> <ClInclude Include="..\..\src\osdep\pandora_rp9.h">
<Filter>Header files\od-pandora</Filter> <Filter>Header files\osdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\sysconfig.h"> <ClInclude Include="..\..\src\osdep\sysconfig.h">
<Filter>Header files\od-pandora</Filter> <Filter>Header files\osdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\target.h"> <ClInclude Include="..\..\src\osdep\target.h">
<Filter>Header files\od-pandora</Filter> <Filter>Header files\osdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\gui\gui_handling.h"> <ClInclude Include="..\..\src\osdep\gui\gui_handling.h">
<Filter>Header files\od-pandora\gui</Filter> <Filter>Header files\osdep\gui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\gui\sdltruetypefont.hpp"> <ClInclude Include="..\..\src\osdep\gui\sdltruetypefont.hpp">
<Filter>Header files\od-pandora\gui</Filter> <Filter>Header files\osdep\gui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\gui\SelectorEntry.hpp"> <ClInclude Include="..\..\src\osdep\gui\SelectorEntry.hpp">
<Filter>Header files\od-pandora\gui</Filter> <Filter>Header files\osdep\gui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\gui\UaeCheckBox.hpp"> <ClInclude Include="..\..\src\osdep\gui\UaeCheckBox.hpp">
<Filter>Header files\od-pandora\gui</Filter> <Filter>Header files\osdep\gui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\gui\UaeDropDown.hpp"> <ClInclude Include="..\..\src\osdep\gui\UaeDropDown.hpp">
<Filter>Header files\od-pandora\gui</Filter> <Filter>Header files\osdep\gui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\gui\UaeListBox.hpp"> <ClInclude Include="..\..\src\osdep\gui\UaeListBox.hpp">
<Filter>Header files\od-pandora\gui</Filter> <Filter>Header files\osdep\gui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\gui\UaeRadioButton.hpp"> <ClInclude Include="..\..\src\osdep\gui\UaeRadioButton.hpp">
<Filter>Header files\od-pandora\gui</Filter> <Filter>Header files\osdep\gui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\md-pandora\m68k.h"> <ClInclude Include="..\..\src\machdep\m68k.h">
<Filter>Header files\md-pandora</Filter> <Filter>Header files\machdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\md-pandora\maccess.h"> <ClInclude Include="..\..\src\machdep\maccess.h">
<Filter>Header files\md-pandora</Filter> <Filter>Header files\machdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\md-pandora\md-fpp.h"> <ClInclude Include="..\..\src\machdep\md-fpp.h">
<Filter>Header files\md-pandora</Filter> <Filter>Header files\machdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\md-pandora\rpt.h"> <ClInclude Include="..\..\src\machdep\rpt.h">
<Filter>Header files\md-pandora</Filter> <Filter>Header files\machdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\jit\codegen_arm.h"> <ClInclude Include="..\..\src\jit\codegen_arm.h">
<Filter>Header files\jit</Filter> <Filter>Header files\jit</Filter>

4
Amiberry/Amiberry-gles/Amiberry-gles.vcxproj.user Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>

144
Amiberry/Amiberry/Amiberry.vcxproj
View file

@ -44,7 +44,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
<ClCompile> <ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard> <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>../../src;../../src/include;../../src/od-pandora;../../src/td-sdl;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/include;../../src/osdep;../../src/threaddep;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUG=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>DEBUG=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
</ClCompile> </ClCompile>
@ -58,7 +58,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
<ClCompile> <ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard> <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>../../src;../../src/include;../../src/od-pandora;../../src/td-sdl;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/include;../../src/osdep;../../src/threaddep;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
<OmitFramePointer>true</OmitFramePointer> <OmitFramePointer>true</OmitFramePointer>
@ -74,7 +74,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi2|VisualGDB'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi2|VisualGDB'">
<ClCompile> <ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard> <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>../../src;../../src/include;../../src/od-pandora;../../src/td-sdl;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/include;../../src/osdep;../../src/threaddep;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>-march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>-march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
<OmitFramePointer>true</OmitFramePointer> <OmitFramePointer>true</OmitFramePointer>
@ -91,7 +91,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi1|VisualGDB'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-rpi1|VisualGDB'">
<ClCompile> <ClCompile>
<CPPLanguageStandard>GNUPP14</CPPLanguageStandard> <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
<AdditionalIncludeDirectories>../../src;../../src/include;../../src/od-pandora;../../src/td-sdl;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/include;../../src/osdep;../../src/threaddep;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;PICASSO96;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;PICASSO96;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>-march=armv6zk -mfpu=vfp -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>-march=armv6zk -mfpu=vfp -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
<OmitFramePointer>true</OmitFramePointer> <OmitFramePointer>true</OmitFramePointer>
@ -193,62 +193,62 @@
<ClCompile Include="..\..\src\jit\compstbl.cpp" /> <ClCompile Include="..\..\src\jit\compstbl.cpp" />
<ClCompile Include="..\..\src\keybuf.cpp" /> <ClCompile Include="..\..\src\keybuf.cpp" />
<ClCompile Include="..\..\src\main.cpp" /> <ClCompile Include="..\..\src\main.cpp" />
<ClCompile Include="..\..\src\md-pandora\support.cpp" /> <ClCompile Include="..\..\src\machdep\support.cpp" />
<ClCompile Include="..\..\src\memory.cpp" /> <ClCompile Include="..\..\src\memory.cpp" />
<ClCompile Include="..\..\src\native2amiga.cpp" /> <ClCompile Include="..\..\src\native2amiga.cpp" />
<ClCompile Include="..\..\src\newcpu.cpp" /> <ClCompile Include="..\..\src\newcpu.cpp" />
<ClCompile Include="..\..\src\newcpu_common.cpp" /> <ClCompile Include="..\..\src\newcpu_common.cpp" />
<ClCompile Include="..\..\src\od-pandora\bsdsocket_host.cpp" /> <ClCompile Include="..\..\src\osdep\bsdsocket_host.cpp" />
<ClCompile Include="..\..\src\od-pandora\cda_play.cpp" /> <ClCompile Include="..\..\src\osdep\cda_play.cpp" />
<ClCompile Include="..\..\src\od-pandora\charset.cpp" /> <ClCompile Include="..\..\src\osdep\charset.cpp" />
<ClCompile Include="..\..\src\od-pandora\fsdb_host.cpp" /> <ClCompile Include="..\..\src\osdep\fsdb_host.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\CreateFilesysHardfile.cpp" /> <ClCompile Include="..\..\src\osdep\gui\CreateFilesysHardfile.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\EditFilesysHardfile.cpp" /> <ClCompile Include="..\..\src\osdep\gui\EditFilesysHardfile.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\EditFilesysVirtual.cpp" /> <ClCompile Include="..\..\src\osdep\gui\EditFilesysVirtual.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\InGameMessage.cpp" /> <ClCompile Include="..\..\src\osdep\gui\InGameMessage.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\main_window.cpp" /> <ClCompile Include="..\..\src\osdep\gui\main_window.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\Navigation.cpp" /> <ClCompile Include="..\..\src\osdep\gui\Navigation.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelChipset.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelChipset.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelConfig.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelConfig.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelCPU.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelCPU.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelDisplay.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelDisplay.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelFloppy.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelFloppy.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelHD.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelHD.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelInput.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelInput.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelMisc.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelMisc.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelPaths.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelPaths.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelRAM.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelRAM.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelROM.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelROM.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelSavestate.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelSavestate.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\PanelSound.cpp" /> <ClCompile Include="..\..\src\osdep\gui\PanelSound.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\sdltruetypefont.cpp" /> <ClCompile Include="..\..\src\osdep\gui\sdltruetypefont.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\SelectFile.cpp" /> <ClCompile Include="..\..\src\osdep\gui\SelectFile.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\SelectFolder.cpp" /> <ClCompile Include="..\..\src\osdep\gui\SelectFolder.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\SelectorEntry.cpp" /> <ClCompile Include="..\..\src\osdep\gui\SelectorEntry.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\ShowMessage.cpp" /> <ClCompile Include="..\..\src\osdep\gui\ShowMessage.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\UaeCheckBox.cpp" /> <ClCompile Include="..\..\src\osdep\gui\UaeCheckBox.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\UaeDropDown.cpp" /> <ClCompile Include="..\..\src\osdep\gui\UaeDropDown.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\UaeListBox.cpp" /> <ClCompile Include="..\..\src\osdep\gui\UaeListBox.cpp" />
<ClCompile Include="..\..\src\od-pandora\gui\UaeRadioButton.cpp" /> <ClCompile Include="..\..\src\osdep\gui\UaeRadioButton.cpp" />
<ClCompile Include="..\..\src\od-pandora\hardfile_pandora.cpp" /> <ClCompile Include="..\..\src\osdep\hardfile_pandora.cpp" />
<ClCompile Include="..\..\src\od-pandora\keyboard.cpp" /> <ClCompile Include="..\..\src\osdep\keyboard.cpp" />
<ClCompile Include="..\..\src\od-pandora\menu\menu_config.cpp" /> <ClCompile Include="..\..\src\osdep\menu\menu_config.cpp" />
<ClCompile Include="..\..\src\od-pandora\mp3decoder.cpp" /> <ClCompile Include="..\..\src\osdep\mp3decoder.cpp" />
<ClCompile Include="..\..\src\od-pandora\neon_helper.s" /> <ClCompile Include="..\..\src\osdep\neon_helper.s" />
<ClCompile Include="..\..\src\od-pandora\pandora.cpp" /> <ClCompile Include="..\..\src\osdep\pandora.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_filesys.cpp" /> <ClCompile Include="..\..\src\osdep\pandora_filesys.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_gui.cpp" /> <ClCompile Include="..\..\src\osdep\pandora_gui.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_input.cpp" /> <ClCompile Include="..\..\src\osdep\pandora_input.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_mem.cpp" /> <ClCompile Include="..\..\src\osdep\pandora_mem.cpp" />
<ClCompile Include="..\..\src\od-pandora\pandora_rp9.cpp" /> <ClCompile Include="..\..\src\osdep\pandora_rp9.cpp" />
<ClCompile Include="..\..\src\od-pandora\picasso96.cpp" /> <ClCompile Include="..\..\src\osdep\picasso96.cpp" />
<ClCompile Include="..\..\src\od-pandora\sigsegv_handler.cpp" /> <ClCompile Include="..\..\src\osdep\rasp_gfx.cpp" />
<ClCompile Include="..\..\src\od-pandora\writelog.cpp" /> <ClCompile Include="..\..\src\osdep\sigsegv_handler.cpp" />
<ClCompile Include="..\..\src\od-rasp\rasp_gfx.cpp" /> <ClCompile Include="..\..\src\osdep\writelog.cpp" />
<ClCompile Include="..\..\src\readcpu.cpp" /> <ClCompile Include="..\..\src\readcpu.cpp" />
<ClCompile Include="..\..\src\rommgr.cpp" /> <ClCompile Include="..\..\src\rommgr.cpp" />
<ClCompile Include="..\..\src\savestate.cpp" /> <ClCompile Include="..\..\src\savestate.cpp" />
<ClCompile Include="..\..\src\sd-sdl\sound_sdl_new.cpp" /> <ClCompile Include="..\..\src\sounddep\sound_sdl_new.cpp" />
<ClCompile Include="..\..\src\statusline.cpp" /> <ClCompile Include="..\..\src\statusline.cpp" />
<ClCompile Include="..\..\src\traps.cpp" /> <ClCompile Include="..\..\src\traps.cpp" />
<ClCompile Include="..\..\src\uaelib.cpp" /> <ClCompile Include="..\..\src\uaelib.cpp" />
@ -406,25 +406,25 @@
<ClInclude Include="..\..\src\jit\compemu_midfunc_arm.h" /> <ClInclude Include="..\..\src\jit\compemu_midfunc_arm.h" />
<ClInclude Include="..\..\src\jit\compemu_midfunc_arm2.h" /> <ClInclude Include="..\..\src\jit\compemu_midfunc_arm2.h" />
<ClInclude Include="..\..\src\jit\comptbl.h" /> <ClInclude Include="..\..\src\jit\comptbl.h" />
<ClInclude Include="..\..\src\md-pandora\m68k.h" /> <ClInclude Include="..\..\src\machdep\m68k.h" />
<ClInclude Include="..\..\src\md-pandora\maccess.h" /> <ClInclude Include="..\..\src\machdep\maccess.h" />
<ClInclude Include="..\..\src\md-pandora\md-fpp.h" /> <ClInclude Include="..\..\src\machdep\md-fpp.h" />
<ClInclude Include="..\..\src\md-pandora\rpt.h" /> <ClInclude Include="..\..\src\machdep\rpt.h" />
<ClInclude Include="..\..\src\od-pandora\cda_play.h" /> <ClInclude Include="..\..\src\osdep\cda_play.h" />
<ClInclude Include="..\..\src\od-pandora\config.h" /> <ClInclude Include="..\..\src\osdep\config.h" />
<ClInclude Include="..\..\src\od-pandora\gui\gui_handling.h" /> <ClInclude Include="..\..\src\osdep\gui\gui_handling.h" />
<ClInclude Include="..\..\src\od-pandora\gui\sdltruetypefont.hpp" /> <ClInclude Include="..\..\src\osdep\gui\sdltruetypefont.hpp" />
<ClInclude Include="..\..\src\od-pandora\gui\SelectorEntry.hpp" /> <ClInclude Include="..\..\src\osdep\gui\SelectorEntry.hpp" />
<ClInclude Include="..\..\src\od-pandora\gui\UaeCheckBox.hpp" /> <ClInclude Include="..\..\src\osdep\gui\UaeCheckBox.hpp" />
<ClInclude Include="..\..\src\od-pandora\gui\UaeDropDown.hpp" /> <ClInclude Include="..\..\src\osdep\gui\UaeDropDown.hpp" />
<ClInclude Include="..\..\src\od-pandora\gui\UaeListBox.hpp" /> <ClInclude Include="..\..\src\osdep\gui\UaeListBox.hpp" />
<ClInclude Include="..\..\src\od-pandora\gui\UaeRadioButton.hpp" /> <ClInclude Include="..\..\src\osdep\gui\UaeRadioButton.hpp" />
<ClInclude Include="..\..\src\od-pandora\mp3decoder.h" /> <ClInclude Include="..\..\src\osdep\mp3decoder.h" />
<ClInclude Include="..\..\src\od-pandora\pandora_rp9.h" /> <ClInclude Include="..\..\src\osdep\pandora_rp9.h" />
<ClInclude Include="..\..\src\od-pandora\sysconfig.h" /> <ClInclude Include="..\..\src\osdep\sysconfig.h" />
<ClInclude Include="..\..\src\od-pandora\target.h" /> <ClInclude Include="..\..\src\osdep\target.h" />
<ClInclude Include="..\..\src\sd-pandora\sound.h" /> <ClInclude Include="..\..\src\sounddep\sound.h" />
<ClInclude Include="..\..\src\td-sdl\thread.h" /> <ClInclude Include="..\..\src\threaddep\thread.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

340
Amiberry/Amiberry/Amiberry.vcxproj.filters
View file

@ -23,39 +23,6 @@
<Filter Include="Header files\include"> <Filter Include="Header files\include">
<UniqueIdentifier>{a72de7b6-114c-46c1-94dd-e1c6824e51ae}</UniqueIdentifier> <UniqueIdentifier>{a72de7b6-114c-46c1-94dd-e1c6824e51ae}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header files\td-sdl">
<UniqueIdentifier>{7a9137a1-118b-4810-891d-861d2c071939}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\sd-sdl">
<UniqueIdentifier>{7a9672f6-c9a7-458e-b273-0b24b0a19c11}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\sd-pandora">
<UniqueIdentifier>{37add0f8-d9ce-496d-b31b-7b4de37a28ba}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\od-rasp">
<UniqueIdentifier>{11863c92-f5fb-41a7-8888-0133c42939f5}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\od-pandora">
<UniqueIdentifier>{66889cab-a3cd-4751-a3b1-1cde1fffa8a9}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\od-pandora">
<UniqueIdentifier>{2395dddd-7a9e-4763-a1e6-3e9bf0b87d85}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\od-pandora\gui">
<UniqueIdentifier>{125cb7d1-693b-43b8-88b6-704e2c862045}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\od-pandora\gui">
<UniqueIdentifier>{8d2e90b3-4227-4898-b701-b3d43547a46e}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\od-pandora\menu">
<UniqueIdentifier>{f4dc4c59-aa7a-4cce-88bb-d743d6918cb4}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\md-pandora">
<UniqueIdentifier>{7c39070a-7b40-489a-9b73-d0a3393586b3}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\md-pandora">
<UniqueIdentifier>{d30f8b54-3f88-446c-85e1-e892a326a06e}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\jit"> <Filter Include="Header files\jit">
<UniqueIdentifier>{bbb7c3af-1d98-4d1c-a2b2-a5d9f3cbae36}</UniqueIdentifier> <UniqueIdentifier>{bbb7c3af-1d98-4d1c-a2b2-a5d9f3cbae36}</UniqueIdentifier>
</Filter> </Filter>
@ -113,6 +80,36 @@
<Filter Include="Source files\archivers\zip"> <Filter Include="Source files\archivers\zip">
<UniqueIdentifier>{4e318f28-ff4d-4f7a-8a12-cbcf4b5032d7}</UniqueIdentifier> <UniqueIdentifier>{4e318f28-ff4d-4f7a-8a12-cbcf4b5032d7}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header files\machdep">
<UniqueIdentifier>{d30f8b54-3f88-446c-85e1-e892a326a06e}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\osdep">
<UniqueIdentifier>{2395dddd-7a9e-4763-a1e6-3e9bf0b87d85}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\osdep\gui">
<UniqueIdentifier>{125cb7d1-693b-43b8-88b6-704e2c862045}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\sounddep">
<UniqueIdentifier>{37add0f8-d9ce-496d-b31b-7b4de37a28ba}</UniqueIdentifier>
</Filter>
<Filter Include="Header files\threaddep">
<UniqueIdentifier>{7a9137a1-118b-4810-891d-861d2c071939}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\machdep">
<UniqueIdentifier>{7c39070a-7b40-489a-9b73-d0a3393586b3}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\osdep">
<UniqueIdentifier>{66889cab-a3cd-4751-a3b1-1cde1fffa8a9}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\osdep\gui">
<UniqueIdentifier>{8d2e90b3-4227-4898-b701-b3d43547a46e}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\osdep\menu">
<UniqueIdentifier>{f4dc4c59-aa7a-4cce-88bb-d743d6918cb4}</UniqueIdentifier>
</Filter>
<Filter Include="Source files\sounddep">
<UniqueIdentifier>{7a9672f6-c9a7-458e-b273-0b24b0a19c11}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Amiberry-Debug.vgdbsettings"> <None Include="Amiberry-Debug.vgdbsettings">
@ -285,152 +282,149 @@
<ClCompile Include="..\..\src\zfile_archive.cpp"> <ClCompile Include="..\..\src\zfile_archive.cpp">
<Filter>Source files</Filter> <Filter>Source files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\sd-sdl\sound_sdl_new.cpp"> <ClCompile Include="..\..\src\sounddep\sound_sdl_new.cpp">
<Filter>Source files\sd-sdl</Filter> <Filter>Source files\sounddep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-rasp\rasp_gfx.cpp"> <ClCompile Include="..\..\src\osdep\neon_helper.s">
<Filter>Source files\od-rasp</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\neon_helper.s"> <ClCompile Include="..\..\src\osdep\bsdsocket_host.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\bsdsocket_host.cpp"> <ClCompile Include="..\..\src\osdep\cda_play.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\cda_play.cpp"> <ClCompile Include="..\..\src\osdep\charset.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\charset.cpp"> <ClCompile Include="..\..\src\osdep\fsdb_host.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\fsdb_host.cpp"> <ClCompile Include="..\..\src\osdep\hardfile_pandora.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\hardfile_pandora.cpp"> <ClCompile Include="..\..\src\osdep\keyboard.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\keyboard.cpp"> <ClCompile Include="..\..\src\osdep\mp3decoder.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\mp3decoder.cpp"> <ClCompile Include="..\..\src\osdep\pandora.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\pandora.cpp"> <ClCompile Include="..\..\src\osdep\pandora_filesys.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\pandora_filesys.cpp"> <ClCompile Include="..\..\src\osdep\pandora_gui.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\pandora_gui.cpp"> <ClCompile Include="..\..\src\osdep\pandora_input.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\pandora_input.cpp"> <ClCompile Include="..\..\src\osdep\pandora_mem.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\pandora_mem.cpp"> <ClCompile Include="..\..\src\osdep\pandora_rp9.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\pandora_rp9.cpp"> <ClCompile Include="..\..\src\osdep\picasso96.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\picasso96.cpp"> <ClCompile Include="..\..\src\osdep\sigsegv_handler.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\sigsegv_handler.cpp"> <ClCompile Include="..\..\src\osdep\writelog.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\writelog.cpp"> <ClCompile Include="..\..\src\osdep\gui\CreateFilesysHardfile.cpp">
<Filter>Source files\od-pandora</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\CreateFilesysHardfile.cpp"> <ClCompile Include="..\..\src\osdep\gui\EditFilesysHardfile.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\EditFilesysHardfile.cpp"> <ClCompile Include="..\..\src\osdep\gui\EditFilesysVirtual.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\EditFilesysVirtual.cpp"> <ClCompile Include="..\..\src\osdep\gui\InGameMessage.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\InGameMessage.cpp"> <ClCompile Include="..\..\src\osdep\gui\main_window.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\main_window.cpp"> <ClCompile Include="..\..\src\osdep\gui\Navigation.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\Navigation.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelChipset.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelChipset.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelConfig.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelConfig.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelCPU.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelCPU.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelDisplay.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelDisplay.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelFloppy.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelFloppy.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelHD.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelHD.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelInput.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelInput.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelMisc.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelMisc.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelPaths.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelPaths.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelRAM.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelRAM.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelROM.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelROM.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelSavestate.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelSavestate.cpp"> <ClCompile Include="..\..\src\osdep\gui\PanelSound.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\PanelSound.cpp"> <ClCompile Include="..\..\src\osdep\gui\sdltruetypefont.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\sdltruetypefont.cpp"> <ClCompile Include="..\..\src\osdep\gui\SelectFile.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\SelectFile.cpp"> <ClCompile Include="..\..\src\osdep\gui\SelectFolder.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\SelectFolder.cpp"> <ClCompile Include="..\..\src\osdep\gui\SelectorEntry.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\SelectorEntry.cpp"> <ClCompile Include="..\..\src\osdep\gui\ShowMessage.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\ShowMessage.cpp"> <ClCompile Include="..\..\src\osdep\gui\UaeCheckBox.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\UaeCheckBox.cpp"> <ClCompile Include="..\..\src\osdep\gui\UaeDropDown.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\UaeDropDown.cpp"> <ClCompile Include="..\..\src\osdep\gui\UaeListBox.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\UaeListBox.cpp"> <ClCompile Include="..\..\src\osdep\gui\UaeRadioButton.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\gui</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\gui\UaeRadioButton.cpp"> <ClCompile Include="..\..\src\osdep\menu\menu_config.cpp">
<Filter>Source files\od-pandora\gui</Filter> <Filter>Source files\osdep\menu</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\od-pandora\menu\menu_config.cpp"> <ClCompile Include="..\..\src\machdep\support.cpp">
<Filter>Source files\od-pandora\menu</Filter> <Filter>Source files\machdep</Filter>
</ClCompile>
<ClCompile Include="..\..\src\md-pandora\support.cpp">
<Filter>Source files\md-pandora</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\jit\compemu.cpp"> <ClCompile Include="..\..\src\jit\compemu.cpp">
<Filter>Source files\jit</Filter> <Filter>Source files\jit</Filter>
@ -558,6 +552,12 @@
<ClCompile Include="..\..\src\archivers\zip\unzip.cpp"> <ClCompile Include="..\..\src\archivers\zip\unzip.cpp">
<Filter>Source files\archivers\zip</Filter> <Filter>Source files\archivers\zip</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\osdep\rasp_gfx.cpp">
<Filter>Source files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\osdep\rasp_gfx.cpp">
<Filter>Source files\osdep</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="..\..\data\35floppy.ico"> <Image Include="..\..\data\35floppy.ico">
@ -792,62 +792,62 @@
<ClInclude Include="..\..\src\include\zfile.h"> <ClInclude Include="..\..\src\include\zfile.h">
<Filter>Header files\include</Filter> <Filter>Header files\include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\td-sdl\thread.h"> <ClInclude Include="..\..\src\threaddep\thread.h">
<Filter>Header files\td-sdl</Filter> <Filter>Header files\threaddep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\sd-pandora\sound.h"> <ClInclude Include="..\..\src\sounddep\sound.h">
<Filter>Header files\sd-pandora</Filter> <Filter>Header files\sounddep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\cda_play.h"> <ClInclude Include="..\..\src\osdep\cda_play.h">
<Filter>Header files\od-pandora</Filter> <Filter>Header files\osdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\config.h"> <ClInclude Include="..\..\src\osdep\config.h">
<Filter>Header files\od-pandora</Filter> <Filter>Header files\osdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\mp3decoder.h"> <ClInclude Include="..\..\src\osdep\mp3decoder.h">
<Filter>Header files\od-pandora</Filter> <Filter>Header files\osdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\pandora_rp9.h"> <ClInclude Include="..\..\src\osdep\pandora_rp9.h">
<Filter>Header files\od-pandora</Filter> <Filter>Header files\osdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\sysconfig.h"> <ClInclude Include="..\..\src\osdep\sysconfig.h">
<Filter>Header files\od-pandora</Filter> <Filter>Header files\osdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\target.h"> <ClInclude Include="..\..\src\osdep\target.h">
<Filter>Header files\od-pandora</Filter> <Filter>Header files\osdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\gui\gui_handling.h"> <ClInclude Include="..\..\src\osdep\gui\gui_handling.h">
<Filter>Header files\od-pandora\gui</Filter> <Filter>Header files\osdep\gui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\gui\sdltruetypefont.hpp"> <ClInclude Include="..\..\src\osdep\gui\sdltruetypefont.hpp">
<Filter>Header files\od-pandora\gui</Filter> <Filter>Header files\osdep\gui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\gui\SelectorEntry.hpp"> <ClInclude Include="..\..\src\osdep\gui\SelectorEntry.hpp">
<Filter>Header files\od-pandora\gui</Filter> <Filter>Header files\osdep\gui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\gui\UaeCheckBox.hpp"> <ClInclude Include="..\..\src\osdep\gui\UaeCheckBox.hpp">
<Filter>Header files\od-pandora\gui</Filter> <Filter>Header files\osdep\gui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\gui\UaeDropDown.hpp"> <ClInclude Include="..\..\src\osdep\gui\UaeDropDown.hpp">
<Filter>Header files\od-pandora\gui</Filter> <Filter>Header files\osdep\gui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\gui\UaeListBox.hpp"> <ClInclude Include="..\..\src\osdep\gui\UaeListBox.hpp">
<Filter>Header files\od-pandora\gui</Filter> <Filter>Header files\osdep\gui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\od-pandora\gui\UaeRadioButton.hpp"> <ClInclude Include="..\..\src\osdep\gui\UaeRadioButton.hpp">
<Filter>Header files\od-pandora\gui</Filter> <Filter>Header files\osdep\gui</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\md-pandora\m68k.h"> <ClInclude Include="..\..\src\machdep\m68k.h">
<Filter>Header files\md-pandora</Filter> <Filter>Header files\machdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\md-pandora\maccess.h"> <ClInclude Include="..\..\src\machdep\maccess.h">
<Filter>Header files\md-pandora</Filter> <Filter>Header files\machdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\md-pandora\md-fpp.h"> <ClInclude Include="..\..\src\machdep\md-fpp.h">
<Filter>Header files\md-pandora</Filter> <Filter>Header files\machdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\md-pandora\rpt.h"> <ClInclude Include="..\..\src\machdep\rpt.h">
<Filter>Header files\md-pandora</Filter> <Filter>Header files\machdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\jit\codegen_arm.h"> <ClInclude Include="..\..\src\jit\codegen_arm.h">
<Filter>Header files\jit</Filter> <Filter>Header files\jit</Filter>

110
Makefile
View file

@ -43,7 +43,7 @@ DEFS += -DROM_PATH_PREFIX=\"./\" -DDATA_PREFIX=\"./data/\" -DSAVE_PREFIX=\"./sav
DEFS += -DUSE_SDL DEFS += -DUSE_SDL
MORE_CFLAGS += -I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads MORE_CFLAGS += -I/opt/vc/include -I/opt/vc/include/interface/vmcs_host/linux -I/opt/vc/include/interface/vcos/pthreads
MORE_CFLAGS += -Isrc -Isrc/od-pandora -Isrc/td-sdl -Isrc/include MORE_CFLAGS += -Isrc -Isrc/osdep -Isrc/threaddep -Isrc/include
MORE_CFLAGS += -Wno-unused -Wno-format -DGCCCONSTFUNC="__attribute__((const))" MORE_CFLAGS += -Wno-unused -Wno-format -DGCCCONSTFUNC="__attribute__((const))"
MORE_CFLAGS += -fexceptions -fpermissive MORE_CFLAGS += -fexceptions -fpermissive
@ -154,51 +154,51 @@ OBJS = \
src/archivers/lzx/unlzx.o \ src/archivers/lzx/unlzx.o \
src/archivers/wrp/warp.o \ src/archivers/wrp/warp.o \
src/archivers/zip/unzip.o \ src/archivers/zip/unzip.o \
src/md-pandora/support.o \ src/machdep/support.o \
src/od-pandora/bsdsocket_host.o \ src/osdep/bsdsocket_host.o \
src/od-pandora/cda_play.o \ src/osdep/cda_play.o \
src/od-pandora/charset.o \ src/osdep/charset.o \
src/od-pandora/fsdb_host.o \ src/osdep/fsdb_host.o \
src/od-pandora/hardfile_pandora.o \ src/osdep/hardfile_pandora.o \
src/od-pandora/keyboard.o \ src/osdep/keyboard.o \
src/od-pandora/mp3decoder.o \ src/osdep/mp3decoder.o \
src/od-pandora/writelog.o \ src/osdep/writelog.o \
src/od-pandora/pandora.o \ src/osdep/pandora.o \
src/od-pandora/pandora_filesys.o \ src/osdep/pandora_filesys.o \
src/od-pandora/pandora_input.o \ src/osdep/pandora_input.o \
src/od-pandora/pandora_gui.o \ src/osdep/pandora_gui.o \
src/od-pandora/pandora_rp9.o \ src/osdep/pandora_rp9.o \
src/od-pandora/pandora_mem.o \ src/osdep/pandora_mem.o \
src/od-pandora/sigsegv_handler.o \ src/osdep/sigsegv_handler.o \
src/od-pandora/menu/menu_config.o \ src/osdep/menu/menu_config.o \
src/sd-sdl/sound_sdl_new.o \ src/sounddep/sound_sdl_new.o \
src/od-pandora/gui/UaeRadioButton.o \ src/osdep/gui/UaeRadioButton.o \
src/od-pandora/gui/UaeDropDown.o \ src/osdep/gui/UaeDropDown.o \
src/od-pandora/gui/UaeCheckBox.o \ src/osdep/gui/UaeCheckBox.o \
src/od-pandora/gui/UaeListBox.o \ src/osdep/gui/UaeListBox.o \
src/od-pandora/gui/InGameMessage.o \ src/osdep/gui/InGameMessage.o \
src/od-pandora/gui/SelectorEntry.o \ src/osdep/gui/SelectorEntry.o \
src/od-pandora/gui/ShowMessage.o \ src/osdep/gui/ShowMessage.o \
src/od-pandora/gui/SelectFolder.o \ src/osdep/gui/SelectFolder.o \
src/od-pandora/gui/SelectFile.o \ src/osdep/gui/SelectFile.o \
src/od-pandora/gui/CreateFilesysHardfile.o \ src/osdep/gui/CreateFilesysHardfile.o \
src/od-pandora/gui/EditFilesysVirtual.o \ src/osdep/gui/EditFilesysVirtual.o \
src/od-pandora/gui/EditFilesysHardfile.o \ src/osdep/gui/EditFilesysHardfile.o \
src/od-pandora/gui/PanelPaths.o \ src/osdep/gui/PanelPaths.o \
src/od-pandora/gui/PanelConfig.o \ src/osdep/gui/PanelConfig.o \
src/od-pandora/gui/PanelCPU.o \ src/osdep/gui/PanelCPU.o \
src/od-pandora/gui/PanelChipset.o \ src/osdep/gui/PanelChipset.o \
src/od-pandora/gui/PanelROM.o \ src/osdep/gui/PanelROM.o \
src/od-pandora/gui/PanelRAM.o \ src/osdep/gui/PanelRAM.o \
src/od-pandora/gui/PanelFloppy.o \ src/osdep/gui/PanelFloppy.o \
src/od-pandora/gui/PanelHD.o \ src/osdep/gui/PanelHD.o \
src/od-pandora/gui/PanelDisplay.o \ src/osdep/gui/PanelDisplay.o \
src/od-pandora/gui/PanelSound.o \ src/osdep/gui/PanelSound.o \
src/od-pandora/gui/PanelInput.o \ src/osdep/gui/PanelInput.o \
src/od-pandora/gui/PanelMisc.o \ src/osdep/gui/PanelMisc.o \
src/od-pandora/gui/PanelSavestate.o \ src/osdep/gui/PanelSavestate.o \
src/od-pandora/gui/main_window.o \ src/osdep/gui/main_window.o \
src/od-pandora/gui/Navigation.o src/osdep/gui/Navigation.o
ifeq ($(PLATFORM),gles) ifeq ($(PLATFORM),gles)
OBJS += src/od-gles/gl.o OBJS += src/od-gles/gl.o
@ -206,16 +206,16 @@ ifeq ($(PLATFORM),gles)
OBJS += src/od-gles/gl_platform.o OBJS += src/od-gles/gl_platform.o
OBJS += src/od-gles/gles_gfx.o OBJS += src/od-gles/gles_gfx.o
else else
OBJS += src/od-rasp/rasp_gfx.o OBJS += src/osdep/rasp_gfx.o
endif endif
OBJS += src/od-pandora/gui/sdltruetypefont.o OBJS += src/osdep/gui/sdltruetypefont.o
OBJS += src/od-pandora/picasso96.o OBJS += src/osdep/picasso96.o
ifeq ($(PLATFORM),rpi1) ifeq ($(PLATFORM),rpi1)
OBJS += src/od-pandora/arm_helper.o OBJS += src/osdep/arm_helper.o
else else
OBJS += src/od-pandora/neon_helper.o OBJS += src/osdep/neon_helper.o
endif endif
OBJS += src/newcpu.o OBJS += src/newcpu.o
@ -231,11 +231,11 @@ OBJS += src/jit/compstbl.o
OBJS += src/jit/compemu_fpp.o OBJS += src/jit/compemu_fpp.o
OBJS += src/jit/compemu_support.o OBJS += src/jit/compemu_support.o
src/od-pandora/neon_helper.o: src/od-pandora/neon_helper.s src/osdep/neon_helper.o: src/osdep/neon_helper.s
$(CXX) $(CPU_FLAGS) -Wall -o src/od-pandora/neon_helper.o -c src/od-pandora/neon_helper.s $(CXX) $(CPU_FLAGS) -Wall -o src/osdep/neon_helper.o -c src/osdep/neon_helper.s
src/od-pandora/arm_helper.o: src/od-pandora/arm_helper.s src/osdep/arm_helper.o: src/osdep/arm_helper.s
$(CXX) $(CPU_FLAGS) -Wall -o src/od-pandora/arm_helper.o -c src/od-pandora/arm_helper.s $(CXX) $(CPU_FLAGS) -Wall -o src/osdep/arm_helper.o -c src/osdep/arm_helper.s
src/trace.o: src/trace.c src/trace.o: src/trace.c

2
src/akiko.cpp
View file

@ -21,7 +21,7 @@
#include "savestate.h" #include "savestate.h"
#include "blkdev.h" #include "blkdev.h"
#include "zfile.h" #include "zfile.h"
#include "td-sdl/thread.h" #include "threaddep/thread.h"
#include "akiko.h" #include "akiko.h"
#include "gui.h" #include "gui.h"
#include "crc32.h" #include "crc32.h"

2
src/audio.cpp
View file

@ -22,7 +22,7 @@
#include "autoconf.h" #include "autoconf.h"
#include "gensound.h" #include "gensound.h"
#include "audio.h" #include "audio.h"
#include "sd-pandora/sound.h" #include "sounddep/sound.h"
#include "events.h" #include "events.h"
#include "savestate.h" #include "savestate.h"
#include "gui.h" #include "gui.h"

2
src/blkdev.cpp
View file

@ -16,7 +16,7 @@
#include "scsidev.h" #include "scsidev.h"
#include "savestate.h" #include "savestate.h"
#include "crc32.h" #include "crc32.h"
#include "td-sdl/thread.h" #include "threaddep/thread.h"
#include "execio.h" #include "execio.h"
#include "zfile.h" #include "zfile.h"
#include "scsi.h" #include "scsi.h"

2
src/blkdev_cdimage.cpp
View file

@ -21,7 +21,7 @@
#include "zfile.h" #include "zfile.h"
#include "gui.h" #include "gui.h"
#include "fsdb.h" #include "fsdb.h"
#include "td-sdl/thread.h" #include "threaddep/thread.h"
#include "scsidev.h" #include "scsidev.h"
#include "mp3decoder.h" #include "mp3decoder.h"
#include "cda_play.h" #include "cda_play.h"

2
src/bsdsocket.cpp
View file

@ -20,7 +20,7 @@
#include "newcpu.h" #include "newcpu.h"
#include "autoconf.h" #include "autoconf.h"
#include "traps.h" #include "traps.h"
#include "td-sdl/thread.h" #include "threaddep/thread.h"
#include "bsdsocket.h" #include "bsdsocket.h"
#include "native2amiga.h" #include "native2amiga.h"

2
src/cfgfile.cpp
View file

@ -3715,7 +3715,7 @@ uae_u32 cfgfile_uaelib(int mode, uae_u32 name, uae_u32 dst, uae_u32 maxlen)
return 0; return 0;
} }
#include "sd-pandora/sound.h" #include "sounddep/sound.h"
void default_prefs(struct uae_prefs *p, int type) void default_prefs(struct uae_prefs *p, int type)
{ {

2
src/custom.cpp
View file

@ -17,7 +17,7 @@
#include "uae.h" #include "uae.h"
#include "gensound.h" #include "gensound.h"
#include "audio.h" #include "audio.h"
#include "sd-pandora/sound.h" #include "sounddep/sound.h"
#include "memory.h" #include "memory.h"
#include "custom.h" #include "custom.h"
#include "newcpu.h" #include "newcpu.h"

2
src/drawing.cpp
View file

@ -32,7 +32,7 @@
#include <ctype.h> #include <ctype.h>
#include <assert.h> #include <assert.h>
#include "options.h" #include "options.h"
#include "td-sdl/thread.h" #include "threaddep/thread.h"
#include "uae.h" #include "uae.h"
#include "memory.h" #include "memory.h"
#include "custom.h" #include "custom.h"

2
src/filesys.cpp
View file

@ -25,7 +25,7 @@
#include "sysconfig.h" #include "sysconfig.h"
#include "sysdeps.h" #include "sysdeps.h"
#include "td-sdl/thread.h" #include "threaddep/thread.h"
#include "options.h" #include "options.h"
#include "uae.h" #include "uae.h"
#include "memory.h" #include "memory.h"

2
src/fpp.cpp
View file

@ -25,7 +25,7 @@
#include "memory.h" #include "memory.h"
#include "custom.h" #include "custom.h"
#include "newcpu.h" #include "newcpu.h"
#include "md-pandora/md-fpp.h" #include "machdep/md-fpp.h"
#include "savestate.h" #include "savestate.h"
#include "cpu_prefetch.h" #include "cpu_prefetch.h"

2
src/hardfile.cpp
View file

@ -10,7 +10,7 @@
#include "sysconfig.h" #include "sysconfig.h"
#include "sysdeps.h" #include "sysdeps.h"
#include "td-sdl/thread.h" #include "threaddep/thread.h"
#include "options.h" #include "options.h"
#include "memory.h" #include "memory.h"
#include "custom.h" #include "custom.h"

2
src/include/custom.h
View file

@ -9,7 +9,7 @@
#ifndef UAE_CUSTOM_H #ifndef UAE_CUSTOM_H
#define UAE_CUSTOM_H #define UAE_CUSTOM_H
#include "md-pandora/rpt.h" #include "machdep/rpt.h"
/* These are the masks that are ORed together in the chipset_mask option. /* These are the masks that are ORed together in the chipset_mask option.
* If CSMASK_AGA is set, the ECS bits are guaranteed to be set as well. */ * If CSMASK_AGA is set, the ECS bits are guaranteed to be set as well. */

2
src/include/events.h
View file

@ -12,7 +12,7 @@
* Copyright 1995-1998 Bernd Schmidt * Copyright 1995-1998 Bernd Schmidt
*/ */
#include "md-pandora/rpt.h" #include "machdep/rpt.h"
extern frame_time_t vsyncmintime; extern frame_time_t vsyncmintime;
extern int vsynctimebase, syncbase; extern int vsynctimebase, syncbase;

2
src/include/memory.h
View file

@ -39,7 +39,7 @@ typedef int (REGPARAM3 *check_func)(uaecptr, uae_u32) REGPARAM;
extern uae_u32 max_z3fastmem; extern uae_u32 max_z3fastmem;
#undef DIRECT_MEMFUNCS_SUCCESSFUL #undef DIRECT_MEMFUNCS_SUCCESSFUL
#include "md-pandora/maccess.h" #include "machdep/maccess.h"
#define chipmem_start_addr 0x00000000 #define chipmem_start_addr 0x00000000
#define bogomem_start_addr 0x00C00000 #define bogomem_start_addr 0x00C00000

2
src/include/newcpu.h
View file

@ -34,7 +34,7 @@
#define _NEWCPU_H #define _NEWCPU_H
#include "readcpu.h" #include "readcpu.h"
#include "md-pandora/m68k.h" #include "machdep/m68k.h"
extern const int areg_byteinc[]; extern const int areg_byteinc[];
extern const int imm8_table[]; extern const int imm8_table[];

2
src/include/xwin.h
View file

@ -6,7 +6,7 @@
* Copyright 1995-1997 Bernd Schmidt * Copyright 1995-1997 Bernd Schmidt
*/ */
#include "md-pandora/rpt.h" #include "machdep/rpt.h"
typedef uae_u32 xcolnr; typedef uae_u32 xcolnr;

0
src/md-pandora/m68k.h → src/machdep/m68k.h
View file

0
src/md-pandora/maccess.h → src/machdep/maccess.h
View file

0
src/md-pandora/md-fpp.h → src/machdep/md-fpp.h
View file

0
src/md-pandora/rpt.h → src/machdep/rpt.h
View file

0
src/md-pandora/support.cpp → src/machdep/support.cpp
View file

4
src/main.cpp
View file

@ -10,11 +10,11 @@
#include "sysdeps.h" #include "sysdeps.h"
#include <assert.h> #include <assert.h>
#include "options.h" #include "options.h"
#include "td-sdl/thread.h" #include "threaddep/thread.h"
#include "uae.h" #include "uae.h"
#include "gensound.h" #include "gensound.h"
#include "audio.h" #include "audio.h"
#include "sd-pandora/sound.h" #include "sounddep/sound.h"
#include "memory.h" #include "memory.h"
#include "custom.h" #include "custom.h"
#include "newcpu.h" #include "newcpu.h"

2
src/native2amiga.cpp
View file

@ -12,7 +12,7 @@
#include "sysconfig.h" #include "sysconfig.h"
#include "sysdeps.h" #include "sysdeps.h"
#include "td-sdl/thread.h" #include "threaddep/thread.h"
#include "options.h" #include "options.h"
#include "include/memory.h" #include "include/memory.h"
#include "custom.h" #include "custom.h"

0
src/od-pandora/arm_helper.s → src/osdep/arm_helper.s
View file

2
src/od-pandora/bsdsocket_host.cpp → src/osdep/bsdsocket_host.cpp
View file

@ -32,7 +32,7 @@
#include "custom.h" #include "custom.h"
#include "autoconf.h" #include "autoconf.h"
#include "traps.h" #include "traps.h"
#include "../td-sdl/thread.h" #include "../threaddep/thread.h"
#include "bsdsocket.h" #include "bsdsocket.h"
#include "native2amiga.h" #include "native2amiga.h"

2
src/od-pandora/cda_play.cpp → src/osdep/cda_play.cpp
View file

@ -2,7 +2,7 @@
#include "sysdeps.h" #include "sysdeps.h"
#include "cda_play.h" #include "cda_play.h"
#include "sd-pandora/sound.h" #include "sounddep/sound.h"
#include "uae.h" #include "uae.h"

0
src/od-pandora/cda_play.h → src/osdep/cda_play.h
View file

0
src/od-pandora/charset.cpp → src/osdep/charset.cpp
View file

0
src/od-pandora/config.h → src/osdep/config.h
View file

0
src/od-pandora/fsdb_host.cpp → src/osdep/fsdb_host.cpp
View file

0
src/od-pandora/gui/CreateFilesysHardfile.cpp → src/osdep/gui/CreateFilesysHardfile.cpp
View file

0
src/od-pandora/gui/EditFilesysHardfile.cpp → src/osdep/gui/EditFilesysHardfile.cpp
View file

0
src/od-pandora/gui/EditFilesysVirtual.cpp → src/osdep/gui/EditFilesysVirtual.cpp
View file

0
src/od-pandora/gui/InGameMessage.cpp → src/osdep/gui/InGameMessage.cpp
View file

0
src/od-pandora/gui/Navigation.cpp → src/osdep/gui/Navigation.cpp
View file

0
src/od-pandora/gui/PanelCPU.cpp → src/osdep/gui/PanelCPU.cpp
View file

0
src/od-pandora/gui/PanelChipset.cpp → src/osdep/gui/PanelChipset.cpp
View file

0
src/od-pandora/gui/PanelConfig.cpp → src/osdep/gui/PanelConfig.cpp
View file

0
src/od-pandora/gui/PanelDisplay.cpp → src/osdep/gui/PanelDisplay.cpp
View file

0
src/od-pandora/gui/PanelFloppy.cpp → src/osdep/gui/PanelFloppy.cpp
View file

0
src/od-pandora/gui/PanelHD.cpp → src/osdep/gui/PanelHD.cpp
View file

0
src/od-pandora/gui/PanelInput.cpp → src/osdep/gui/PanelInput.cpp
View file

0
src/od-pandora/gui/PanelMisc.cpp → src/osdep/gui/PanelMisc.cpp
View file

0
src/od-pandora/gui/PanelPaths.cpp → src/osdep/gui/PanelPaths.cpp
View file

0
src/od-pandora/gui/PanelRAM.cpp → src/osdep/gui/PanelRAM.cpp
View file

0
src/od-pandora/gui/PanelROM.cpp → src/osdep/gui/PanelROM.cpp
View file

0
src/od-pandora/gui/PanelSavestate.cpp → src/osdep/gui/PanelSavestate.cpp
View file

2
src/od-pandora/gui/PanelSound.cpp → src/osdep/gui/PanelSound.cpp
View file

@ -17,7 +17,7 @@
#include "newcpu.h" #include "newcpu.h"
#include "custom.h" #include "custom.h"
#include "gui_handling.h" #include "gui_handling.h"
#include "sd-pandora/sound.h" #include "sounddep/sound.h"
static gcn::Window *grpSound; static gcn::Window *grpSound;

0
src/od-pandora/gui/SelectFile.cpp → src/osdep/gui/SelectFile.cpp
View file

0
src/od-pandora/gui/SelectFolder.cpp → src/osdep/gui/SelectFolder.cpp
View file

2
src/od-pandora/gui/SelectorEntry.cpp → src/osdep/gui/SelectorEntry.cpp
View file

@ -1,4 +1,4 @@
#include "od-pandora/gui/SelectorEntry.hpp" #include "osdep/gui/SelectorEntry.hpp"
#include "guichan/widgets/container.hpp" #include "guichan/widgets/container.hpp"
#include "guichan/widgets/icon.hpp" #include "guichan/widgets/icon.hpp"

0
src/od-pandora/gui/SelectorEntry.hpp → src/osdep/gui/SelectorEntry.hpp
View file

0
src/od-pandora/gui/ShowMessage.cpp → src/osdep/gui/ShowMessage.cpp
View file

0
src/od-pandora/gui/UaeCheckBox.cpp → src/osdep/gui/UaeCheckBox.cpp
View file

0
src/od-pandora/gui/UaeCheckBox.hpp → src/osdep/gui/UaeCheckBox.hpp
View file

0
src/od-pandora/gui/UaeDropDown.cpp → src/osdep/gui/UaeDropDown.cpp
View file

0
src/od-pandora/gui/UaeDropDown.hpp → src/osdep/gui/UaeDropDown.hpp
View file

0
src/od-pandora/gui/UaeListBox.cpp → src/osdep/gui/UaeListBox.cpp
View file

0
src/od-pandora/gui/UaeListBox.hpp → src/osdep/gui/UaeListBox.hpp
View file

0
src/od-pandora/gui/UaeRadioButton.cpp → src/osdep/gui/UaeRadioButton.cpp
View file

0
src/od-pandora/gui/UaeRadioButton.hpp → src/osdep/gui/UaeRadioButton.hpp
View file

0
src/od-pandora/gui/gui_handling.h → src/osdep/gui/gui_handling.h
View file

0
src/od-pandora/gui/main_window.cpp → src/osdep/gui/main_window.cpp
View file

0
src/od-pandora/gui/sdltruetypefont.cpp → src/osdep/gui/sdltruetypefont.cpp
View file

0
src/od-pandora/gui/sdltruetypefont.hpp → src/osdep/gui/sdltruetypefont.hpp
View file

2
src/od-pandora/hardfile_pandora.cpp → src/osdep/hardfile_pandora.cpp
View file

@ -1,7 +1,7 @@
#include "sysconfig.h" #include "sysconfig.h"
#include "sysdeps.h" #include "sysdeps.h"
#include "td-sdl/thread.h" #include "threaddep/thread.h"
#include "options.h" #include "options.h"
#include "filesys.h" #include "filesys.h"
#include "zfile.h" #include "zfile.h"

0
src/od-pandora/keyboard.cpp → src/osdep/keyboard.cpp
View file

2
src/od-pandora/menu/menu_config.cpp → src/osdep/menu/menu_config.cpp
View file

@ -6,7 +6,7 @@
#include "autoconf.h" #include "autoconf.h"
#include "options.h" #include "options.h"
#include "gui.h" #include "gui.h"
#include "sd-pandora/sound.h" #include "sounddep/sound.h"
#include "include/memory.h" #include "include/memory.h"
#include "newcpu.h" #include "newcpu.h"
#include "custom.h" #include "custom.h"

0
src/od-pandora/mp3decoder.cpp → src/osdep/mp3decoder.cpp
View file

0
src/od-pandora/mp3decoder.h → src/osdep/mp3decoder.h
View file

0
src/od-pandora/neon_helper.s → src/osdep/neon_helper.s
View file

2
src/od-pandora/pandora.cpp → src/osdep/pandora.cpp
View file

@ -21,7 +21,7 @@
#include "autoconf.h" #include "autoconf.h"
#include "uae.h" #include "uae.h"
#include "options.h" #include "options.h"
#include "td-sdl/thread.h" #include "threaddep/thread.h"
#include "gui.h" #include "gui.h"
#include "include/memory.h" #include "include/memory.h"
#include "newcpu.h" #include "newcpu.h"

0
src/od-pandora/pandora_filesys.cpp → src/osdep/pandora_filesys.cpp
View file

0
src/od-pandora/pandora_gfx.cpp → src/osdep/pandora_gfx.cpp
View file

6
src/od-pandora/pandora_gui.cpp → src/osdep/pandora_gui.cpp
View file

@ -12,7 +12,7 @@
#include "keybuf.h" #include "keybuf.h"
#include "zfile.h" #include "zfile.h"
#include "gui.h" #include "gui.h"
#include "od-pandora/gui/SelectorEntry.hpp" #include "osdep/gui/SelectorEntry.hpp"
#include "gui/gui_handling.h" #include "gui/gui_handling.h"
#include "memory.h" #include "memory.h"
#include "rommgr.h" #include "rommgr.h"
@ -21,7 +21,7 @@
#include "inputdevice.h" #include "inputdevice.h"
#include "xwin.h" #include "xwin.h"
#include "drawing.h" #include "drawing.h"
#include "sd-pandora/sound.h" #include "sounddep/sound.h"
#include "audio.h" #include "audio.h"
#include "keybuf.h" #include "keybuf.h"
#include "keyboard.h" #include "keyboard.h"
@ -31,7 +31,7 @@
#include "autoconf.h" #include "autoconf.h"
#include "blkdev.h" #include "blkdev.h"
#include <SDL.h> #include <SDL.h>
#include "td-sdl/thread.h" #include "threaddep/thread.h"
#ifdef RASPBERRY #ifdef RASPBERRY
#include <linux/kd.h> #include <linux/kd.h>

0
src/od-pandora/pandora_input.cpp → src/osdep/pandora_input.cpp
View file

0
src/od-pandora/pandora_mem.cpp → src/osdep/pandora_mem.cpp
View file

0
src/od-pandora/pandora_rp9.cpp → src/osdep/pandora_rp9.cpp
View file

0
src/od-pandora/pandora_rp9.h → src/osdep/pandora_rp9.h
View file

2
src/od-pandora/picasso96.cpp → src/osdep/picasso96.cpp
View file

@ -46,7 +46,7 @@
#include "config.h" #include "config.h"
#include "options.h" #include "options.h"
#include "td-sdl/thread.h" #include "threaddep/thread.h"
#include "memory.h" #include "memory.h"
#include "custom.h" #include "custom.h"
#include "newcpu.h" #include "newcpu.h"

2
src/od-rasp/rasp_gfx.cpp → src/osdep/rasp_gfx.cpp
View file

@ -20,7 +20,7 @@
#ifdef ANDROIDSDL #ifdef ANDROIDSDL
#include <android/log.h> #include <android/log.h>
#endif #endif
#include "td-sdl/thread.h" #include "threaddep/thread.h"
#include "bcm_host.h" #include "bcm_host.h"

0
src/od-pandora/sigsegv_handler.cpp → src/osdep/sigsegv_handler.cpp
View file

0
src/od-pandora/sysconfig.h → src/osdep/sysconfig.h
View file

0
src/od-pandora/target.h → src/osdep/target.h
View file

0
src/od-pandora/writelog.cpp → src/osdep/writelog.cpp
View file

0
src/sd-pandora/sound.cpp → src/sounddep/sound.cpp
View file

0
src/sd-pandora/sound.h → src/sounddep/sound.h
View file

684
src/sd-sdl/sound_sdl_new.cpp → src/sounddep/sound_sdl_new.cpp
View file

@ -1,342 +1,342 @@
/* /*
* Sdl sound.c implementation * Sdl sound.c implementation
* (c) 2015 * (c) 2015
*/ */
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <semaphore.h> #include <semaphore.h>
#include <pthread.h> #include <pthread.h>
#include <errno.h> #include <errno.h>
#include "sysconfig.h" #include "sysconfig.h"
#include "sysdeps.h" #include "sysdeps.h"
#include "config.h" #include "config.h"
#include "uae.h" #include "uae.h"
#include "options.h" #include "options.h"
#include "memory.h" #include "memory.h"
#include "newcpu.h" #include "newcpu.h"
#include "custom.h" #include "custom.h"
#include "audio.h" #include "audio.h"
#include "gensound.h" #include "gensound.h"
#include "sd-pandora/sound.h" #include "sounddep/sound.h"
#include <SDL.h> #include <SDL.h>
#ifdef ANDROID #ifdef ANDROID
#include <android/log.h> #include <android/log.h>
#endif #endif
uae_u16 sndbuffer[SOUND_BUFFERS_COUNT][(SNDBUFFER_LEN + 32)*DEFAULT_SOUND_CHANNELS]; uae_u16 sndbuffer[SOUND_BUFFERS_COUNT][(SNDBUFFER_LEN + 32)*DEFAULT_SOUND_CHANNELS];
unsigned n_callback_sndbuff, n_render_sndbuff; unsigned n_callback_sndbuff, n_render_sndbuff;
uae_u16 *sndbufpt = sndbuffer[0]; uae_u16 *sndbufpt = sndbuffer[0];
uae_u16 *render_sndbuff = sndbuffer[0]; uae_u16 *render_sndbuff = sndbuffer[0];
uae_u16 *finish_sndbuff = sndbuffer[0] + SNDBUFFER_LEN * DEFAULT_SOUND_CHANNELS; uae_u16 *finish_sndbuff = sndbuffer[0] + SNDBUFFER_LEN * DEFAULT_SOUND_CHANNELS;
uae_u16 cdaudio_buffer[CDAUDIO_BUFFERS][(CDAUDIO_BUFFER_LEN + 32) * DEFAULT_SOUND_CHANNELS]; uae_u16 cdaudio_buffer[CDAUDIO_BUFFERS][(CDAUDIO_BUFFER_LEN + 32) * DEFAULT_SOUND_CHANNELS];
uae_u16 *cdbufpt = cdaudio_buffer[0]; uae_u16 *cdbufpt = cdaudio_buffer[0];
uae_u16 *render_cdbuff = cdaudio_buffer[0]; uae_u16 *render_cdbuff = cdaudio_buffer[0];
uae_u16 *finish_cdbuff = cdaudio_buffer[0] + CDAUDIO_BUFFER_LEN * DEFAULT_SOUND_CHANNELS; uae_u16 *finish_cdbuff = cdaudio_buffer[0] + CDAUDIO_BUFFER_LEN * DEFAULT_SOUND_CHANNELS;
bool cdaudio_active = false; bool cdaudio_active = false;
static int cdwrcnt = 0; static int cdwrcnt = 0;
static int cdrdcnt = 0; static int cdrdcnt = 0;
extern int screen_is_picasso; extern int screen_is_picasso;
#ifdef NO_SOUND #ifdef NO_SOUND
void finish_sound_buffer(void) {} void finish_sound_buffer(void) {}
int setup_sound(void) { sound_available = 0; return 0; } int setup_sound(void) { sound_available = 0; return 0; }
void close_sound(void) {} void close_sound(void) {}
void pandora_stop_sound(void) {} void pandora_stop_sound(void) {}
int init_sound(void) { return 0; } int init_sound(void) { return 0; }
void pause_sound(void) {} void pause_sound(void) {}
void resume_sound(void) {} void resume_sound(void) {}
void update_sound(int) {} void update_sound(int) {}
void reset_sound(void) {} void reset_sound(void) {}
void restart_sound_buffer(void) {} void restart_sound_buffer(void) {}
#else #else
static int have_sound = 0; static int have_sound = 0;
static int lastfreq; static int lastfreq;
void update_sound(float clk) void update_sound(float clk)
{ {
float evtime; float evtime;
evtime = clk * CYCLE_UNIT / (float)currprefs.sound_freq; evtime = clk * CYCLE_UNIT / (float)currprefs.sound_freq;
scaled_sample_evtime = (int)evtime; scaled_sample_evtime = (int)evtime;
} }
static int s_oldrate = 0, s_oldbits = 0, s_oldstereo = 0; static int s_oldrate = 0, s_oldbits = 0, s_oldstereo = 0;
static int sound_thread_active = 0, sound_thread_exit = 0; static int sound_thread_active = 0, sound_thread_exit = 0;
static sem_t sound_sem, sound_out_sem; static sem_t sound_sem, sound_out_sem;
static int output_cnt = 0; static int output_cnt = 0;
static int wrcnt = 0; static int wrcnt = 0;
#define MIN(X,Y) ((X) < (Y) ? (X) : (Y)) #define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
static void sound_thread_mixer(void *ud, Uint8 *stream, int len) static void sound_thread_mixer(void *ud, Uint8 *stream, int len)
{ {
int cnt = 0, sem_val = 0; int cnt = 0, sem_val = 0;
sound_thread_active = 1; sound_thread_active = 1;
sem_getvalue(&sound_sem, &sem_val); sem_getvalue(&sound_sem, &sem_val);
while (sem_val > 1) while (sem_val > 1)
{ {
sem_wait(&sound_sem); sem_wait(&sound_sem);
sem_getvalue(&sound_sem, &sem_val); sem_getvalue(&sound_sem, &sem_val);
} }
sem_wait(&sound_sem); sem_wait(&sound_sem);
if (sound_thread_exit) if (sound_thread_exit)
return; return;
cnt = output_cnt; cnt = output_cnt;
sem_post(&sound_out_sem); sem_post(&sound_out_sem);
if (currprefs.sound_stereo) { if (currprefs.sound_stereo) {
if (cdaudio_active && currprefs.sound_freq == 44100 && cdrdcnt < cdwrcnt) { if (cdaudio_active && currprefs.sound_freq == 44100 && cdrdcnt < cdwrcnt) {
for (int i = 0; i < SNDBUFFER_LEN * 2; ++i) for (int i = 0; i < SNDBUFFER_LEN * 2; ++i)
sndbuffer[cnt & 3][i] += cdaudio_buffer[cdrdcnt & (CDAUDIO_BUFFERS - 1)][i]; sndbuffer[cnt & 3][i] += cdaudio_buffer[cdrdcnt & (CDAUDIO_BUFFERS - 1)][i];
cdrdcnt++; cdrdcnt++;
} }
memcpy(stream, sndbuffer[cnt % SOUND_BUFFERS_COUNT], MIN(SNDBUFFER_LEN * 2, len)); memcpy(stream, sndbuffer[cnt % SOUND_BUFFERS_COUNT], MIN(SNDBUFFER_LEN * 2, len));
} }
else else
memcpy(stream, sndbuffer[cnt % SOUND_BUFFERS_COUNT], MIN(SNDBUFFER_LEN, len)); memcpy(stream, sndbuffer[cnt % SOUND_BUFFERS_COUNT], MIN(SNDBUFFER_LEN, len));
} }
static void init_soundbuffer_usage(void) static void init_soundbuffer_usage(void)
{ {
sndbufpt = sndbuffer[0]; sndbufpt = sndbuffer[0];
render_sndbuff = sndbuffer[0]; render_sndbuff = sndbuffer[0];
finish_sndbuff = sndbuffer[0] + SNDBUFFER_LEN * 2; finish_sndbuff = sndbuffer[0] + SNDBUFFER_LEN * 2;
output_cnt = 0; output_cnt = 0;
wrcnt = 0; wrcnt = 0;
cdbufpt = cdaudio_buffer[0]; cdbufpt = cdaudio_buffer[0];
render_cdbuff = cdaudio_buffer[0]; render_cdbuff = cdaudio_buffer[0];
finish_cdbuff = cdaudio_buffer[0] + CDAUDIO_BUFFER_LEN * 2; finish_cdbuff = cdaudio_buffer[0] + CDAUDIO_BUFFER_LEN * 2;
cdrdcnt = 0; cdrdcnt = 0;
cdwrcnt = 0; cdwrcnt = 0;
} }
static int pandora_start_sound(int rate, int bits, int stereo) static int pandora_start_sound(int rate, int bits, int stereo)
{ {
int frag = 0, buffers, ret; int frag = 0, buffers, ret;
unsigned int bsize; unsigned int bsize;
static int audioOpened = 0; static int audioOpened = 0;
if (!sound_thread_active) if (!sound_thread_active)
{ {
// init sem, start sound thread // init sem, start sound thread
#ifdef DEBUG #ifdef DEBUG
printf("starting sound thread..\n"); printf("starting sound thread..\n");
#endif #endif
init_soundbuffer_usage(); init_soundbuffer_usage();
ret = sem_init(&sound_sem, 0, 0); ret = sem_init(&sound_sem, 0, 0);
sem_init(&sound_out_sem, 0, 0); sem_init(&sound_out_sem, 0, 0);
if (ret != 0) printf("sem_init() failed: %i, errno=%i\n", ret, errno); if (ret != 0) printf("sem_init() failed: %i, errno=%i\n", ret, errno);
} }
// if no settings change, we don't need to do anything // if no settings change, we don't need to do anything
if (rate == s_oldrate && s_oldbits == bits && s_oldstereo == stereo) if (rate == s_oldrate && s_oldbits == bits && s_oldstereo == stereo)
return 0; return 0;
if (audioOpened) { if (audioOpened) {
// __android_log_print(ANDROID_LOG_INFO, "UAE4ALL2", "UAE tries to open SDL sound device 2 times, ignoring that."); // __android_log_print(ANDROID_LOG_INFO, "UAE4ALL2", "UAE tries to open SDL sound device 2 times, ignoring that.");
// SDL_CloseAudio(); // SDL_CloseAudio();
return 0; return 0;
} }
SDL_AudioSpec as; SDL_AudioSpec as;
memset(&as, 0, sizeof(as)); memset(&as, 0, sizeof(as));
// __android_log_print(ANDROID_LOG_INFO, "UAE4ALL2", "Opening audio: rate %d bits %d stereo %d", rate, bits, stereo); // __android_log_print(ANDROID_LOG_INFO, "UAE4ALL2", "Opening audio: rate %d bits %d stereo %d", rate, bits, stereo);
as.freq = rate; as.freq = rate;
as.format = (bits == 8 ? AUDIO_S8 : AUDIO_S16); as.format = (bits == 8 ? AUDIO_S8 : AUDIO_S16);
as.channels = (stereo ? 2 : 1); as.channels = (stereo ? 2 : 1);
if (currprefs.sound_stereo) if (currprefs.sound_stereo)
as.samples = SNDBUFFER_LEN * 2 / as.channels / 2; as.samples = SNDBUFFER_LEN * 2 / as.channels / 2;
else else
as.samples = SNDBUFFER_LEN / as.channels / 2; as.samples = SNDBUFFER_LEN / as.channels / 2;
as.callback = sound_thread_mixer; as.callback = sound_thread_mixer;
SDL_OpenAudio(&as, NULL); SDL_OpenAudio(&as, NULL);
audioOpened = 1; audioOpened = 1;
s_oldrate = rate; s_oldrate = rate;
s_oldbits = bits; s_oldbits = bits;
s_oldstereo = stereo; s_oldstereo = stereo;
SDL_PauseAudio(0); SDL_PauseAudio(0);
return 0; return 0;
} }
// this is meant to be called only once on exit // this is meant to be called only once on exit
void pandora_stop_sound(void) void pandora_stop_sound(void)
{ {
int valuesem; int valuesem;
if (sound_thread_exit) if (sound_thread_exit)
printf("don't call pandora_stop_sound more than once!\n"); printf("don't call pandora_stop_sound more than once!\n");
SDL_PauseAudio (1); SDL_PauseAudio (1);
if (sound_thread_active) if (sound_thread_active)
{ {
#ifdef DEBUG #ifdef DEBUG
printf("stopping sound thread..\n"); printf("stopping sound thread..\n");
#endif #endif
sound_thread_exit = 1; sound_thread_exit = 1;
sem_getvalue(&sound_sem,&valuesem); sem_getvalue(&sound_sem,&valuesem);
while (valuesem == 0) while (valuesem == 0)
{ {
sem_post(&sound_sem); sem_post(&sound_sem);
usleep(200*1000); usleep(200*1000);
sem_getvalue(&sound_sem,&valuesem); sem_getvalue(&sound_sem,&valuesem);
} }
} }
sound_thread_exit = 0; sound_thread_exit = 0;
SDL_CloseAudio(); SDL_CloseAudio();
sem_destroy(&sound_sem); sem_destroy(&sound_sem);
sem_destroy(&sound_out_sem); sem_destroy(&sound_out_sem);
} }
void finish_sound_buffer(void) void finish_sound_buffer(void)
{ {
output_cnt = wrcnt; output_cnt = wrcnt;
sem_post(&sound_sem); sem_post(&sound_sem);
sem_wait(&sound_out_sem); sem_wait(&sound_out_sem);
wrcnt++; wrcnt++;
sndbufpt = render_sndbuff = sndbuffer[wrcnt & 3]; sndbufpt = render_sndbuff = sndbuffer[wrcnt & 3];
if (currprefs.sound_stereo) if (currprefs.sound_stereo)
finish_sndbuff = sndbufpt + SNDBUFFER_LEN; finish_sndbuff = sndbufpt + SNDBUFFER_LEN;
else else
finish_sndbuff = sndbufpt + SNDBUFFER_LEN / 2; finish_sndbuff = sndbufpt + SNDBUFFER_LEN / 2;
} }
void pause_sound_buffer(void) void pause_sound_buffer(void)
{ {
reset_sound(); reset_sound();
} }
void restart_sound_buffer(void) void restart_sound_buffer(void)
{ {
sndbufpt = render_sndbuff = sndbuffer[wrcnt & 3]; sndbufpt = render_sndbuff = sndbuffer[wrcnt & 3];
if (currprefs.sound_stereo) if (currprefs.sound_stereo)
finish_sndbuff = sndbufpt + SNDBUFFER_LEN; finish_sndbuff = sndbufpt + SNDBUFFER_LEN;
else else
finish_sndbuff = sndbufpt + SNDBUFFER_LEN / 2; finish_sndbuff = sndbufpt + SNDBUFFER_LEN / 2;
cdbufpt = render_cdbuff = cdaudio_buffer[cdwrcnt & (CDAUDIO_BUFFERS - 1)]; cdbufpt = render_cdbuff = cdaudio_buffer[cdwrcnt & (CDAUDIO_BUFFERS - 1)];
finish_cdbuff = cdbufpt + CDAUDIO_BUFFER_LEN * 2; finish_cdbuff = cdbufpt + CDAUDIO_BUFFER_LEN * 2;
} }
void finish_cdaudio_buffer(void) void finish_cdaudio_buffer(void)
{ {
cdwrcnt++; cdwrcnt++;
cdbufpt = render_cdbuff = cdaudio_buffer[cdwrcnt & (CDAUDIO_BUFFERS - 1)]; cdbufpt = render_cdbuff = cdaudio_buffer[cdwrcnt & (CDAUDIO_BUFFERS - 1)];
finish_cdbuff = cdbufpt + CDAUDIO_BUFFER_LEN; finish_cdbuff = cdbufpt + CDAUDIO_BUFFER_LEN;
audio_activate(); audio_activate();
} }
bool cdaudio_catchup(void) bool cdaudio_catchup(void)
{ {
while ((cdwrcnt > cdrdcnt + CDAUDIO_BUFFERS - 10) && (sound_thread_active != 0) && (quit_program == 0)) { while ((cdwrcnt > cdrdcnt + CDAUDIO_BUFFERS - 10) && (sound_thread_active != 0) && (quit_program == 0)) {
sleep_millis(10); sleep_millis(10);
} }
return (sound_thread_active != 0); return (sound_thread_active != 0);
} }
/* Try to determine whether sound is available. This is only for GUI purposes. */ /* Try to determine whether sound is available. This is only for GUI purposes. */
int setup_sound(void) int setup_sound(void)
{ {
if (pandora_start_sound(currprefs.sound_freq, 16, currprefs.sound_stereo) != 0) if (pandora_start_sound(currprefs.sound_freq, 16, currprefs.sound_stereo) != 0)
return 0; return 0;
sound_available = 1; sound_available = 1;
return 1; return 1;
} }
static int open_sound(void) static int open_sound(void)
{ {
if (pandora_start_sound(currprefs.sound_freq, 16, currprefs.sound_stereo) != 0) if (pandora_start_sound(currprefs.sound_freq, 16, currprefs.sound_stereo) != 0)
return 0; return 0;
have_sound = 1; have_sound = 1;
sound_available = 1; sound_available = 1;
if (currprefs.sound_stereo) if (currprefs.sound_stereo)
sample_handler = sample16s_handler; sample_handler = sample16s_handler;
else else
sample_handler = sample16_handler; sample_handler = sample16_handler;
return 1; return 1;
} }
void close_sound(void) void close_sound(void)
{ {
if (!have_sound) if (!have_sound)
return; return;
// testing shows that reopenning sound device is not a good idea on pandora (causes random sound driver crashes) // testing shows that reopenning sound device is not a good idea on pandora (causes random sound driver crashes)
// we will close it on real exit instead // we will close it on real exit instead
//pandora_stop_sound(); //pandora_stop_sound();
have_sound = 0; have_sound = 0;
} }
int init_sound(void) int init_sound(void)
{ {
have_sound = open_sound(); have_sound = open_sound();
return have_sound; return have_sound;
} }
void pause_sound(void) void pause_sound(void)
{ {
SDL_PauseAudio(1); SDL_PauseAudio(1);
/* nothing to do */ /* nothing to do */
} }
void resume_sound(void) void resume_sound(void)
{ {
SDL_PauseAudio(0); SDL_PauseAudio(0);
/* nothing to do */ /* nothing to do */
} }
void reset_sound(void) void reset_sound(void)
{ {
if (!have_sound) if (!have_sound)
return; return;
init_soundbuffer_usage(); init_soundbuffer_usage();
clear_sound_buffers(); clear_sound_buffers();
clear_cdaudio_buffers(); clear_cdaudio_buffers();
} }
void sound_volume(int dir) void sound_volume(int dir)
{ {
} }
#endif #endif

0
src/td-sdl/thread.h → src/threaddep/thread.h
View file

2
src/traps.cpp
View file

@ -17,7 +17,7 @@
#include "include/memory.h" #include "include/memory.h"
#include "custom.h" #include "custom.h"
#include "newcpu.h" #include "newcpu.h"
#include "td-sdl/thread.h" #include "threaddep/thread.h"
#include "autoconf.h" #include "autoconf.h"
#include "traps.h" #include "traps.h"